diff --git a/.changelog/18329.txt b/.changelog/18329.txt
deleted file mode 100644
index ab3671de86bfe..0000000000000
--- a/.changelog/18329.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-```release-note:improvement
-cli: Adds cli support for checking TCP connection for ports. If -ports flag is not given, it will check for
-default ports of consul listed here - https://developer.hashicorp.com/consul/docs/install/ports
-```
\ No newline at end of file
diff --git a/.changelog/19218.txt b/.changelog/19218.txt
deleted file mode 100644
index a3dde32317b47..0000000000000
--- a/.changelog/19218.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:improvement
-resource: lowercase names enforced for v2 resources only.
-```
\ No newline at end of file
diff --git a/.changelog/19306.txt b/.changelog/19274.txt
similarity index 100%
rename from .changelog/19306.txt
rename to .changelog/19274.txt
diff --git a/.changelog/19311.txt b/.changelog/19311.txt
deleted file mode 100644
index e53536f44d32b..0000000000000
--- a/.changelog/19311.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:bug
-raft:  Fix panic during downgrade from enterprise to oss.
-```
\ No newline at end of file
diff --git a/.changelog/19499.txt b/.changelog/19499.txt
deleted file mode 100644
index 83849637d4138..0000000000000
--- a/.changelog/19499.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-```release-note:feature
-acl: add policy bindtype to binding rules.
-```
\ No newline at end of file
diff --git a/.changelog/19860.txt b/.changelog/19860.txt
new file mode 100644
index 0000000000000..e4edb69d8b752
--- /dev/null
+++ b/.changelog/19860.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+connect: Solves an issue where two upstream services with the same name in different namespaces were not getting routed to correctly by API Gateways.
+```
diff --git a/.github/scripts/notify_slack.sh b/.github/scripts/notify_slack.sh
new file mode 100755
index 0000000000000..8df3f3f648766
--- /dev/null
+++ b/.github/scripts/notify_slack.sh
@@ -0,0 +1,29 @@
+#!/usr/bin/env bash
+# Copyright (c) HashiCorp, Inc.
+# SPDX-License-Identifier: BUSL-1.1
+
+set -uo pipefail
+
+# This script is used in GitHub Actions pipelines to notify Slack of a job failure.
+
+if [[ $GITHUB_REF_NAME == "main" ]]; then
+	GITHUB_ENDPOINT="https://github.com/${GITHUB_REPOSITORY}/commit/${GITHUB_SHA}"
+	GITHUB_ACTIONS_ENDPOINT="https://github.com/${GITHUB_REPOSITORY}/actions/runs/${GITHUB_RUN_ID}"
+	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 \
+		"{ \
+	\"attachments\": [ \
+		{ \
+		\"fallback\": \"GitHub Actions workflow failed!\", \
+		\"text\": \"❌ Failed: \`${GITHUB_ACTOR}\`'s <${GITHUB_ACTIONS_ENDPOINT}|${GITHUB_JOB}> job failed for commit <${GITHUB_ENDPOINT}|${SHORT_REF}> on \`${GITHUB_REF_NAME}\`!\n\n- <${COMMIT_MESSAGE}\", \
+		\"footer\": \"${GITHUB_REPOSITORY}\", \
+		\"ts\": \"$(date +%s)\", \
+		\"color\": \"danger\" \
+		} \
+	] \
+	}" "${FEED_CONSUL_GH_URL}"
+else
+	echo "Not posting slack failure notifications for non-main branch"
+fi
diff --git a/.github/scripts/set_test_package_matrix.sh b/.github/scripts/set_test_package_matrix.sh
index 212d9fa481c40..3f8a389297f4a 100755
--- a/.github/scripts/set_test_package_matrix.sh
+++ b/.github/scripts/set_test_package_matrix.sh
@@ -5,13 +5,7 @@
 set -euo pipefail
 export RUNNER_COUNT=$1
 
-if ((RUNNER_COUNT < 1 ))
-then
-  echo ERROR: RUNNER_COUNT must be greater than zero.
-  exit 1 # terminate and indicate error
-fi
-
 # set matrix var to list of unique packages containing tests
-matrix="$(go list -json="ImportPath,TestGoFiles" ./... | jq --compact-output '. | select(.TestGoFiles != null) | .ImportPath' | shuf | jq --slurp --compact-output '.' | jq --argjson runnercount $RUNNER_COUNT  -cM '[_nwise(length / $runnercount | ceil)]'))"
+matrix="$(go list -json="ImportPath,TestGoFiles" ./... | jq --compact-output '. | select(.TestGoFiles != null) | .ImportPath' | shuf | jq --slurp --compact-output '.' | jq --argjson runnercount $RUNNER_COUNT  -cM '[_nwise(length / $runnercount | floor)]'))"
 
 echo "matrix=${matrix}" >> "${GITHUB_OUTPUT}"
diff --git a/.github/workflows/backport-assistant.yml b/.github/workflows/backport-assistant.yml
index 78125b6dabed6..17462f811261c 100644
--- a/.github/workflows/backport-assistant.yml
+++ b/.github/workflows/backport-assistant.yml
@@ -23,7 +23,7 @@ jobs:
     steps:
       - name: Run Backport Assistant for release branches
         run: |
-          backport-assistant backport -merge-method=squash
+          backport-assistant backport -merge-method=squash -gh-automerge
         env:
           BACKPORT_LABEL_REGEXP: "backport/(?P<target>\\d+\\.\\d+)"
           BACKPORT_TARGET_TEMPLATE: "release/{{.target}}.x"
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index 7795b5f964f07..06bf97f5b3b8d 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -4,12 +4,12 @@ on:
   pull_request:
     branches-ignore:
       - stable-website
-      - 'docs/**'
-      - 'ui/**'
-      - 'mktg-**' # Digital Team Terraform-generated branches' prefix
-      - 'backport/docs/**'
-      - 'backport/ui/**'
-      - 'backport/mktg-**'
+      - "docs/**"
+      - "ui/**"
+      - "mktg-**" # Digital Team Terraform-generated branches' prefix
+      - "backport/docs/**"
+      - "backport/ui/**"
+      - "backport/mktg-**"
   push:
     branches:
       # Push events on the main branch
@@ -31,14 +31,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
@@ -54,14 +54,14 @@ 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
-    - id: setup-outputs
-      name: Setup outputs
-      run: ./.github/scripts/get_runner_classes.sh
+      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
+      - id: setup-outputs
+        name: Setup outputs
+        run: ./.github/scripts/get_runner_classes.sh
 
   check-go-mod:
     needs:
-    - setup
+      - setup
     uses: ./.github/workflows/reusable-check-go-mod.yml
     with:
       runs-on: ${{ needs.setup.outputs.compute-small }}
@@ -71,96 +71,111 @@ jobs:
 
   check-generated-protobuf:
     needs:
-    - setup
+      - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-medium) }}
     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 proto-tools
-      name: Install protobuf
-    - run: make proto-format
-      name: "Protobuf Format"
-    - run: make --always-make proto
-    - run: |
-            if ! git diff --exit-code; then
-              echo "Generated code was not updated correctly"
-              exit 1
-            fi
-    - run: make proto-lint
-      name: "Protobuf Lint"
+      - 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 proto-tools
+        name: Install protobuf
+      - run: make proto-format
+        name: "Protobuf Format"
+      - run: make --always-make proto
+      - run: |
+          if ! git diff --exit-code; then
+            echo "Generated code was not updated correctly"
+            exit 1
+          fi
+      - run: make proto-lint
+        name: "Protobuf Lint"
+      - 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
+    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
 
   lint-enums:
     needs:
-    - setup
+      - 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: go install github.com/reillywatson/enumcover/cmd/enumcover@master && enumcover ./...
+      - 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 install github.com/reillywatson/enumcover/cmd/enumcover@master && enumcover ./...
+      - name: Notify Slack
+        if: ${{ failure() }}
+        run: .github/scripts/notify_slack.sh
 
   lint-container-test-deps:
     needs:
-    - setup
+      - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     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
-      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 lint-container-test-deps
+      - 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
+        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 lint-container-test-deps
+      - name: Notify Slack
+        if: ${{ failure() }}
+        run: .github/scripts/notify_slack.sh
 
   lint-consul-retry:
     needs:
-    - setup
+      - setup
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     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 lint-consul-retry
+      - 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 install github.com/hashicorp/lint-consul-retry@v1.3.0 && lint-consul-retry
+      - name: Notify Slack
+        if: ${{ failure() }}
+        run: .github/scripts/notify_slack.sh
 
   lint:
     needs:
-    - setup
+      - setup
     uses: ./.github/workflows/reusable-lint.yml
     with:
       runs-on: ${{ needs.setup.outputs.compute-large }}
@@ -170,7 +185,7 @@ jobs:
 
   lint-32bit:
     needs:
-    - setup
+      - setup
     uses: ./.github/workflows/reusable-lint.yml
     with:
       go-arch: "386"
@@ -182,7 +197,7 @@ jobs:
   # create a development build
   dev-build:
     needs:
-    - setup
+      - setup
     uses: ./.github/workflows/reusable-dev-build.yml
     with:
       runs-on: ${{ needs.setup.outputs.compute-large }}
@@ -229,7 +244,7 @@ jobs:
   #     uploaded-binary-name: 'consul-bin-arm64'
   #     runner-count: 12
   #     runs-on: "['self-hosted', 'ondemand', 'os=macos-arm', 'arm64']"
-  #     go-test-flags: "${{ (github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')) && '-short' || '' }}"
+  #     go-test-flags: 'if ! [[ "$GITHUB_REF_NAME" =~ ^main$|^release/ ]]; then export GO_TEST_FLAGS="-short"; fi'
   #     repository-name: ${{ github.repository }}
   #   secrets:
   #     elevated-github-token: ${{ secrets.ELEVATED_GITHUB_TOKEN }}
@@ -238,16 +253,15 @@ jobs:
 
   go-test-ce:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit-split.yml
     with:
       directory: .
-      runner-count: 6
+      runner-count: 12
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
       go-tags: ""
-      go-test-flags: "${{ (github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')) && '-short' || '' }}"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read
@@ -259,16 +273,15 @@ jobs:
   go-test-enterprise:
     if: ${{ endsWith(github.repository, '-enterprise') }}
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit-split.yml
     with:
       directory: .
-      runner-count: 6
+      runner-count: 12
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
-      go-test-flags: "${{ (github.ref_name != 'main' && !startsWith(github.ref_name, 'release/')) && '-short' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read
@@ -279,16 +292,16 @@ jobs:
 
   go-test-race:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: .
-      go-test-flags: "-race -gcflags=all=-d=checkptr=0"
+      go-test-flags: 'GO_TEST_FLAGS="-race -gcflags=all=-d=checkptr=0"'
       package-names-command: "go list ./... | grep -E -v '^github.com/hashicorp/consul/agent(/consul|/local|/routine-leak-checker)?$' | grep -E -v '^github.com/hashicorp/consul(/command|/connect|/snapshot)'"
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read
@@ -299,16 +312,16 @@ jobs:
 
   go-test-32bit:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: .
       go-arch: "386"
-      go-test-flags: "-short"
+      go-test-flags: 'export GO_TEST_FLAGS="-short"'
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read
@@ -326,10 +339,10 @@ jobs:
   #   with:
   #     uploaded-binary-name: 'consul-bin-s390x'
   #     directory: .
-  #     go-test-flags: -short"
+  #     go-test-flags: 'export GO_TEST_FLAGS="-short"'
   #     runs-on: ${{ needs.setup.outputs.compute-large }}
   #     repository-name: ${{ github.repository }}
-  #     go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+  #     go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
   #   permissions:
   #     id-token: write # NOTE: this permission is explicitly required for Vault auth.
   #     contents: read
@@ -340,14 +353,14 @@ jobs:
 
   go-test-envoyextensions:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: envoyextensions
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read
@@ -358,14 +371,14 @@ jobs:
 
   go-test-troubleshoot:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: troubleshoot
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
       contents: read
@@ -376,14 +389,14 @@ jobs:
 
   go-test-api-1-19:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: api
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
       go-version: "1.19"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
@@ -395,14 +408,14 @@ jobs:
 
   go-test-api-1-20:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: api
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
       go-version: "1.20"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
@@ -414,14 +427,14 @@ jobs:
 
   go-test-sdk-1-19:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: sdk
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
       go-version: "1.19"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
@@ -433,14 +446,14 @@ jobs:
 
   go-test-sdk-1-20:
     needs:
-    - setup
-    - dev-build
+      - setup
+      - dev-build
     uses: ./.github/workflows/reusable-unit.yml
     with:
       directory: sdk
       runs-on: ${{ needs.setup.outputs.compute-large }}
       repository-name: ${{ github.repository }}
-      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+      go-tags: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
       go-version: "1.20"
     permissions:
       id-token: write # NOTE: this permission is explicitly required for Vault auth.
@@ -471,27 +484,27 @@ jobs:
 
   go-tests-success:
     needs:
-    - conditional-skip
-    - setup
-    - check-codegen
-    - check-generated-protobuf
-    - check-go-mod
-    - lint-consul-retry
-    - lint-container-test-deps
-    - lint-enums
-    - lint
-    - lint-32bit
-    # - go-test-arm64
-    - go-test-enterprise
-    - go-test-ce
-    - go-test-race
-    - go-test-envoyextensions
-    - go-test-troubleshoot
-    - go-test-api-1-19
-    - go-test-api-1-20
-    - go-test-sdk-1-19
-    - go-test-sdk-1-20
-    - go-test-32bit
+      - conditional-skip
+      - setup
+      - check-codegen
+      - check-generated-protobuf
+      - check-go-mod
+      - lint-consul-retry
+      - lint-container-test-deps
+      - lint-enums
+      - lint
+      - lint-32bit
+      # - go-test-arm64
+      - go-test-enterprise
+      - go-test-ce
+      - go-test-race
+      - go-test-envoyextensions
+      - go-test-troubleshoot
+      - go-test-api-1-19
+      - go-test-api-1-20
+      - go-test-sdk-1-19
+      - go-test-sdk-1-20
+      - go-test-32bit
     # - go-test-s390x
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     if: always() && needs.conditional-skip.outputs.skip-ci != 'true'
@@ -499,33 +512,7 @@ jobs:
       - name: evaluate upstream job results
         run: |
           # exit 1 if failure or cancelled result for any upstream job
-          # this ensures that we fail the PR check regardless of cancellation, rather than skip-passing it
-          # see https://docs.github.com/en/actions/using-jobs/using-conditions-to-control-job-execution#overview
           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: Set failure Slack commit message summary
-        # failure() ensures this runs even if the test eval step exits 1
-        if: failure()
-        run: |
-          # if failure (not cancelled), notify Slack
-          if printf '${{ toJSON(needs) }}' | grep -E -i '\"result\": \"(failure)\"'; then
-            printf "Tests failed, notifying Slack"
-            echo "FAILED_TESTS=true" >> $GITHUB_ENV
-            echo "COMMIT_MESSAGE_SUMMARY=$(echo '${{ github.event.head_commit.message }}' | head -n 1)" >> $GITHUB_ENV
-          fi
-      - name: Notify Slack
-        # failure() ensures this runs even if the test eval step exits 1
-        # FAILED_TESTS must also be checked to avoid running this step on cancellation due to the summary check above
-        if: ${{ failure() && env.FAILED_TESTS == 'true' && (github.ref_name == 'main' || startsWith(github.ref_name, 'release/')) }}
-        id: slack
-        uses: slackapi/slack-github-action@e28cf165c92ffef168d23c5c9000cffc8a25e117 # v1.24.0
-        with:
-          # github.event.head_commit.message and github.ref_name both rely on this event occurring on a push / merge
-          payload: |
-            {
-              "message": "❌ ${{ github.workflow }} workflow failed: \n\n- Run: ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} \n- Branch: ${{ github.ref_name }} \n- Message: ${{ env.COMMIT_MESSAGE_SUMMARY }} \n- Author: ${{ github.event.sender.login }}"
-            }
-        env:
-          SLACK_WEBHOOK_URL: ${{ secrets.CONSUL_PROTECTED_BRANCH_TEST_SLACK_WEBHOOK }}
\ No newline at end of file
diff --git a/.github/workflows/nightly-test-1.17.x.yaml b/.github/workflows/nightly-test-1.13.x.yaml
similarity index 96%
rename from .github/workflows/nightly-test-1.17.x.yaml
rename to .github/workflows/nightly-test-1.13.x.yaml
index 9a063001e402c..f314a475dfbd7 100644
--- a/.github/workflows/nightly-test-1.17.x.yaml
+++ b/.github/workflows/nightly-test-1.13.x.yaml
@@ -1,7 +1,7 @@
 # Copyright (c) HashiCorp, Inc.
 # SPDX-License-Identifier: MPL-2.0
 
-name: Nightly Frontend Test 1.17.x
+name: Nightly Frontend Test 1.13.x
 on:
   schedule:
     - cron: '0 4 * * *'
@@ -9,8 +9,8 @@ on:
 
 env:
   EMBER_PARTITION_TOTAL: 4        # Has to be changed in tandem with the matrix.partition
-  BRANCH: "release/1.17.x"
-  BRANCH_NAME: "release-1.17.x"   # Used for naming artifacts
+  BRANCH: "release/1.13.x"
+  BRANCH_NAME: "release-1.13.x"   # Used for naming artifacts
   GOPRIVATE: github.com/hashicorp # Required for enterprise deps
 
 jobs:
@@ -24,7 +24,7 @@ jobs:
       # Not necessary to use yarn, but enables caching
       - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
-          node-version: 18
+          node-version: 14
           cache: 'yarn'
           cache-dependency-path: ./ui/yarn.lock
 
@@ -56,7 +56,7 @@ jobs:
       # Not necessary to use yarn, but enables caching
       - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
-          node-version: 18
+          node-version: 14
           cache: 'yarn'
           cache-dependency-path: ./ui/yarn.lock
 
@@ -95,7 +95,7 @@ jobs:
       # Not necessary to use yarn, but enables caching
       - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
-          node-version: 18
+          node-version: 14
           cache: 'yarn'
           cache-dependency-path: ./ui/yarn.lock
 
@@ -128,7 +128,7 @@ jobs:
       # Not necessary to use yarn, but enables caching
       - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
-          node-version: 18
+          node-version: 14
           cache: 'yarn'
           cache-dependency-path: ./ui/yarn.lock
 
@@ -167,7 +167,7 @@ jobs:
       # Not necessary to use yarn, but enables caching
       - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
-          node-version: 18
+          node-version: 14
           cache: 'yarn'
           cache-dependency-path: ./ui/yarn.lock
 
@@ -198,7 +198,7 @@ jobs:
       # Not necessary to use yarn, but enables caching
       - uses: actions/setup-node@e33196f7422957bea03ed53f6fbb155025ffc7b8 # v3.7.0
         with:
-          node-version: 18
+          node-version: 14
           cache: 'yarn'
           cache-dependency-path: ./ui/yarn.lock
 
diff --git a/.github/workflows/nightly-test-integ-peering_commontopo.yml b/.github/workflows/nightly-test-integ-peering_commontopo.yml
deleted file mode 100644
index 418faaf3b400c..0000000000000
--- a/.github/workflows/nightly-test-integ-peering_commontopo.yml
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly test integrations - peering_common_topo
-
-on:
-  schedule:
-    # Run nightly at 12AM UTC/8PM EST/5PM PST
-    - cron: '* 0 * * *'
-  workflow_dispatch: {}
-
-env:
-  TEST_RESULTS_DIR: /tmp/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
-
-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: ${{ inputs.branch }}
-      - id: runners
-        run: .github/scripts/get_runner_classes.sh
-
-  tests:
-    runs-on: ${{ fromJSON(needs.setup.outputs.compute-xl ) }}
-    needs:
-      - setup
-    permissions:
-      id-token: write # NOTE: this permission is explicitly required for Vault auth.
-      contents: read
-    strategy:
-      fail-fast: false
-      matrix:
-        test-case:
-          - TestSuitesOnSharedTopo
-          # these are not part of sharedTopoSuites
-          - TestAC5PreparedQueryFailover
-          - TestAC6Failovers
-          - TestNET5029Failovers
-          - TestRotateGW
-          - TestAC7_2RotateLeader
-    name: '${{matrix.test-case}}'
-
-    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
-      - name: Build
-        run: |
-          make dev
-          mv bin/consul consul
-      - 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: |
-          export NOLOGBUFFER=1
-          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=standard-verbose \
-            --debug \
-            --packages="./..." \
-            -- \
-            go test \
-            -tags "${{ env.GOTAGS }}" \
-            -run '^${{ matrix.test-case }}$' \
-            -timeout=60m \
-            -parallel=1 \
-            -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
-        env:
-          GOTESTSUM_JUNITFILE: ${{ env.TEST_RESULTS_DIR }}/results.xml
-          GOTESTSUM_FORMAT: standard-verbose
-          # tput complains if this isn't set to something.
-          TERM: ansi
-
-      - name: Authenticate to Vault
-        if: ${{ endsWith(github.repository, '-enterprise') && !cancelled() }}
-        id: vault-auth
-        run: vault-auth
-
-      - name: Fetch Secrets
-        if: ${{ endsWith(github.repository, '-enterprise') && !cancelled() }}
-        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: upload test results
-        if: ${{ !cancelled() }}
-        continue-on-error: true
-        env:
-          DATADOG_API_KEY: "${{ endsWith(github.repository, '-enterprise') && env.DATADOG_API_KEY || secrets.DATADOG_API_KEY }}"
-          DD_ENV: ci
-        run: |
-          # TODO: we should probably version this and check a shasum or something? or run a container?
-          which datadog-ci > /dev/null 2>&1 || {
-            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 
-          }
-          datadog-ci junit upload --service "$GITHUB_REPOSITORY" $TEST_RESULTS_DIR/results.xml
-
-
-  success:
-    needs: 
-    - setup
-    - tests
-    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 peering_commontopo 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-integrations-1.15.x.yml b/.github/workflows/nightly-test-integrations-1.15.x.yml
index a6f2ce184f13b..c570a541abd11 100644
--- a/.github/workflows/nightly-test-integrations-1.15.x.yml
+++ b/.github/workflows/nightly-test-integrations-1.15.x.yml
@@ -14,7 +14,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.11.0"
+  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' }}
@@ -234,8 +234,9 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=github-actions \
-            --rerun-fails \
+            --format=short-verbose \
+            --debug \
+            --rerun-fails=2 \
             --packages="./..." \
             -- \
             go test \
diff --git a/.github/workflows/nightly-test-integrations-1.16.x.yml b/.github/workflows/nightly-test-integrations-1.16.x.yml
index 2492f5c80a7e0..d9a771c3fe133 100644
--- a/.github/workflows/nightly-test-integrations-1.16.x.yml
+++ b/.github/workflows/nightly-test-integrations-1.16.x.yml
@@ -14,7 +14,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.11.0"
+  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' }}
@@ -255,8 +255,9 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=github-actions \
-            --rerun-fails \
+            --format=short-verbose \
+            --debug \
+            --rerun-fails=2 \
             --packages="./..." \
             -- \
             go test \
diff --git a/.github/workflows/nightly-test-integrations-1.17.x.yml b/.github/workflows/nightly-test-integrations-1.17.x.yml
deleted file mode 100644
index 1dc692e010500..0000000000000
--- a/.github/workflows/nightly-test-integrations-1.17.x.yml
+++ /dev/null
@@ -1,431 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: MPL-2.0
-
-name: Nightly test-integrations 1.17.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.11.0"
-  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.17.x"
-  BRANCH_NAME: "release-1.17.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.17.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.12", "1.25.11", "1.26.6", "1.27.2"]
-          # 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.24.12", "1.25.11", "1.26.6", "1.27.2"]
-        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.15", "1.16", "1.17"]
-    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=github-actions \
-            --rerun-fails \
-            --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
-
-  upgrade-integration-test-deployer:
-    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.15", "1.16", "1.17"]
-    env:
-      CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
-    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
-      - name: Build image
-        run: make test-deployer-setup
-      - name: Upgrade Integration Tests
-        run: |
-          mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          export NOLOGBUFFER=1
-          cd ./test-integ/upgrade
-          docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
-          go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --raw-command \
-            --format=standard-verbose \
-            --debug \
-            --packages="./..." \
-            -- \
-            go test \
-            -tags "${{ env.GOTAGS }}" \
-            -timeout=60m \
-            -parallel=2 \
-            -json \
-            ./... \
-            --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 }}"
-        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
-    - upgrade-integration-test-deployer
-    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 1696275c9ffb7..cb49791c15f80 100644
--- a/.github/workflows/nightly-test-integrations.yml
+++ b/.github/workflows/nightly-test-integrations.yml
@@ -14,7 +14,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.11.0"
+  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' }}
@@ -193,10 +193,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        consul-version: [ "1.16", "1.17"]
+        consul-version: [ "1.15", "1.16", "1.17"]
     env:
       CONSUL_LATEST_VERSION: ${{ matrix.consul-version }}
-      ENVOY_VERSION: "1.25.4"
+      ENVOY_VERSION: "1.24.6"
     steps:
       - name: Checkout code
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -252,8 +252,9 @@ jobs:
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=github-actions \
-            --rerun-fails \
+            --format=short-verbose \
+            --debug \
+            --rerun-fails=2 \
             --packages="./..." \
             -- \
             go test \
@@ -307,6 +308,100 @@ jobs:
           DD_ENV: ci
         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
+
+
   upgrade-integration-test-deployer:
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-large ) }}
     needs:
@@ -338,12 +433,13 @@ jobs:
       - name: Upgrade Integration Tests
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          #export NOLOGBUFFER=1
+          export NOLOGBUFFER=1
           cd ./test-integ/upgrade
           docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=github-actions \
+            --format=standard-verbose \
+            --debug \
             --packages="./..." \
             -- \
             go test \
@@ -403,6 +499,7 @@ jobs:
     - envoy-integration-test
     - upgrade-integration-test
     - upgrade-integration-test-deployer
+    - peering_commontopo-integration-test
     runs-on: ${{ fromJSON(needs.setup.outputs.compute-small) }}
     if: ${{ always() }}
     steps:
diff --git a/.github/workflows/reusable-check-go-mod.yml b/.github/workflows/reusable-check-go-mod.yml
index be228c7a2f812..51fd682776899 100644
--- a/.github/workflows/reusable-check-go-mod.yml
+++ b/.github/workflows/reusable-check-go-mod.yml
@@ -34,3 +34,6 @@ jobs:
           git status -s
           exit 1
         fi
+    - name: Notify Slack
+      if: ${{ failure() }}
+      run: .github/scripts/notify_slack.sh
diff --git a/.github/workflows/reusable-dev-build-windows.yml b/.github/workflows/reusable-dev-build-windows.yml
index b6bde2653b4bf..01247c477878c 100644
--- a/.github/workflows/reusable-dev-build-windows.yml
+++ b/.github/workflows/reusable-dev-build-windows.yml
@@ -42,3 +42,6 @@ jobs:
         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 eaf9a643ebaa8..99bcb96592c3a 100644
--- a/.github/workflows/reusable-dev-build.yml
+++ b/.github/workflows/reusable-dev-build.yml
@@ -54,3 +54,6 @@ jobs:
         with:
           name: ${{inputs.uploaded-binary-name}}
           path: ./bin/consul
+      - name: Notify Slack
+        if: ${{ failure() }}
+        run: .github/scripts/notify_slack.sh
diff --git a/.github/workflows/reusable-lint.yml b/.github/workflows/reusable-lint.yml
index 52d2dc67d9af3..902ff1867144f 100644
--- a/.github/workflows/reusable-lint.yml
+++ b/.github/workflows/reusable-lint.yml
@@ -18,7 +18,7 @@ on:
       elevated-github-token:
         required: true
 env:
-  GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consuldev' || '' }}"
+  GOTAGS: "${{ github.event.repository.name == 'consul-enterprise' && 'consulent consulprem consuldev' || '' }}"
   GOARCH: ${{inputs.go-arch}}
   GOPRIVATE: github.com/hashicorp # Required for enterprise deps
 
@@ -55,3 +55,6 @@ jobs:
           version: v1.51.1
           args: --build-tags="${{ env.GOTAGS }}" -v
           skip-cache: true
+      - name: Notify Slack
+        if: ${{ failure() }}
+        run: .github/scripts/notify_slack.sh
diff --git a/.github/workflows/reusable-unit-split.yml b/.github/workflows/reusable-unit-split.yml
index 0095d7739e16e..3d959d168beda 100644
--- a/.github/workflows/reusable-unit-split.yml
+++ b/.github/workflows/reusable-unit-split.yml
@@ -46,7 +46,7 @@ on:
         required: true
 env:
   TEST_RESULTS: /tmp/test-results
-  GOTESTSUM_VERSION: "1.11.0"
+  GOTESTSUM_VERSION: "1.10.1"
   GOARCH: ${{inputs.go-arch}}
   TOTAL_RUNNERS: ${{inputs.runner-count}}
   CONSUL_LICENSE: ${{secrets.consul-license}}
@@ -115,19 +115,21 @@ jobs:
           PACKAGE_NAMES="${{ join(matrix.package, ' ') }}"
           # PACKAGE_NAMES="${{ matrix.package }}"
 
+          ${{inputs.go-test-flags}}
+          
           # some tests expect this umask, and arm images have a different default
           umask 0022
 
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-          --format=github-actions \
-          --format-hide-empty-pkg \
+          --format=short-verbose \
           --jsonfile /tmp/jsonfile/go-test.log \
-          --rerun-fails \
+          --debug \
+          --rerun-fails=3 \
+          --rerun-fails-max-failures=40 \
           --rerun-fails-report=/tmp/gotestsum-rerun-fails \
           --packages="$PACKAGE_NAMES" \
           --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml -- \
           -tags="${{env.GOTAGS}}" \
-          ${{inputs.go-test-flags}} \
           -cover -coverprofile=coverage.txt \
           -timeout=30m
 
@@ -173,3 +175,6 @@ jobs:
       - name: "Re-run fails report"
         run: |
           .github/scripts/rerun_fails_report.sh /tmp/gotestsum-rerun-fails
+      - name: Notify Slack
+        if: ${{ failure() }}
+        run: .github/scripts/notify_slack.sh
diff --git a/.github/workflows/reusable-unit.yml b/.github/workflows/reusable-unit.yml
index 8a69d22385e4f..3b50bfa7e3887 100644
--- a/.github/workflows/reusable-unit.yml
+++ b/.github/workflows/reusable-unit.yml
@@ -46,7 +46,7 @@ on:
         required: true
 env:
   TEST_RESULTS: /tmp/test-results
-  GOTESTSUM_VERSION: "1.11.0"
+  GOTESTSUM_VERSION: "1.10.1"
   GOARCH: ${{inputs.go-arch}}
   CONSUL_LICENSE: ${{secrets.consul-license}}
   GOTAGS: ${{ inputs.go-tags}}
@@ -96,15 +96,19 @@ jobs:
             # some tests expect this umask, and arm images have a different default
             umask 0022
 
+            ${{inputs.go-test-flags}}
+
             go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-              --format=github-actions \
+              --format=short-verbose \
               --jsonfile /tmp/jsonfile/go-test.log \
-              --rerun-fails \
+              --debug \
+              --rerun-fails=3 \
+              --rerun-fails-max-failures=40 \
               --rerun-fails-report=/tmp/gotestsum-rerun-fails \
               --packages="$PACKAGE_NAMES" \
               --junitfile ${{env.TEST_RESULTS}}/gotestsum-report.xml -- \
               -tags="${{env.GOTAGS}}" \
-              ${{inputs.go-test-flags}} \
+              ${GO_TEST_FLAGS-} \
               -cover -coverprofile=coverage.txt \
               -timeout=30m
 
@@ -150,3 +154,6 @@ jobs:
       - name: "Re-run fails report"
         run: |
           .github/scripts/rerun_fails_report.sh /tmp/gotestsum-rerun-fails
+      - name: Notify Slack
+        if: ${{ failure() }}
+        run: .github/scripts/notify_slack.sh
diff --git a/.github/workflows/test-integrations-windows.yml b/.github/workflows/test-integrations-windows.yml
index 29080a10ea28b..16f7b26fdc67a 100644
--- a/.github/workflows/test-integrations-windows.yml
+++ b/.github/workflows/test-integrations-windows.yml
@@ -11,7 +11,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.11.0"
+  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' }}
diff --git a/.github/workflows/test-integrations.yml b/.github/workflows/test-integrations.yml
index 7782ec9b31d6b..87b1154f8cfbc 100644
--- a/.github/workflows/test-integrations.yml
+++ b/.github/workflows/test-integrations.yml
@@ -19,7 +19,7 @@ env:
   TEST_RESULTS_ARTIFACT_NAME: test-results
   CONSUL_LICENSE: ${{ secrets.CONSUL_LICENSE }}
   GOTAGS: ${{ endsWith(github.repository, '-enterprise') && 'consulent' || '' }}
-  GOTESTSUM_VERSION: "1.11.0"
+  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' }}
@@ -81,6 +81,7 @@ jobs:
     strategy:
       matrix:
         nomad-version: ['v1.6.2', 'v1.5.9', 'v1.4.13']
+
     steps:
       - name: Checkout Nomad
         uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -110,7 +111,7 @@ jobs:
         run: |
           go install gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} && \
           gotestsum \
-            --format=github-actions \
+            --format=short-verbose \
             --rerun-fails \
             --rerun-fails-report=/tmp/gotestsum-rerun-fails \
             --packages="./command/agent/consul" \
@@ -184,17 +185,17 @@ jobs:
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --format=github-actions \
+            --format=short-verbose \
             --junitfile "${{ env.TEST_RESULTS_DIR }}/gotestsum-report.xml" \
             -- -tags "${{ env.GOTAGS }}" -cover -coverprofile=coverage.txt ./agent/connect/ca
           # Run leader tests that require Vault
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --format=github-actions \
+            --format=short-verbose \
             --junitfile "${{ env.TEST_RESULTS_DIR }}/gotestsum-report-leader.xml" \
             -- -tags "${{ env.GOTAGS }}" -cover -coverprofile=coverage-leader.txt -run Vault ./agent/consul
           # Run agent tests that require Vault
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
-            --format=github-actions \
+            --format=short-verbose \
             --junitfile "${{ env.TEST_RESULTS_DIR }}/gotestsum-report-agent.xml" \
             -- -tags "${{ env.GOTAGS }}" -cover -coverprofile=coverage-agent.txt -run Vault ./agent
 
@@ -431,8 +432,9 @@ jobs:
             docker run --rm ${{ env.CONSUL_LATEST_IMAGE_NAME }}:local consul version
             go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
               --raw-command \
-              --format=github-actions \
-              --rerun-fails \
+              --format=pkgname-and-test-fails \
+              --debug \
+              --rerun-fails=3 \
               -- \
               go test \
               -p=6 \
@@ -513,11 +515,12 @@ jobs:
       - name: Integration Tests
         run: |
           mkdir -p "${{ env.TEST_RESULTS_DIR }}"
-          #export NOLOGBUFFER=1
+          export NOLOGBUFFER=1
           cd ./test-integ
           go run gotest.tools/gotestsum@v${{env.GOTESTSUM_VERSION}} \
             --raw-command \
-            --format=github-actions \
+            --format=standard-verbose \
+            --debug \
             -- \
             go test \
             -tags "${{ env.GOTAGS }}" \
diff --git a/.github/workflows/verify-envoy-version.yml b/.github/workflows/verify-envoy-version.yml
index dafa9db6f22a6..003888eddf6e1 100644
--- a/.github/workflows/verify-envoy-version.yml
+++ b/.github/workflows/verify-envoy-version.yml
@@ -13,7 +13,7 @@ on:
     branches:
       - main
       - release/**
-      
+
 env:
   SKIP_VERIFY_ENVOY_VERSION: ${{ vars.SKIP_VERIFY_ENVOY_VERSION }}
 
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
deleted file mode 100644
index ec68f1133db8e..0000000000000
--- a/.pre-commit-config.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (c) HashiCorp, Inc.
-# SPDX-License-Identifier: BUSL-1.1
-
-# See https://pre-commit.com for more information
-# See https://pre-commit.com/hooks.html for more hooks
-#
-# Opt-in to running pre-commit hooks by running `make tools`.
-#
-# Guidelines for adding new pre-commit hooks
-# ====================================================================
-# A hook SHOULD be blazingly fast (<2s) to impose minimal latency on
-# developer workflows (e.g. golangci-lint takes > 8s)
-#
-# A hook SHOULD attempt to fix errors, not just identify them.
-#
-# A hook SHOULD address common errors in files that tend to change
-# frequently. While surfacing esoteric issues is nice, hooks that have a
-# wider impact are preferred.
-#
-repos:
--   repo: https://github.com/tekwizely/pre-commit-golang
-    rev: v1.0.0-rc.1
-    hooks:
-    # Formats go imports into deterministic sections.
-    # `pre-commit run gci` to run in isolation.
-    -   id: my-cmd
-        name: Format go imports
-        alias: gci
-        # skip all generated go files
-        exclude: |
-            (?x)(
-                ^proto-public/|
-                ^proto/|
-                ^agent/xds/z_xds_packages\.go$|
-                ^testing/deployer/topology/default_versions\.go$|
-                \.deepcopy\.go$|
-                \.gen\.go$|
-                \.pb\.go$|
-                \.pb\.binary\.go$|
-                generated_funcs\.go$|
-                _generated_test\.go$|
-                mock_.+\.go$
-            )
-        args:
-        - "gci"
-        - "write"
-        - "--section"
-        - "standard"
-        - "--section"
-        - "default"
-        - "--section"
-        - "prefix(github.com/hashicorp/)"
-        - "--section"
-        - "prefix(github.com/hashicorp/consul/)"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d745a425df9d0..8bbe1143e7f76 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -88,81 +88,6 @@ BUG FIXES:
 * telemetry: emit consul version metric on a regular interval. [[GH-6876](https://github.com/hashicorp/consul/issues/6876)]
 * tlsutil: Default setting of ServerName field in outgoing TLS configuration for checks now handled by crypto/tls. [[GH-17481](https://github.com/hashicorp/consul/issues/17481)]
 
-## 1.16.3 (October 31, 2023)
-
-SECURITY:
-
-* Update `golang.org/x/net` to v0.17.0 to address [CVE-2023-39325](https://nvd.nist.gov/vuln/detail/CVE-2023-39325)
-/ [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487)(`x/net/http2`). [[GH-19225](https://github.com/hashicorp/consul/issues/19225)]
-* Upgrade Go to 1.20.10.
-This resolves vulnerability [CVE-2023-39325](https://nvd.nist.gov/vuln/detail/CVE-2023-39325)
-/ [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487)(`net/http`). [[GH-19225](https://github.com/hashicorp/consul/issues/19225)]
-* Upgrade `google.golang.org/grpc` to 1.56.3.
-This resolves vulnerability [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487). [[GH-19414](https://github.com/hashicorp/consul/issues/19414)]
-* connect: update supported envoy versions to 1.24.12, 1.25.11, 1.26.6 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76) [[GH-19273](https://github.com/hashicorp/consul/issues/19273)]
-
-BUG FIXES:
-
-* Mesh Gateways: Fix a bug where replicated and peered mesh gateways with hostname-based WAN addresses fail to initialize. [[GH-19268](https://github.com/hashicorp/consul/issues/19268)]
-* api-gateway: fix matching for different hostnames on the same listener [[GH-19120](https://github.com/hashicorp/consul/issues/19120)]
-* api: add custom marshal/unmarshal for ServiceResolverConfigEntry.RequestTimeout so config entries that set this field can be read using the API. [[GH-19031](https://github.com/hashicorp/consul/issues/19031)]
-* ca: Fix bug with Vault CA provider where renewing a retracted token would cause retries in a tight loop, degrading performance. [[GH-19285](https://github.com/hashicorp/consul/issues/19285)]
-* ca: Fix bug with Vault CA provider where token renewal goroutines could leak if CA failed to initialize. [[GH-19285](https://github.com/hashicorp/consul/issues/19285)]
-* ca: ensure Vault CA provider respects Vault Enterprise namespace configuration. [[GH-19095](https://github.com/hashicorp/consul/issues/19095)]
-* catalog api: fixes a bug with catalog api where filter query parameter was not working correctly for the `/v1/catalog/services` endpoint [[GH-18322](https://github.com/hashicorp/consul/issues/18322)]
-* connect: Fix bug where uncleanly closed xDS connections would influence connection balancing for too long and prevent envoy instances from starting. Two new configuration fields
-`performance.grpc_keepalive_timeout` and `performance.grpc_keepalive_interval` now exist to allow for configuration on how often these dead connections will be cleaned up. [[GH-19339](https://github.com/hashicorp/consul/issues/19339)]
-* dns: **(Enterprise only)** Fix bug where sameness group queries did not correctly inherit the agent's partition.
-* gateways: Fix a bug where a service in a peered datacenter could not access an external node service through a terminating gateway [[GH-18959](https://github.com/hashicorp/consul/issues/18959)]
-* server: **(Enterprise Only)** Fixed an issue where snake case keys were rejected when configuring the control-plane-request-limit config entry
-
-## 1.15.7 (October 31, 2023)
-
-SECURITY:
-
-* Update `golang.org/x/net` to v0.17.0 to address [CVE-2023-39325](https://nvd.nist.gov/vuln/detail/CVE-2023-39325)
-/ [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487)(`x/net/http2`). [[GH-19225](https://github.com/hashicorp/consul/issues/19225)]
-* Upgrade Go to 1.20.10.
-This resolves vulnerability [CVE-2023-39325](https://nvd.nist.gov/vuln/detail/CVE-2023-39325)
-/ [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487)(`net/http`). [[GH-19225](https://github.com/hashicorp/consul/issues/19225)]
-* Upgrade `google.golang.org/grpc` to 1.56.3.
-This resolves vulnerability [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487). [[GH-19414](https://github.com/hashicorp/consul/issues/19414)]
-* connect: update supported envoy versions to 1.24.12, 1.25.11 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76) [[GH-19272](https://github.com/hashicorp/consul/issues/19272)]
-
-BUG FIXES:
-
-* Mesh Gateways: Fix a bug where replicated and peered mesh gateways with hostname-based WAN addresses fail to initialize. [[GH-19268](https://github.com/hashicorp/consul/issues/19268)]
-* api: add custom marshal/unmarshal for ServiceResolverConfigEntry.RequestTimeout so config entries that set this field can be read using the API. [[GH-19031](https://github.com/hashicorp/consul/issues/19031)]
-* ca: Fix bug with Vault CA provider where renewing a retracted token would cause retries in a tight loop, degrading performance. [[GH-19285](https://github.com/hashicorp/consul/issues/19285)]
-* ca: Fix bug with Vault CA provider where token renewal goroutines could leak if CA failed to initialize. [[GH-19285](https://github.com/hashicorp/consul/issues/19285)]
-* ca: ensure Vault CA provider respects Vault Enterprise namespace configuration. [[GH-19095](https://github.com/hashicorp/consul/issues/19095)]
-* catalog api: fixes a bug with catalog api where filter query parameter was not working correctly for the `/v1/catalog/services` endpoint [[GH-18322](https://github.com/hashicorp/consul/issues/18322)]
-* connect: Fix bug where uncleanly closed xDS connections would influence connection balancing for too long and prevent envoy instances from starting. Two new configuration fields
-`performance.grpc_keepalive_timeout` and `performance.grpc_keepalive_interval` now exist to allow for configuration on how often these dead connections will be cleaned up. [[GH-19339](https://github.com/hashicorp/consul/issues/19339)]
-* gateways: Fix a bug where a service in a peered datacenter could not access an external node service through a terminating gateway [[GH-18959](https://github.com/hashicorp/consul/issues/18959)]
-
-## 1.14.11 (October 31, 2023)
-
-SECURITY:
-
-* Update `golang.org/x/net` to v0.17.0 to address [CVE-2023-39325](https://nvd.nist.gov/vuln/detail/CVE-2023-39325)
-/ [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487)(`x/net/http2`). [[GH-19225](https://github.com/hashicorp/consul/issues/19225)]
-* Upgrade Go to 1.20.10.
-This resolves vulnerability [CVE-2023-39325](https://nvd.nist.gov/vuln/detail/CVE-2023-39325)
-/ [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487)(`net/http`). [[GH-19225](https://github.com/hashicorp/consul/issues/19225)]
-* Upgrade `google.golang.org/grpc` to 1.56.3.
-This resolves vulnerability [CVE-2023-44487](https://nvd.nist.gov/vuln/detail/CVE-2023-44487). [[GH-19414](https://github.com/hashicorp/consul/issues/19414)]
-* connect: update supported envoy versions to 1.24.12 to address [CVE-2023-44487](https://github.com/envoyproxy/envoy/security/advisories/GHSA-jhv4-f7mr-xx76) [[GH-19271](https://github.com/hashicorp/consul/issues/19271)]
-
-BUG FIXES:
-
-* Mesh Gateways: Fix a bug where replicated and peered mesh gateways with hostname-based WAN addresses fail to initialize. [[GH-19268](https://github.com/hashicorp/consul/issues/19268)]
-* api: add custom marshal/unmarshal for ServiceResolverConfigEntry.RequestTimeout so config entries that set this field can be read using the API. [[GH-19031](https://github.com/hashicorp/consul/issues/19031)]
-* ca: ensure Vault CA provider respects Vault Enterprise namespace configuration. [[GH-19095](https://github.com/hashicorp/consul/issues/19095)]
-* catalog api: fixes a bug with catalog api where filter query parameter was not working correctly for the `/v1/catalog/services` endpoint [[GH-18322](https://github.com/hashicorp/consul/issues/18322)]
-* connect: Fix bug where uncleanly closed xDS connections would influence connection balancing for too long and prevent envoy instances from starting. Two new configuration fields
-`performance.grpc_keepalive_timeout` and `performance.grpc_keepalive_interval` now exist to allow for configuration on how often these dead connections will be cleaned up. [[GH-19339](https://github.com/hashicorp/consul/issues/19339)]
-
 ## 1.17.0-rc1 (October 11, 2023)
 
 BREAKING CHANGES:
diff --git a/LICENSE b/LICENSE
index ec2bf6861c1e0..032314fc058ea 100644
--- a/LICENSE
+++ b/LICENSE
@@ -6,40 +6,10 @@ Parameters
 Licensor:             HashiCorp, Inc.
 Licensed Work:        Consul Version 1.17.0 or later. The Licensed Work is (c) 2023
                       HashiCorp, Inc.
-Additional Use Grant: You may make production use of the Licensed Work, provided
-                      Your use does not include offering the Licensed Work to third
-                      parties on a hosted or embedded basis in order to compete with 
-                      HashiCorp's paid version(s) of the Licensed Work. For purposes 
-                      of this license:
-
-                      A "competitive offering" is a Product that is offered to third
-                      parties on a paid basis, including through paid support 
-                      arrangements, that significantly overlaps with the capabilities 
-                      of HashiCorp's paid version(s) of the Licensed Work. If Your 
-                      Product is not a competitive offering when You first make it 
-                      generally available, it will not become a competitive offering
-                      later due to HashiCorp releasing a new version of the Licensed 
-                      Work with additional capabilities. In addition, Products that 
-                      are not provided on a paid basis are not competitive.
-
-                      "Product" means software that is offered to end users to manage 
-                      in their own environments or offered as a service on a hosted 
-                      basis.
-
-                      "Embedded" means including the source code or executable code 
-                      from the Licensed Work in a competitive offering. "Embedded" 
-                      also means packaging the competitive offering in such a way 
-                      that the Licensed Work must be accessed or downloaded for the 
-                      competitive offering to operate.
-
-                      Hosting or using the Licensed Work(s) for internal purposes 
-                      within an organization is not considered a competitive 
-                      offering. HashiCorp considers your organization to include all 
-                      of your affiliates under common control.
-
-                      For binding interpretive guidance on using HashiCorp products 
-                      under the Business Source License, please visit our FAQ. 
-                      (https://www.hashicorp.com/license-faq)
+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
 
@@ -86,7 +56,7 @@ 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,
+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.
+TITLE.
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 6f0cc6249cd8b..d98335a7b9931 100644
--- a/Makefile
+++ b/Makefile
@@ -14,15 +14,13 @@ GOLANGCI_LINT_VERSION='v1.51.1'
 MOCKERY_VERSION='v2.20.0'
 BUF_VERSION='v1.26.0'
 
-PROTOC_GEN_GO_GRPC_VERSION='v1.2.0'
+PROTOC_GEN_GO_GRPC_VERSION="v1.2.0"
 MOG_VERSION='v0.4.1'
 PROTOC_GO_INJECT_TAG_VERSION='v1.3.0'
-PROTOC_GEN_GO_BINARY_VERSION='v0.1.0'
+PROTOC_GEN_GO_BINARY_VERSION="v0.1.0"
 DEEP_COPY_VERSION='bc3f5aa5735d8a54961580a3a24422c308c831c2'
 COPYWRITE_TOOL_VERSION='v0.16.4'
-LINT_CONSUL_RETRY_VERSION='v1.4.0'
-# Go imports formatter
-GCI_VERSION='v0.11.2'
+LINT_CONSUL_RETRY_VERSION='v1.3.0'
 
 MOCKED_PB_DIRS= pbdns
 
@@ -258,15 +256,6 @@ lint/%:
 	@echo "--> Running enumcover ($*)"
 	@cd $* && GOWORK=off enumcover ./...
 
-.PHONY: lint-consul-retry
-lint-consul-retry: $(foreach mod,$(GO_MODULES),lint-consul-retry/$(mod))
-
-.PHONY: lint-consul-retry/%
-lint-consul-retry/%: lint-tools
-	@echo "--> Running lint-consul-retry ($*)"
-	@cd $* && GOWORK=off lint-consul-retry
-
-
 # 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
diff --git a/README.md b/README.md
index c23053f0e1f7d..870e00f76c761 100644
--- a/README.md
+++ b/README.md
@@ -23,9 +23,6 @@ Consul provides several key features:
   can use sidecar proxies in a service mesh configuration to establish TLS
   connections for inbound and outbound connections with Transparent Proxy.
 
-* **API Gateway** - Consul API Gateway manages access to services within Consul Service Mesh, 
-  allow users to define traffic and authorization policies to services deployed within the mesh.  
-
 * **Service Discovery** - Consul makes it simple for services to register
   themselves and to discover other services via a DNS or HTTP interface.
   External services such as SaaS providers can be registered as well.
diff --git a/acl/validation.go b/acl/validation.go
index 652a76e87930c..c0017effa15d7 100644
--- a/acl/validation.go
+++ b/acl/validation.go
@@ -68,10 +68,6 @@ func IsValidRoleName(name string) bool {
 	return validRoleName.MatchString(name)
 }
 
-func IsValidPolicyName(name string) bool {
-	return ValidatePolicyName(name) == nil
-}
-
 // IsValidRoleName returns true if the provided name can be used as an
 // ACLAuthMethod Name.
 func IsValidAuthMethodName(name string) bool {
diff --git a/agent/agent_endpoint_test.go b/agent/agent_endpoint_test.go
index 51308a7945fac..ab9a44ff98774 100644
--- a/agent/agent_endpoint_test.go
+++ b/agent/agent_endpoint_test.go
@@ -1877,7 +1877,7 @@ func TestAgent_ReloadDoesNotTriggerWatch(t *testing.T) {
 	require.NoError(t, a.updateTTLCheck(checkID, api.HealthPassing, "testing-agent-reload-001"))
 
 	checkStr := func(r *retry.R, evaluator func(string) error) {
-		r.Helper()
+		t.Helper()
 		contentsStr := ""
 		// Wait for watch to be populated
 		for i := 1; i < 7; i++ {
@@ -1890,14 +1890,14 @@ func TestAgent_ReloadDoesNotTriggerWatch(t *testing.T) {
 				break
 			}
 			time.Sleep(time.Duration(i) * time.Second)
-			testutil.Logger(r).Info("Watch not yet populated, retrying")
+			testutil.Logger(t).Info("Watch not yet populated, retrying")
 		}
 		if err := evaluator(contentsStr); err != nil {
 			r.Errorf("ERROR: Test failing: %s", err)
 		}
 	}
 	ensureNothingCritical := func(r *retry.R, mustContain string) {
-		r.Helper()
+		t.Helper()
 		eval := func(contentsStr string) error {
 			if strings.Contains(contentsStr, "critical") {
 				return fmt.Errorf("MUST NOT contain critical:= %s", contentsStr)
@@ -1915,7 +1915,7 @@ func TestAgent_ReloadDoesNotTriggerWatch(t *testing.T) {
 	}
 
 	retry.RunWith(retriesWithDelay(), t, func(r *retry.R) {
-		testutil.Logger(r).Info("Consul is now ready")
+		testutil.Logger(t).Info("Consul is now ready")
 		// it should contain the output
 		checkStr(r, func(contentStr string) error {
 			if contentStr == "[]" {
@@ -4340,7 +4340,7 @@ func testDefaultSidecar(svc string, port int, fns ...func(*structs.NodeService))
 }
 
 // testCreateToken creates a Policy for the provided rules and a Token linked to that Policy.
-func testCreateToken(t testutil.TestingTB, a *TestAgent, rules string) string {
+func testCreateToken(t *testing.T, a *TestAgent, rules string) string {
 	policyName, err := uuid.GenerateUUID() // we just need a unique name for the test and UUIDs are definitely unique
 	require.NoError(t, err)
 
@@ -4369,7 +4369,7 @@ func testCreateToken(t testutil.TestingTB, a *TestAgent, rules string) string {
 	return aclResp.SecretID
 }
 
-func testCreatePolicy(t testutil.TestingTB, a *TestAgent, name, rules string) string {
+func testCreatePolicy(t *testing.T, a *TestAgent, name, rules string) string {
 	args := map[string]interface{}{
 		"Name":  name,
 		"Rules": rules,
diff --git a/agent/agent_test.go b/agent/agent_test.go
index 282e397c4b9bb..0b17190dd611e 100644
--- a/agent/agent_test.go
+++ b/agent/agent_test.go
@@ -90,7 +90,7 @@ func requireServiceMissing(t *testing.T, a *TestAgent, id string) {
 	require.Nil(t, getService(a, id), "have service %q (expected missing)", id)
 }
 
-func requireCheckExists(t testutil.TestingTB, a *TestAgent, id types.CheckID) *structs.HealthCheck {
+func requireCheckExists(t *testing.T, a *TestAgent, id types.CheckID) *structs.HealthCheck {
 	t.Helper()
 	chk := getCheck(a, id)
 	require.NotNil(t, chk, "missing check %q", id)
@@ -853,7 +853,7 @@ func TestAgent_CheckAliasRPC(t *testing.T) {
 	assert.NoError(t, err)
 
 	retry.Run(t, func(r *retry.R) {
-		r.Helper()
+		t.Helper()
 		var args structs.NodeSpecificRequest
 		args.Datacenter = "dc1"
 		args.Node = "node1"
@@ -1888,7 +1888,7 @@ func TestAgent_RestoreServiceWithAliasCheck(t *testing.T) {
 
 	// We do this so that the agent logs and the informational messages from
 	// the test itself are interwoven properly.
-	logf := func(a *TestAgent, format string, args ...interface{}) {
+	logf := func(t *testing.T, a *TestAgent, format string, args ...interface{}) {
 		a.logger.Info("testharness: " + fmt.Sprintf(format, args...))
 	}
 
@@ -1947,12 +1947,12 @@ func TestAgent_RestoreServiceWithAliasCheck(t *testing.T) {
 	retryUntilCheckState := func(t *testing.T, a *TestAgent, checkID string, expectedStatus string) {
 		t.Helper()
 		retry.Run(t, func(r *retry.R) {
-			chk := requireCheckExists(r, a, types.CheckID(checkID))
+			chk := requireCheckExists(t, a, types.CheckID(checkID))
 			if chk.Status != expectedStatus {
-				logf(a, "check=%q expected status %q but got %q", checkID, expectedStatus, chk.Status)
+				logf(t, a, "check=%q expected status %q but got %q", checkID, expectedStatus, chk.Status)
 				r.Fatalf("check=%q expected status %q but got %q", checkID, expectedStatus, chk.Status)
 			}
-			logf(a, "check %q has reached desired status %q", checkID, expectedStatus)
+			logf(t, a, "check %q has reached desired status %q", checkID, expectedStatus)
 		})
 	}
 
@@ -1963,7 +1963,7 @@ func TestAgent_RestoreServiceWithAliasCheck(t *testing.T) {
 	retryUntilCheckState(t, a, "service:ping", api.HealthPassing)
 	retryUntilCheckState(t, a, "service:ping-sidecar-proxy", api.HealthPassing)
 
-	logf(a, "==== POWERING DOWN ORIGINAL ====")
+	logf(t, a, "==== POWERING DOWN ORIGINAL ====")
 
 	require.NoError(t, a.Shutdown())
 
@@ -1985,7 +1985,7 @@ node_name = "` + a.Config.NodeName + `"
 		// reregister during standup; we use an adjustable timing to try and force a race
 		sleepDur := time.Duration(idx+1) * 500 * time.Millisecond
 		time.Sleep(sleepDur)
-		logf(a2, "re-registering checks and services after a delay of %v", sleepDur)
+		logf(t, a2, "re-registering checks and services after a delay of %v", sleepDur)
 		for i := 0; i < 20; i++ { // RACE RACE RACE!
 			registerServicesAndChecks(t, a2)
 			time.Sleep(50 * time.Millisecond)
@@ -1995,7 +1995,7 @@ node_name = "` + a.Config.NodeName + `"
 
 		retryUntilCheckState(t, a2, "service:ping", api.HealthPassing)
 
-		logf(a2, "giving the alias check a chance to notice...")
+		logf(t, a2, "giving the alias check a chance to notice...")
 		time.Sleep(5 * time.Second)
 
 		retryUntilCheckState(t, a2, "service:ping-sidecar-proxy", api.HealthPassing)
diff --git a/agent/catalog_endpoint_test.go b/agent/catalog_endpoint_test.go
index 10b1c8b887b5e..19d520220427c 100644
--- a/agent/catalog_endpoint_test.go
+++ b/agent/catalog_endpoint_test.go
@@ -1167,7 +1167,7 @@ func TestCatalogServiceNodes_DistanceSort(t *testing.T) {
 			r.Fatalf("err: %v", err)
 		}
 
-		assertIndex(r, resp)
+		assertIndex(t, resp)
 		nodes = obj.(structs.ServiceNodes)
 		if len(nodes) != 2 {
 			r.Fatalf("bad: %v", obj)
diff --git a/agent/config/runtime_test.go b/agent/config/runtime_test.go
index 8890fa443df1e..7158b014d15d1 100644
--- a/agent/config/runtime_test.go
+++ b/agent/config/runtime_test.go
@@ -69,9 +69,6 @@ var defaultGrpcTlsAddr = net.TCPAddrFromAddrPort(netip.MustParseAddrPort("127.0.
 // checks for warnings on deprecated fields and flags.  These tests
 // should check one option at a time if possible
 func TestLoad_IntegrationWithFlags(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
 	dataDir := testutil.TempDir(t, "config")
 
 	run := func(t *testing.T, tc testCase) {
diff --git a/agent/connect/ca/provider_vault_test.go b/agent/connect/ca/provider_vault_test.go
index 5b74946cada9c..edd094f5502a7 100644
--- a/agent/connect/ca/provider_vault_test.go
+++ b/agent/connect/ca/provider_vault_test.go
@@ -295,7 +295,7 @@ func TestVaultCAProvider_ConfigureFailureGoroutineLeakCheck(t *testing.T) {
 			profile := pprof.Lookup("goroutine")
 			sb := strings.Builder{}
 			require.NoError(r, profile.WriteTo(&sb, 2))
-			r.Log(sb.String())
+			t.Log(sb.String())
 			require.Contains(r, sb.String(),
 				"created by github.com/hashicorp/consul/agent/connect/ca.(*VaultProvider).Configure",
 				"expected renewal goroutine, got none")
@@ -628,9 +628,6 @@ func TestVaultCAProvider_SignLeaf(t *testing.T) {
 }
 
 func TestVaultCAProvider_CrossSignCA(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
 	SkipIfVaultNotPresent(t)
 
 	t.Parallel()
diff --git a/agent/connect/ca/testing.go b/agent/connect/ca/testing.go
index 8fcf8a3c65331..7386deea94944 100644
--- a/agent/connect/ca/testing.go
+++ b/agent/connect/ca/testing.go
@@ -126,7 +126,7 @@ func SkipIfVaultNotPresent(t testing.T, reqs ...vaultRequirements) {
 	}
 }
 
-func NewTestVaultServer(t retry.TestingTB) *TestVaultServer {
+func NewTestVaultServer(t testing.T) *TestVaultServer {
 	vaultBinaryName := os.Getenv("VAULT_BINARY_NAME")
 	if vaultBinaryName == "" {
 		vaultBinaryName = "vault"
@@ -204,7 +204,7 @@ func (v *TestVaultServer) Client() *vaultapi.Client {
 	return v.client
 }
 
-func (v *TestVaultServer) WaitUntilReady(t retry.TestingTB) {
+func (v *TestVaultServer) WaitUntilReady(t testing.T) {
 	var version string
 	retry.Run(t, func(r *retry.R) {
 		resp, err := v.client.Sys().Health()
diff --git a/agent/connect/testing_spiffe.go b/agent/connect/testing_spiffe.go
index e50b2b3b90cd8..fdbff5eda67d7 100644
--- a/agent/connect/testing_spiffe.go
+++ b/agent/connect/testing_spiffe.go
@@ -3,22 +3,24 @@
 
 package connect
 
-import "github.com/hashicorp/consul/sdk/testutil"
+import (
+	"github.com/mitchellh/go-testing-interface"
+)
 
 // TestSpiffeIDService returns a SPIFFE ID representing a service.
-func TestSpiffeIDService(t testutil.TestingTB, service string) *SpiffeIDService {
+func TestSpiffeIDService(t testing.T, service string) *SpiffeIDService {
 	return TestSpiffeIDServiceWithHost(t, service, TestClusterID+".consul")
 }
 
 // TestSpiffeIDServiceWithHost returns a SPIFFE ID representing a service with
 // the specified trust domain.
-func TestSpiffeIDServiceWithHost(t testutil.TestingTB, service, host string) *SpiffeIDService {
+func TestSpiffeIDServiceWithHost(t testing.T, service, host string) *SpiffeIDService {
 	return TestSpiffeIDServiceWithHostDC(t, service, host, "dc1")
 }
 
 // TestSpiffeIDServiceWithHostDC returns a SPIFFE ID representing a service with
 // the specified trust domain for the given datacenter.
-func TestSpiffeIDServiceWithHostDC(t testutil.TestingTB, service, host, datacenter string) *SpiffeIDService {
+func TestSpiffeIDServiceWithHostDC(t testing.T, service, host, datacenter string) *SpiffeIDService {
 	return &SpiffeIDService{
 		Host:       host,
 		Namespace:  "default",
diff --git a/agent/consul/acl_endpoint_test.go b/agent/consul/acl_endpoint_test.go
index 7033e90881ee9..39840942d1851 100644
--- a/agent/consul/acl_endpoint_test.go
+++ b/agent/consul/acl_endpoint_test.go
@@ -3663,37 +3663,6 @@ func TestACLEndpoint_BindingRuleSet(t *testing.T) {
 		require.Equal(t, "test-node", rule.BindName)
 	})
 
-	t.Run("Bind Policy", func(t *testing.T) {
-		req := structs.ACLBindingRuleSetRequest{
-			Datacenter: "dc1",
-			BindingRule: structs.ACLBindingRule{
-				Description: "foobar policy",
-				AuthMethod:  testAuthMethod.Name,
-				Selector:    "serviceaccount.name==abc",
-				BindType:    structs.BindingRuleBindTypePolicy,
-				BindName:    "test-policy",
-			},
-			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, "foobar policy")
-		require.Equal(t, rule.AuthMethod, testAuthMethod.Name)
-		require.Equal(t, "serviceaccount.name==abc", rule.Selector)
-		require.Equal(t, structs.BindingRuleBindTypePolicy, rule.BindType)
-		require.Equal(t, "test-policy", rule.BindName)
-	})
-
 	t.Run("templated policy", func(t *testing.T) {
 		req := structs.ACLBindingRuleSetRequest{
 			Datacenter: "dc1",
@@ -3872,7 +3841,7 @@ func TestACLEndpoint_BindingRuleSet(t *testing.T) {
 	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, "Invalid Binding Rule: unknown BindType")
 	})
 
 	t.Run("Create fails; bind name with unknown vars", func(t *testing.T) {
@@ -4571,11 +4540,6 @@ func TestACLEndpoint_Login(t *testing.T) {
 		"fake-node",
 		"default", "mynode", "jkl101",
 	)
-	testauth.InstallSessionToken(
-		testSessionID,
-		"fake-policy", // 1 rule (policy)
-		"default", "mypolicy", "jkl012",
-	)
 
 	method, err := upsertTestAuthMethod(codec, TestDefaultInitialManagementToken, "dc1", testSessionID)
 	require.NoError(t, err)
@@ -4623,15 +4587,6 @@ func TestACLEndpoint_Login(t *testing.T) {
 	)
 	require.NoError(t, err)
 
-	// policy rule
-	_, err = upsertTestBindingRule(
-		codec, TestDefaultInitialManagementToken, "dc1", method.Name,
-		"serviceaccount.namespace==default and serviceaccount.name==mypolicy",
-		structs.BindingRuleBindTypePolicy,
-		"method-${serviceaccount.name}",
-	)
-	require.NoError(t, err)
-
 	t.Run("do not provide a token", func(t *testing.T) {
 		req := structs.ACLLoginRequest{
 			Auth: &structs.ACLLoginParams{
diff --git a/agent/consul/auth/binder.go b/agent/consul/auth/binder.go
index ba66bc916bdbe..1964cc5a877ea 100644
--- a/agent/consul/auth/binder.go
+++ b/agent/consul/auth/binder.go
@@ -36,16 +36,14 @@ func NewBinder(store BinderStateStore, datacenter string) *Binder {
 type BinderStateStore interface {
 	ACLBindingRuleList(ws memdb.WatchSet, methodName string, entMeta *acl.EnterpriseMeta) (uint64, structs.ACLBindingRules, error)
 	ACLRoleGetByName(ws memdb.WatchSet, roleName string, entMeta *acl.EnterpriseMeta) (uint64, *structs.ACLRole, error)
-	ACLPolicyGetByName(ws memdb.WatchSet, policyName string, entMeta *acl.EnterpriseMeta) (uint64, *structs.ACLPolicy, error)
 }
 
-// Bindings contains the ACL roles, service identities, node identities, policies,
+// Bindings contains the ACL roles, service identities, node identities,
 // templated policies, and enterprise meta to be assigned to the created token.
 type Bindings struct {
 	Roles             []structs.ACLTokenRoleLink
 	ServiceIdentities []*structs.ACLServiceIdentity
 	NodeIdentities    []*structs.ACLNodeIdentity
-	Policies          []structs.ACLTokenPolicyLink
 	TemplatedPolicies structs.ACLTemplatedPolicies
 	EnterpriseMeta    acl.EnterpriseMeta
 }
@@ -60,8 +58,7 @@ func (b *Bindings) None() bool {
 	return len(b.ServiceIdentities) == 0 &&
 		len(b.NodeIdentities) == 0 &&
 		len(b.TemplatedPolicies) == 0 &&
-		len(b.Roles) == 0 &&
-		len(b.Policies) == 0
+		len(b.Roles) == 0
 }
 
 // Bind collects the ACL roles, service identities, etc. to be assigned to the
@@ -122,24 +119,6 @@ func (b *Binder) Bind(authMethod *structs.ACLAuthMethod, verifiedIdentity *authm
 			}
 			bindings.TemplatedPolicies = append(bindings.TemplatedPolicies, templatedPolicy)
 
-		case structs.BindingRuleBindTypePolicy:
-			bindName, err := computeBindName(rule.BindName, verifiedIdentity.ProjectedVars, acl.IsValidRoleName)
-			if err != nil {
-				return nil, err
-			}
-
-			_, policy, err := b.store.ACLPolicyGetByName(nil, bindName, &bindings.EnterpriseMeta)
-			if err != nil {
-				return nil, err
-			}
-
-			if policy != nil {
-				bindings.Policies = append(bindings.Policies, structs.ACLTokenPolicyLink{
-					ID:   policy.ID,
-					Name: policy.Name,
-				})
-			}
-
 		case structs.BindingRuleBindTypeRole:
 			bindName, err := computeBindName(rule.BindName, verifiedIdentity.ProjectedVars, acl.IsValidRoleName)
 			if err != nil {
@@ -198,13 +177,8 @@ func IsValidBindingRule(bindType, bindName string, bindVars *structs.ACLTemplate
 		if _, err := computeBindName(bindName, fakeVarMap, acl.IsValidRoleName); err != nil {
 			return fmt.Errorf("failed to validate bindType %q: %w", bindType, err)
 		}
-
-	case structs.BindingRuleBindTypePolicy:
-		if _, err := computeBindName(bindName, fakeVarMap, acl.IsValidPolicyName); 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 fmt.Errorf("Invalid Binding Rule: unknown BindType %q", bindType)
 	}
 
 	return nil
diff --git a/agent/consul/auth/binder_test.go b/agent/consul/auth/binder_test.go
index 3220ff2b303c1..41e0d14ddc35f 100644
--- a/agent/consul/auth/binder_test.go
+++ b/agent/consul/auth/binder_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/hashicorp/consul/agent/consul/authmethod"
 	"github.com/hashicorp/consul/agent/consul/state"
 	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/api"
 )
 
 func TestBindings_None(t *testing.T) {
@@ -28,79 +27,11 @@ func TestBindings_None(t *testing.T) {
 	b = &Bindings{Roles: []structs.ACLTokenRoleLink{{ID: generateID(t)}}}
 	require.False(t, b.None())
 
-	b = &Bindings{Policies: []structs.ACLTokenPolicyLink{{ID: generateID(t)}}}
-	require.False(t, b.None())
-
 	b = &Bindings{ServiceIdentities: []*structs.ACLServiceIdentity{{ServiceName: "web"}}}
 	require.False(t, b.None())
 
 	b = &Bindings{NodeIdentities: []*structs.ACLNodeIdentity{{NodeName: "node-123"}}}
 	require.False(t, b.None())
-
-	b = &Bindings{TemplatedPolicies: []*structs.ACLTemplatedPolicy{{TemplateName: api.ACLTemplatedPolicyDNSName}}}
-	require.False(t, b.None())
-}
-
-func TestBinder_Policy_Success(t *testing.T) {
-	store := testStateStore(t)
-	binder := &Binder{store: store}
-
-	authMethod := &structs.ACLAuthMethod{
-		Name: "test-auth-method",
-		Type: "testing",
-	}
-	require.NoError(t, store.ACLAuthMethodSet(0, authMethod))
-
-	targetPolicy := &structs.ACLPolicy{
-		ID:   generateID(t),
-		Name: "foo-policy",
-	}
-	require.NoError(t, store.ACLPolicySet(0, targetPolicy))
-
-	otherPolicy := &structs.ACLPolicy{
-		ID:   generateID(t),
-		Name: "not-my-policy",
-	}
-	require.NoError(t, store.ACLPolicySet(0, otherPolicy))
-
-	bindingRules := structs.ACLBindingRules{
-		{
-			ID:         generateID(t),
-			Selector:   "role==engineer",
-			BindType:   structs.BindingRuleBindTypePolicy,
-			BindName:   "${editor}-policy",
-			AuthMethod: authMethod.Name,
-		},
-		{
-			ID:         generateID(t),
-			Selector:   "role==engineer",
-			BindType:   structs.BindingRuleBindTypePolicy,
-			BindName:   "this-policy-does-not-exist",
-			AuthMethod: authMethod.Name,
-		},
-		{
-			ID:         generateID(t),
-			Selector:   "language==js",
-			BindType:   structs.BindingRuleBindTypePolicy,
-			BindName:   otherPolicy.Name,
-			AuthMethod: authMethod.Name,
-		},
-	}
-	require.NoError(t, store.ACLBindingRuleBatchSet(0, bindingRules))
-
-	result, err := binder.Bind(&structs.ACLAuthMethod{}, &authmethod.Identity{
-		SelectableFields: map[string]string{
-			"role":     "engineer",
-			"language": "go",
-		},
-		ProjectedVars: map[string]string{
-			"editor": "foo",
-		},
-	})
-	require.NoError(t, err)
-	require.Equal(t, []structs.ACLTokenPolicyLink{
-		{ID: targetPolicy.ID, Name: targetPolicy.Name},
-	}, result.Policies)
 }
 
 func TestBinder_Roles_Success(t *testing.T) {
@@ -191,32 +122,6 @@ func TestBinder_Roles_NameValidation(t *testing.T) {
 	require.Contains(t, err.Error(), "invalid bind name")
 }
 
-func TestBinder_Policy_NameValidation(t *testing.T) {
-	store := testStateStore(t)
-	binder := &Binder{store: store}
-
-	authMethod := &structs.ACLAuthMethod{
-		Name: "test-auth-method",
-		Type: "testing",
-	}
-	require.NoError(t, store.ACLAuthMethodSet(0, authMethod))
-
-	bindingRules := structs.ACLBindingRules{
-		{
-			ID:         generateID(t),
-			Selector:   "",
-			BindType:   structs.BindingRuleBindTypePolicy,
-			BindName:   "INVALID!",
-			AuthMethod: authMethod.Name,
-		},
-	}
-	require.NoError(t, store.ACLBindingRuleBatchSet(0, bindingRules))
-
-	_, err := binder.Bind(&structs.ACLAuthMethod{}, &authmethod.Identity{})
-	require.Error(t, err)
-	require.Contains(t, err.Error(), "invalid bind name")
-}
-
 func TestBinder_ServiceIdentities_Success(t *testing.T) {
 	store := testStateStore(t)
 	binder := &Binder{store: store}
@@ -370,60 +275,54 @@ func Test_IsValidBindingRule(t *testing.T) {
 			"invalid", "blah", nil, "", true},
 		// valid HIL, invalid name
 		{"empty",
-			"all", "", nil, "", true},
+			"both", "", nil, "", true},
 		{"just end",
-			"all", "}", nil, "", true},
+			"both", "}", nil, "", true},
 		{"var without start",
-			"all", " item }", nil, "item", true},
+			"both", " item }", nil, "item", true},
 		{"two vars missing second start",
-			"all", "before-${ item }after--more }", nil, "item,more", true},
+			"both", "before-${ item }after--more }", nil, "item,more", true},
 		// names for the two types are validated differently
 		{"@ is disallowed",
-			"all", "bad@name", nil, "", true},
+			"both", "bad@name", nil, "", true},
 		{"leading dash",
 			"role", "-name", nil, "", false},
-		{"leading dash",
-			"policy", "-name", nil, "", false},
 		{"leading dash",
 			"service", "-name", nil, "", true},
 		{"trailing dash",
 			"role", "name-", nil, "", false},
-		{"trailing dash",
-			"policy", "name-", nil, "", false},
 		{"trailing dash",
 			"service", "name-", nil, "", true},
 		{"inner dash",
-			"all", "name-end", nil, "", false},
+			"both", "name-end", nil, "", false},
 		{"upper case",
 			"role", "NAME", nil, "", false},
-		{"upper case",
-			"policy", "NAME", nil, "", false},
 		{"upper case",
 			"service", "NAME", nil, "", true},
 		// valid HIL, valid name
 		{"no vars",
-			"all", "nothing", nil, "", false},
+			"both", "nothing", nil, "", false},
 		{"just var",
-			"all", "${item}", nil, "item", false},
+			"both", "${item}", nil, "item", false},
 		{"var in middle",
-			"all", "before-${item}after", nil, "item", false},
+			"both", "before-${item}after", nil, "item", false},
 		{"two vars",
-			"all", "before-${item}after-${more}", nil, "item,more", false},
+			"both", "before-${item}after-${more}", nil, "item,more", false},
 		// bad
 		{"no bind name",
-			"all", "", nil, "", true},
+			"both", "", nil, "", true},
 		{"just start",
-			"all", "${", nil, "", true},
+			"both", "${", nil, "", true},
 		{"backwards",
-			"all", "}${", nil, "", true},
+			"both", "}${", nil, "", true},
 		{"no varname",
-			"all", "${}", nil, "", true},
+			"both", "${}", nil, "", true},
 		{"missing map key",
-			"all", "${item}", nil, "", true},
+			"both", "${item}", nil, "", true},
 		{"var without end",
-			"all", "${ item ", nil, "item", true},
+			"both", "${ item ", nil, "item", true},
 		{"two vars missing first end",
-			"all", "before-${ item after-${ more }", nil, "item,more", true},
+			"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},
@@ -439,16 +338,12 @@ func Test_IsValidBindingRule(t *testing.T) {
 			"templated-policy", "builtin/service", &structs.ACLTemplatedPolicyVariables{Name: "before-${item}after-${more}"}, "item,more", false},
 	} {
 		var cases []testcase
-		if test.bindType == "all" {
+		if test.bindType == "both" {
 			test1 := test
 			test1.bindType = "role"
 			test2 := test
 			test2.bindType = "service"
-			test3 := test
-			test3.bindType = "policy"
-			test4 := test
-			test4.bindType = "node"
-			cases = []testcase{test1, test2, test3, test4}
+			cases = []testcase{test1, test2}
 		} else {
 			cases = []testcase{test}
 		}
diff --git a/agent/consul/auth/login.go b/agent/consul/auth/login.go
index 0b9b5eeac77ae..a084f33bf19bf 100644
--- a/agent/consul/auth/login.go
+++ b/agent/consul/auth/login.go
@@ -48,7 +48,6 @@ func (l *Login) TokenForVerifiedIdentity(identity *authmethod.Identity, authMeth
 		NodeIdentities:    bindings.NodeIdentities,
 		TemplatedPolicies: bindings.TemplatedPolicies,
 		Roles:             bindings.Roles,
-		Policies:          bindings.Policies,
 		EnterpriseMeta:    bindings.EnterpriseMeta,
 	}
 	token.ACLAuthMethodEnterpriseMeta.FillWithEnterpriseMeta(&authMethod.EnterpriseMeta)
diff --git a/agent/consul/client_test.go b/agent/consul/client_test.go
index a3967e8c63cd1..1d6fa28b526c0 100644
--- a/agent/consul/client_test.go
+++ b/agent/consul/client_test.go
@@ -509,7 +509,7 @@ func newClient(t *testing.T, config *Config) *Client {
 	return client
 }
 
-func newTestResolverConfig(t testutil.TestingTB, suffix string, dc, agentType string) resolver.Config {
+func newTestResolverConfig(t *testing.T, suffix string, dc, agentType string) resolver.Config {
 	n := t.Name()
 	s := strings.Replace(n, "/", "", -1)
 	s = strings.Replace(s, "_", "", -1)
@@ -520,7 +520,7 @@ func newTestResolverConfig(t testutil.TestingTB, suffix string, dc, agentType st
 	}
 }
 
-func newDefaultDeps(t testutil.TestingTB, c *Config) Deps {
+func newDefaultDeps(t *testing.T, c *Config) Deps {
 	t.Helper()
 
 	logger := hclog.NewInterceptLogger(&hclog.LoggerOptions{
diff --git a/agent/consul/discoverychain/compile_test.go b/agent/consul/discoverychain/compile_test.go
index 8c9c9dfec7f8e..29c1d7005ef88 100644
--- a/agent/consul/discoverychain/compile_test.go
+++ b/agent/consul/discoverychain/compile_test.go
@@ -1772,6 +1772,9 @@ func testcase_DefaultResolver_WithProxyDefaults() compileTestCase {
 		Kind:     structs.ProxyDefaults,
 		Name:     structs.ProxyConfigGlobal,
 		Protocol: "grpc",
+		Config: map[string]interface{}{
+			"protocol": "grpc",
+		},
 		MeshGateway: structs.MeshGatewayConfig{
 			Mode: structs.MeshGatewayModeRemote,
 		},
diff --git a/agent/consul/discoverychain/gateway.go b/agent/consul/discoverychain/gateway.go
index c60c77b028fbf..3435233aafed1 100644
--- a/agent/consul/discoverychain/gateway.go
+++ b/agent/consul/discoverychain/gateway.go
@@ -257,7 +257,7 @@ func targetForResolverNode(nodeName string, chains []*structs.CompiledDiscoveryC
 	splitterName := splitterPrefix + strings.TrimPrefix(nodeName, resolverPrefix)
 
 	for _, c := range chains {
-		targetChainPrefix := resolverPrefix + c.ServiceName + "."
+		targetChainPrefix := resolverPrefix + c.ID()
 		if strings.HasPrefix(nodeName, targetChainPrefix) && len(c.Nodes) == 1 {
 			// we have a virtual resolver that just maps to another resolver, return
 			// the given node name
diff --git a/agent/consul/discoverychain/gateway_test.go b/agent/consul/discoverychain/gateway_test.go
index 85ad3ddfee7c2..91931337c42e2 100644
--- a/agent/consul/discoverychain/gateway_test.go
+++ b/agent/consul/discoverychain/gateway_test.go
@@ -712,6 +712,7 @@ func TestGatewayChainSynthesizer_Synthesize(t *testing.T) {
 			chain: &structs.CompiledDiscoveryChain{
 				ServiceName: "foo",
 				Namespace:   "default",
+				Partition:   "default",
 				Datacenter:  "dc1",
 				StartNode:   "resolver:foo-2.default.default.dc2",
 				Nodes: map[string]*structs.DiscoveryGraphNode{
diff --git a/agent/consul/enterprise_server_ce_test.go b/agent/consul/enterprise_server_ce_test.go
index c039997a03f51..1a3622d5d743c 100644
--- a/agent/consul/enterprise_server_ce_test.go
+++ b/agent/consul/enterprise_server_ce_test.go
@@ -6,11 +6,12 @@
 package consul
 
 import (
-	"github.com/hashicorp/consul/sdk/testutil"
+	"testing"
+
 	hclog "github.com/hashicorp/go-hclog"
 )
 
-func newDefaultDepsEnterprise(t testutil.TestingTB, _ hclog.Logger, _ *Config) EnterpriseDeps {
+func newDefaultDepsEnterprise(t *testing.T, _ hclog.Logger, _ *Config) EnterpriseDeps {
 	t.Helper()
 	return EnterpriseDeps{}
 }
diff --git a/agent/consul/fsm/commands_ce.go b/agent/consul/fsm/commands_ce.go
index 77bc94de1a9ae..c5e7fd968238b 100644
--- a/agent/consul/fsm/commands_ce.go
+++ b/agent/consul/fsm/commands_ce.go
@@ -4,7 +4,6 @@
 package fsm
 
 import (
-	"errors"
 	"fmt"
 	"time"
 
@@ -153,11 +152,7 @@ func init() {
 func (c *FSM) applyRegister(buf []byte, index uint64) interface{} {
 	defer metrics.MeasureSince([]string{"fsm", "register"}, time.Now())
 	var req structs.RegisterRequest
-	if err := decodeRegistrationReq(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted register request")
-			return nil
-		}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 
@@ -172,11 +167,7 @@ func (c *FSM) applyRegister(buf []byte, index uint64) interface{} {
 func (c *FSM) applyDeregister(buf []byte, index uint64) interface{} {
 	defer metrics.MeasureSince([]string{"fsm", "deregister"}, time.Now())
 	var req structs.DeregisterRequest
-	if err := decodeDeregistrationReq(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted deregister request")
-			return nil
-		}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 
@@ -204,11 +195,7 @@ func (c *FSM) applyDeregister(buf []byte, index uint64) interface{} {
 
 func (c *FSM) applyKVSOperation(buf []byte, index uint64) interface{} {
 	var req structs.KVSRequest
-	if err := decodeKVSRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted KV request")
-			return nil
-		}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "kvs"}, time.Now(),
@@ -253,11 +240,7 @@ func (c *FSM) applyKVSOperation(buf []byte, index uint64) interface{} {
 
 func (c *FSM) applySessionOperation(buf []byte, index uint64) interface{} {
 	var req structs.SessionRequest
-	if err := decodeSessionRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted session request")
-			return nil
-		}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "session"}, time.Now(),
@@ -316,11 +299,7 @@ func (c *FSM) applyCoordinateBatchUpdate(buf []byte, index uint64) interface{} {
 // state store.
 func (c *FSM) applyPreparedQueryOperation(buf []byte, index uint64) interface{} {
 	var req structs.PreparedQueryRequest
-	if err := decodePreparedQueryRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted prepared query request")
-			return nil
-		}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 
@@ -339,7 +318,7 @@ func (c *FSM) applyPreparedQueryOperation(buf []byte, index uint64) interface{}
 
 func (c *FSM) applyTxn(buf []byte, index uint64) interface{} {
 	var req structs.TxnRequest
-	if err := decodeTxnRequest(buf, &req); err != nil {
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSince([]string{"fsm", "txn"}, time.Now())
@@ -506,7 +485,7 @@ func (c *FSM) applyConnectCALeafOperation(buf []byte, index uint64) interface{}
 
 func (c *FSM) applyACLTokenSetOperation(buf []byte, index uint64) interface{} {
 	var req structs.ACLTokenBatchSetRequest
-	if err := decodeACLTokenBatchSetRequest(buf, &req); err != nil {
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "acl", "token"}, time.Now(),
@@ -544,7 +523,7 @@ func (c *FSM) applyACLTokenBootstrap(buf []byte, index uint64) interface{} {
 
 func (c *FSM) applyACLPolicySetOperation(buf []byte, index uint64) interface{} {
 	var req structs.ACLPolicyBatchSetRequest
-	if err := decodeACLPolicyBatchSetRequest(buf, &req); err != nil {
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "acl", "policy"}, time.Now(),
@@ -565,12 +544,10 @@ func (c *FSM) applyACLPolicyDeleteOperation(buf []byte, index uint64) interface{
 }
 
 func (c *FSM) applyConfigEntryOperation(buf []byte, index uint64) interface{} {
-	req := structs.ConfigEntryRequest{}
-	if err := decodeConfigEntryOperationRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted config entry request")
-			return nil
-		}
+	req := structs.ConfigEntryRequest{
+		Entry: &structs.ProxyConfigEntry{},
+	}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 
@@ -617,7 +594,7 @@ func (c *FSM) applyConfigEntryOperation(buf []byte, index uint64) interface{} {
 
 func (c *FSM) applyACLRoleSetOperation(buf []byte, index uint64) interface{} {
 	var req structs.ACLRoleBatchSetRequest
-	if err := decodeACLRoleBatchSetRequest(buf, &req); err != nil {
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "acl", "role"}, time.Now(),
@@ -639,7 +616,7 @@ func (c *FSM) applyACLRoleDeleteOperation(buf []byte, index uint64) interface{}
 
 func (c *FSM) applyACLBindingRuleSetOperation(buf []byte, index uint64) interface{} {
 	var req structs.ACLBindingRuleBatchSetRequest
-	if err := decodeACLBindingRuleBatchSetRequest(buf, &req); err != nil {
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "acl", "bindingrule"}, time.Now(),
@@ -661,7 +638,7 @@ func (c *FSM) applyACLBindingRuleDeleteOperation(buf []byte, index uint64) inter
 
 func (c *FSM) applyACLAuthMethodSetOperation(buf []byte, index uint64) interface{} {
 	var req structs.ACLAuthMethodBatchSetRequest
-	if err := decodeACLAuthMethodBatchSetRequest(buf, &req); err != nil {
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "acl", "authmethod"}, time.Now(),
@@ -672,11 +649,7 @@ func (c *FSM) applyACLAuthMethodSetOperation(buf []byte, index uint64) interface
 
 func (c *FSM) applyACLAuthMethodDeleteOperation(buf []byte, index uint64) interface{} {
 	var req structs.ACLAuthMethodBatchDeleteRequest
-	if err := decodeACLAuthMethodBatchDeleteRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted acl auth method delete request")
-			return nil
-		}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 	defer metrics.MeasureSinceWithLabels([]string{"fsm", "acl", "authmethod"}, time.Now(),
@@ -733,11 +706,7 @@ func (c *FSM) applySystemMetadataOperation(buf []byte, index uint64) interface{}
 
 func (c *FSM) applyPeeringWrite(buf []byte, index uint64) interface{} {
 	var req pbpeering.PeeringWriteRequest
-	if err := decodePeeringWriteRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted peering write request")
-			return nil
-		}
+	if err := structs.DecodeProto(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode peering write request: %v", err))
 	}
 
@@ -749,11 +718,7 @@ func (c *FSM) applyPeeringWrite(buf []byte, index uint64) interface{} {
 
 func (c *FSM) applyPeeringDelete(buf []byte, index uint64) interface{} {
 	var req pbpeering.PeeringDeleteRequest
-	if err := decodePeeringDeleteRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted peering delete request")
-			return nil
-		}
+	if err := structs.DecodeProto(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode peering delete request: %v", err))
 	}
 
@@ -793,11 +758,7 @@ func (c *FSM) applyPeeringTerminate(buf []byte, index uint64) interface{} {
 
 func (c *FSM) applyPeeringTrustBundleWrite(buf []byte, index uint64) interface{} {
 	var req pbpeering.PeeringTrustBundleWriteRequest
-	if err := decodePeeringTrustBundleWriteRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted peering trust bundle write request")
-			return nil
-		}
+	if err := structs.DecodeProto(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode peering trust bundle write request: %v", err))
 	}
 
@@ -809,11 +770,7 @@ func (c *FSM) applyPeeringTrustBundleWrite(buf []byte, index uint64) interface{}
 
 func (c *FSM) applyPeeringTrustBundleDelete(buf []byte, index uint64) interface{} {
 	var req pbpeering.PeeringTrustBundleDeleteRequest
-	if err := decodePeeringTrustBundleDeleteRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted peering trust bundle delete request")
-			return nil
-		}
+	if err := structs.DecodeProto(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode peering trust bundle delete request: %v", err))
 	}
 
@@ -833,11 +790,7 @@ func (f *FSM) applyResourceOperation(buf []byte, idx uint64) any {
 
 func (c *FSM) applyManualVirtualIPs(buf []byte, index uint64) interface{} {
 	var req state.ServiceVirtualIP
-	if err := decodeServiceVirtualIPRequest(buf, &req); err != nil {
-		if errors.Is(err, ErrDroppingTenantedReq) {
-			c.logger.Warn("dropping tenanted virtual ip request")
-			return nil
-		}
+	if err := structs.Decode(buf, &req); err != nil {
 		panic(fmt.Errorf("failed to decode request: %v", err))
 	}
 
diff --git a/agent/consul/fsm/decode_ce.go b/agent/consul/fsm/decode_ce.go
deleted file mode 100644
index 2f4d3da3a26cb..0000000000000
--- a/agent/consul/fsm/decode_ce.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-// +build !consulent
-
-package fsm
-
-import (
-	"github.com/hashicorp/consul/agent/consul/state"
-	"github.com/hashicorp/consul/agent/structs"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-)
-
-func decodeRegistrationReq(buf []byte, req *structs.RegisterRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeRegistration(buf, req)
-}
-
-func decodeDeregistrationReq(buf []byte, req *structs.DeregisterRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeDeregistration(buf, req)
-}
-
-func decodeKVSRequest(buf []byte, req *structs.KVSRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeKVS(buf, req)
-}
-
-func decodeSessionRequest(buf []byte, req *structs.SessionRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-
-	return decodeSession(buf, req)
-}
-
-func decodePreparedQueryRequest(buf []byte, req *structs.PreparedQueryRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodePreparedQuery(buf, req)
-}
-
-func decodeTxnRequest(buf []byte, req *structs.TxnRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeTxn(buf, req)
-}
-
-func decodeACLTokenBatchSetRequest(buf []byte, req *structs.ACLTokenBatchSetRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeACLTokenBatchSet(buf, req)
-
-}
-
-func decodeACLPolicyBatchSetRequest(buf []byte, req *structs.ACLPolicyBatchSetRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeACLPolicyBatchSet(buf, req)
-
-}
-
-func decodeACLRoleBatchSetRequest(buf []byte, req *structs.ACLRoleBatchSetRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeACLRoleBatchSet(buf, req)
-}
-
-func decodeACLBindingRuleBatchSetRequest(buf []byte, req *structs.ACLBindingRuleBatchSetRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeACLBindingRuleBatchSet(buf, req)
-}
-
-func decodeACLAuthMethodBatchSetRequest(buf []byte, req *structs.ACLAuthMethodBatchSetRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeACLAuthMethodBatchSet(buf, req)
-}
-
-func decodeACLAuthMethodBatchDeleteRequest(buf []byte, req *structs.ACLAuthMethodBatchDeleteRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-
-	return decodeACLAuthMethodBatchDelete(buf, req)
-}
-
-func decodeServiceVirtualIPRequest(buf []byte, req *state.ServiceVirtualIP) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-	return decodeServiceVirtualIP(buf, req)
-}
-
-func decodePeeringWriteRequest(buf []byte, req *pbpeering.PeeringWriteRequest) error {
-	if !structs.CEDowngrade {
-		return structs.DecodeProto(buf, req)
-	}
-	return decodePeeringWrite(buf, req)
-}
-
-func decodePeeringDeleteRequest(buf []byte, req *pbpeering.PeeringDeleteRequest) error {
-	if !structs.CEDowngrade {
-		return structs.DecodeProto(buf, req)
-	}
-
-	return decodePeeringDelete(buf, req)
-}
-
-func decodePeeringTrustBundleWriteRequest(buf []byte, req *pbpeering.PeeringTrustBundleWriteRequest) error {
-	if !structs.CEDowngrade {
-		return structs.DecodeProto(buf, req)
-	}
-	return decodePeeringTrustBundleWrite(buf, req)
-}
-
-func decodePeeringTrustBundleDeleteRequest(buf []byte, req *pbpeering.PeeringTrustBundleDeleteRequest) error {
-	if !structs.CEDowngrade {
-		return structs.DecodeProto(buf, req)
-	}
-	return decodePeeringTrustBundleDelete(buf, req)
-}
-
-func decodeConfigEntryOperationRequest(buf []byte, req *structs.ConfigEntryRequest) error {
-	if !structs.CEDowngrade {
-		return structs.Decode(buf, req)
-	}
-
-	return decodeConfigEntryOperation(buf, req)
-}
diff --git a/agent/consul/fsm/decode_downgrade.go b/agent/consul/fsm/decode_downgrade.go
deleted file mode 100644
index 7b8e2fce719f2..0000000000000
--- a/agent/consul/fsm/decode_downgrade.go
+++ /dev/null
@@ -1,1011 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package fsm
-
-import (
-	"errors"
-	"fmt"
-
-	"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/lib"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-)
-
-func IsEnterpriseData(namespace, partition string) bool {
-	if (namespace != "" && namespace != "default") || (partition != "" && partition != "default") {
-		return true
-	}
-	return false
-}
-
-var errIncompatibleTenantedData = errors.New("incompatible tenanted data")
-var ErrDroppingTenantedReq = errors.New("dropping tenanted request")
-
-func decodeRegistration(buf []byte, req *structs.RegisterRequest) error {
-	type serviceRequest struct {
-		Namespace string
-		Partition string
-		*structs.NodeService
-	}
-	type checkRequest struct {
-		Namespace string
-		Partition string
-		*structs.HealthCheck
-	}
-	type NewRegReq struct {
-
-		// shadows the Service field from the register request so that we can detect
-		// tenanted service registrations for untenanted nodes
-		Service *serviceRequest
-
-		// shadows the Check field from the register request so that we can detect
-		// tenanted check registrations for untenanted nodes.
-		Check *checkRequest
-
-		// shadows the Checks field for the same reasons as the singular version.
-		Checks []*checkRequest
-
-		// Allows parsing the namespace of the whole request/node
-		Namespace string
-
-		// Allows parsing the partition of the whole request/node
-		Partition string
-		*structs.RegisterRequest
-	}
-	var newReq NewRegReq
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	// checks if the node is tenanted
-	if IsEnterpriseData(newReq.Namespace, newReq.Partition) {
-		// the whole request can be dropped because the node itself is tenanted
-		return ErrDroppingTenantedReq
-	}
-
-	// check if the service is tenanted
-	if newReq.Service != nil && !IsEnterpriseData(newReq.Service.Namespace, newReq.Service.Partition) {
-		// copy the shadow service pointer into the real RegisterRequest
-		newReq.RegisterRequest.Service = newReq.Service.NodeService
-	}
-
-	// check if the singular check is tenanted
-	if newReq.Check != nil && !IsEnterpriseData(newReq.Check.Namespace, newReq.Check.Partition) {
-		newReq.RegisterRequest.Check = newReq.Check.HealthCheck
-	}
-
-	// check for tenanted checks in the slice
-	for _, chk := range newReq.Checks {
-		if !IsEnterpriseData(chk.Namespace, chk.Partition) {
-			newReq.RegisterRequest.Checks = append(newReq.RegisterRequest.Checks, chk.HealthCheck)
-		}
-	}
-	// copy the data to the output request value
-	*req = *newReq.RegisterRequest
-	return nil
-}
-
-func decodeDeregistration(buf []byte, req *structs.DeregisterRequest) error {
-	type NewDeRegReq struct {
-		Namespace string
-
-		// Allows parsing the partition of the whole request/node
-		Partition string
-
-		*structs.DeregisterRequest
-
-		// Allows parsing the namespace of the whole request/node
-
-	}
-	var newReq NewDeRegReq
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	// checks if the node is tenanted
-	if IsEnterpriseData(newReq.Namespace, newReq.Partition) {
-		// the whole request can be dropped because the node itself is tenanted
-		return ErrDroppingTenantedReq
-	}
-
-	// copy the data to the output request value
-	*req = *newReq.DeregisterRequest
-	return nil
-}
-
-func decodeKVS(buf []byte, req *structs.KVSRequest) error {
-	type dirEntryReq struct {
-		Namespace string
-		Partition string
-		*structs.DirEntry
-	}
-	type NewDirEntReq struct {
-		// shadows the DirEnt field from  KVSRequest  so that we can detect
-		// tenanted service registrations for untenanted nodes
-		DirEnt *dirEntryReq
-		*structs.KVSRequest
-	}
-	var newReq NewDirEntReq
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	if newReq.DirEnt != nil && IsEnterpriseData(newReq.DirEnt.Namespace, newReq.DirEnt.Partition) {
-		return ErrDroppingTenantedReq
-	}
-
-	newReq.KVSRequest.DirEnt = *newReq.DirEnt.DirEntry
-	*req = *newReq.KVSRequest
-	return nil
-}
-
-func decodeSession(buf []byte, req *structs.SessionRequest) error {
-	type sessionReq struct {
-		Namespace string
-		Partition string
-		*structs.Session
-	}
-	type NewSessionReq struct {
-		// shadows the Session field from  SessionRequest  so that we can detect
-		// tenanted service registrations for untenanted nodes
-		Session *sessionReq
-		*structs.SessionRequest
-	}
-	var newReq NewSessionReq
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	if newReq.Session != nil && IsEnterpriseData(newReq.Session.Namespace, newReq.Session.Partition) {
-		return ErrDroppingTenantedReq
-
-	}
-	serviceChecks := newReq.Session.ServiceChecks
-	newReq.Session.ServiceChecks = nil
-	for _, sessionServiceCheck := range serviceChecks {
-		if !IsEnterpriseData(sessionServiceCheck.Namespace, "") {
-			newReq.Session.ServiceChecks = append(newReq.Session.ServiceChecks, sessionServiceCheck)
-		}
-	}
-
-	newReq.SessionRequest.Session = *newReq.Session.Session
-	*req = *newReq.SessionRequest
-	return nil
-}
-
-func decodePreparedQuery(buf []byte, req *structs.PreparedQueryRequest) error {
-	type serviceQuery struct {
-		Namespace string
-		Partition string
-		*structs.ServiceQuery
-	}
-	type prepQuery struct {
-		Service *serviceQuery
-		*structs.PreparedQuery
-	}
-	type NewPreparedQueryReq struct {
-		Query *prepQuery
-		*structs.PreparedQueryRequest
-	}
-	var newReq NewPreparedQueryReq
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	if newReq.Query != nil && newReq.Query.Service != nil && IsEnterpriseData(newReq.Query.Service.Namespace, newReq.Query.Service.Partition) {
-		return ErrDroppingTenantedReq
-	}
-
-	newReq.Query.PreparedQuery.Service = *newReq.Query.Service.ServiceQuery
-	newReq.PreparedQueryRequest.Query = newReq.Query.PreparedQuery
-	*req = *newReq.PreparedQueryRequest
-	return nil
-}
-
-func decodeTxn(buf []byte, req *structs.TxnRequest) error {
-	type dirEntryReq struct {
-		Namespace string
-		Partition string
-		*structs.DirEntry
-	}
-	type txnKVOp struct {
-		DirEnt *dirEntryReq
-		*structs.TxnKVOp
-	}
-	type nodeService struct {
-		Namespace string
-		Partition string
-		*structs.NodeService
-	}
-	type txnServiceOp struct {
-		Service *nodeService
-		*structs.TxnServiceOp
-	}
-	type healthCheck struct {
-		Namespace string
-		Partition string
-		*structs.HealthCheck
-	}
-	type txnCheckOp struct {
-		Check *healthCheck
-		*structs.TxnCheckOp
-	}
-	type session struct {
-		Namespace string
-		Partition string
-		*structs.Session
-	}
-	type txnSessionOp struct {
-		Session *session
-		*structs.TxnSessionOp
-	}
-	// Only one of the types should be filled out per entry.
-	type txnOp struct {
-		KV      *txnKVOp
-		Service *txnServiceOp
-		Check   *txnCheckOp
-		Session *txnSessionOp
-		*structs.TxnOp
-	}
-	type NewTxnRequest struct {
-		Ops []*txnOp
-		*structs.TxnRequest
-	}
-	var newReq NewTxnRequest
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-	for _, op := range newReq.Ops {
-		if op.KV != nil && op.KV.DirEnt != nil && !IsEnterpriseData(op.KV.DirEnt.Namespace, op.KV.DirEnt.Partition) {
-			txnOp := &structs.TxnOp{
-				KV: &structs.TxnKVOp{
-					Verb:   op.KV.Verb,
-					DirEnt: *op.KV.DirEnt.DirEntry,
-				},
-			}
-			newReq.TxnRequest.Ops = append(newReq.TxnRequest.Ops, txnOp)
-			continue
-		}
-
-		if op.Service != nil && op.Service.Service != nil && !IsEnterpriseData(op.Service.Service.Namespace, op.Service.Service.Partition) {
-			txnOp := &structs.TxnOp{
-				Service: &structs.TxnServiceOp{
-					Verb:    op.Service.Verb,
-					Node:    op.Service.Node,
-					Service: *op.Service.Service.NodeService,
-				},
-			}
-			newReq.TxnRequest.Ops = append(newReq.TxnRequest.Ops, txnOp)
-			continue
-		}
-
-		if op.Check != nil && op.Check.Check != nil && !IsEnterpriseData(op.Check.Check.Namespace, op.Check.Check.Partition) {
-			txnOp := &structs.TxnOp{
-				Check: &structs.TxnCheckOp{
-					Verb:  op.Check.Verb,
-					Check: *op.Check.Check.HealthCheck,
-				},
-			}
-			newReq.TxnRequest.Ops = append(newReq.TxnRequest.Ops, txnOp)
-			continue
-		}
-
-		if op.Session != nil && op.Session.Session != nil && !IsEnterpriseData(op.Session.Session.Namespace, op.Session.Session.Partition) {
-			txnOp := &structs.TxnOp{
-				Session: &structs.TxnSessionOp{
-					Verb:    op.Session.Verb,
-					Session: *op.Session.Session.Session,
-				},
-			}
-			txnOp.Session.Session.ServiceChecks = nil
-			for _, sessionServiceCheck := range op.Session.Session.ServiceChecks {
-				if !IsEnterpriseData(sessionServiceCheck.Namespace, "") {
-					txnOp.Session.Session.ServiceChecks = append(txnOp.Session.Session.ServiceChecks, sessionServiceCheck)
-				}
-			}
-			newReq.TxnRequest.Ops = append(newReq.TxnRequest.Ops, txnOp)
-		}
-	}
-
-	*req = *newReq.TxnRequest
-	return nil
-}
-
-func decodeACLTokenBatchSet(buf []byte, req *structs.ACLTokenBatchSetRequest) error {
-	type aclToken struct {
-		Namespace string
-		Partition string
-		*structs.ACLToken
-	}
-	type NewACLTokenBatchSetRequest struct {
-		Tokens []*aclToken
-		*structs.ACLTokenBatchSetRequest
-	}
-	var newReq NewACLTokenBatchSetRequest
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	for _, token := range newReq.Tokens {
-		if !IsEnterpriseData(token.Namespace, token.Partition) {
-			newReq.ACLTokenBatchSetRequest.Tokens = append(newReq.ACLTokenBatchSetRequest.Tokens, token.ACLToken)
-		}
-	}
-
-	*req = *newReq.ACLTokenBatchSetRequest
-	return nil
-
-}
-
-func decodeACLPolicyBatchSet(buf []byte, req *structs.ACLPolicyBatchSetRequest) error {
-	type aclPolicy struct {
-		Namespace string
-		Partition string
-		*structs.ACLPolicy
-	}
-	type NewACLPolicyBatchSetRequest struct {
-		Policies []*aclPolicy
-		*structs.ACLPolicyBatchSetRequest
-	}
-	var newReq NewACLPolicyBatchSetRequest
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-	if newReq.ACLPolicyBatchSetRequest == nil {
-		newReq.ACLPolicyBatchSetRequest = &structs.ACLPolicyBatchSetRequest{}
-	}
-	for _, policy := range newReq.Policies {
-		if !IsEnterpriseData(policy.Namespace, policy.Partition) {
-			newReq.ACLPolicyBatchSetRequest.Policies = append(newReq.ACLPolicyBatchSetRequest.Policies, policy.ACLPolicy)
-		}
-	}
-
-	*req = *newReq.ACLPolicyBatchSetRequest
-	return nil
-
-}
-
-func decodeACLRoleBatchSet(buf []byte, req *structs.ACLRoleBatchSetRequest) error {
-	type aclRole struct {
-		Namespace string
-		Partition string
-		*structs.ACLRole
-	}
-	type NewACLRoleBatchSetRequest struct {
-		Roles []*aclRole
-		*structs.ACLRoleBatchSetRequest
-	}
-	var newReq NewACLRoleBatchSetRequest
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	for _, role := range newReq.Roles {
-		if !IsEnterpriseData(role.Namespace, role.Partition) {
-			newReq.ACLRoleBatchSetRequest.Roles = append(newReq.ACLRoleBatchSetRequest.Roles, role.ACLRole)
-		}
-	}
-
-	*req = *newReq.ACLRoleBatchSetRequest
-	return nil
-}
-
-func decodeACLBindingRuleBatchSet(buf []byte, req *structs.ACLBindingRuleBatchSetRequest) error {
-	type aCLBindingRule struct {
-		Namespace string
-		Partition string
-		*structs.ACLBindingRule
-	}
-	type NewACLBindingRuleBatchSetRequest struct {
-		BindingRules []*aCLBindingRule
-		*structs.ACLBindingRuleBatchSetRequest
-	}
-	var newReq NewACLBindingRuleBatchSetRequest
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-	if newReq.ACLBindingRuleBatchSetRequest == nil {
-		newReq.ACLBindingRuleBatchSetRequest = &structs.ACLBindingRuleBatchSetRequest{}
-	}
-	for _, rule := range newReq.BindingRules {
-		if !IsEnterpriseData(rule.Namespace, rule.Partition) {
-			newReq.ACLBindingRuleBatchSetRequest.BindingRules = append(newReq.ACLBindingRuleBatchSetRequest.BindingRules, rule.ACLBindingRule)
-		}
-	}
-
-	*req = *newReq.ACLBindingRuleBatchSetRequest
-	return nil
-}
-
-func decodeACLAuthMethodBatchSet(buf []byte, req *structs.ACLAuthMethodBatchSetRequest) error {
-	type aCLAuthMethod struct {
-		Namespace string
-		Partition string
-		*structs.ACLAuthMethod
-	}
-	type NewACLAuthMethodBatchSetRequest struct {
-		AuthMethods []*aCLAuthMethod
-		*structs.ACLAuthMethodBatchSetRequest
-	}
-	var newReq NewACLAuthMethodBatchSetRequest
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-	if newReq.ACLAuthMethodBatchSetRequest == nil {
-		newReq.ACLAuthMethodBatchSetRequest = &structs.ACLAuthMethodBatchSetRequest{}
-	}
-	for _, authMethod := range newReq.AuthMethods {
-		if !IsEnterpriseData(authMethod.Namespace, authMethod.Partition) {
-			newReq.ACLAuthMethodBatchSetRequest.AuthMethods = append(newReq.ACLAuthMethodBatchSetRequest.AuthMethods, authMethod.ACLAuthMethod)
-		}
-	}
-
-	*req = *newReq.ACLAuthMethodBatchSetRequest
-	return nil
-}
-
-func decodeACLAuthMethodBatchDelete(buf []byte, req *structs.ACLAuthMethodBatchDeleteRequest) error {
-	type NewACLAuthMethodBatchDeleteRequest struct {
-		Namespace string
-		Partition string
-		*structs.ACLAuthMethodBatchDeleteRequest
-	}
-
-	var newReq NewACLAuthMethodBatchDeleteRequest
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	if IsEnterpriseData(newReq.Namespace, newReq.Partition) {
-		return ErrDroppingTenantedReq
-	}
-
-	*req = *newReq.ACLAuthMethodBatchDeleteRequest
-	return nil
-}
-
-func decodeServiceVirtualIP(buf []byte, req *state.ServiceVirtualIP) error {
-	type serviceName struct {
-		Namespace string
-		Partition string
-		*structs.ServiceName
-	}
-	type peeredServiceName struct {
-		ServiceName *serviceName
-		*structs.PeeredServiceName
-	}
-	type NewServiceVirtualIP struct {
-		Service *peeredServiceName
-		*state.ServiceVirtualIP
-	}
-	var newReq NewServiceVirtualIP
-	if err := structs.Decode(buf, &newReq); err != nil {
-		return err
-	}
-
-	if newReq.Service != nil && newReq.Service.ServiceName != nil && IsEnterpriseData(newReq.Service.ServiceName.Namespace, newReq.Service.ServiceName.Partition) {
-		return ErrDroppingTenantedReq
-	}
-	newReq.ServiceVirtualIP.Service.ServiceName = *newReq.Service.ServiceName.ServiceName
-	*req = *newReq.ServiceVirtualIP
-	return nil
-}
-
-func decodePeeringWrite(buf []byte, req *pbpeering.PeeringWriteRequest) error {
-	if err := structs.DecodeProto(buf, req); err != nil {
-		return err
-	}
-
-	if req.Peering != nil && IsEnterpriseData("", req.Peering.Partition) {
-		return ErrDroppingTenantedReq
-	}
-
-	return nil
-}
-
-func decodePeeringDelete(buf []byte, req *pbpeering.PeeringDeleteRequest) error {
-	if err := structs.DecodeProto(buf, req); err != nil {
-		return err
-	}
-
-	if IsEnterpriseData("", req.Partition) {
-		return ErrDroppingTenantedReq
-	}
-
-	return nil
-}
-
-func decodePeeringTrustBundleWrite(buf []byte, req *pbpeering.PeeringTrustBundleWriteRequest) error {
-	if err := structs.DecodeProto(buf, req); err != nil {
-		return err
-	}
-
-	if IsEnterpriseData("", req.PeeringTrustBundle.Partition) {
-		return ErrDroppingTenantedReq
-	}
-
-	return nil
-}
-
-func decodePeeringTrustBundleDelete(buf []byte, req *pbpeering.PeeringTrustBundleDeleteRequest) error {
-	if err := structs.DecodeProto(buf, req); err != nil {
-		return err
-	}
-
-	if IsEnterpriseData("", req.Partition) {
-		return ErrDroppingTenantedReq
-	}
-
-	return nil
-}
-
-func decodeConfigEntryOperation(buf []byte, req *structs.ConfigEntryRequest) error {
-
-	newReq := &ShadowConfigEntryRequest{
-		ConfigEntryRequest: req,
-	}
-	if err := structs.Decode(buf, newReq); err != nil {
-		return err
-	}
-	shadowConfigEntry := newReq.ConfigEntryRequest.Entry.(ShadowConfigentry)
-	if err := shadowConfigEntry.CheckEnt(); err != nil {
-		return err
-	}
-	req.Entry = shadowConfigEntry.GetRealConfigEntry()
-	return nil
-}
-
-type ShadowConfigEntryRequest struct {
-	*structs.ConfigEntryRequest
-}
-
-func (c *ShadowConfigEntryRequest) UnmarshalBinary(data []byte) error {
-	// First decode the kind prefix
-	var kind string
-	dec := codec.NewDecoderBytes(data, structs.MsgpackHandle)
-	if err := dec.Decode(&kind); err != nil {
-		return err
-	}
-
-	// Then decode the real thing with appropriate kind of ConfigEntry
-	entry, err := MakeShadowConfigEntry(kind, "")
-	if err != nil {
-		return err
-	}
-	c.Entry = entry
-	// Alias juggling to prevent infinite recursive calls back to this decode
-	// method.
-	type Alias structs.ConfigEntryRequest
-	as := struct {
-		*Alias
-	}{
-		Alias: (*Alias)(c.ConfigEntryRequest),
-	}
-	if err := dec.Decode(&as); err != nil {
-		return err
-	}
-	return nil
-}
-func MakeShadowConfigEntry(kind, name string) (structs.ConfigEntry, error) {
-	switch kind {
-	case structs.RateLimitIPConfig:
-		return nil, ErrDroppingTenantedReq
-	case structs.ServiceDefaults:
-		return &ShadowServiceConfigEntry{ServiceConfigEntry: &structs.ServiceConfigEntry{Name: name}}, nil
-	case structs.ProxyDefaults:
-		return &ShadowProxyConfigEntry{ProxyConfigEntry: &structs.ProxyConfigEntry{Name: name}}, nil
-	case structs.ServiceRouter:
-		return &ShadowServiceRouterConfigEntry{ServiceRouterConfigEntry: &structs.ServiceRouterConfigEntry{Name: name}}, nil
-	case structs.ServiceSplitter:
-		return &ShadowServiceSplitterConfigEntry{ServiceSplitterConfigEntry: &structs.ServiceSplitterConfigEntry{Name: name}}, nil
-	case structs.ServiceResolver:
-		return &ShadowServiceResolverConfigEntry{ServiceResolverConfigEntry: &structs.ServiceResolverConfigEntry{Name: name}}, nil
-	case structs.IngressGateway:
-		return &ShadowIngressGatewayConfigEntry{IngressGatewayConfigEntry: &structs.IngressGatewayConfigEntry{Name: name}}, nil
-	case structs.TerminatingGateway:
-		return &ShadowTerminatingGatewayConfigEntry{TerminatingGatewayConfigEntry: &structs.TerminatingGatewayConfigEntry{Name: name}}, nil
-	case structs.ServiceIntentions:
-		return &ShadowServiceIntentionsConfigEntry{ServiceIntentionsConfigEntry: &structs.ServiceIntentionsConfigEntry{Name: name}}, nil
-	case structs.MeshConfig:
-		return &ShadowMeshConfigEntry{MeshConfigEntry: &structs.MeshConfigEntry{}}, nil
-	case structs.ExportedServices:
-		return &ShadowExportedServicesConfigEntry{ExportedServicesConfigEntry: &structs.ExportedServicesConfigEntry{Name: name}}, nil
-	case structs.SamenessGroup:
-		return &ShadowSamenessGroupConfigEntry{SamenessGroupConfigEntry: &structs.SamenessGroupConfigEntry{Name: name}}, nil
-	case structs.APIGateway:
-		return &ShadowAPIGatewayConfigEntry{APIGatewayConfigEntry: &structs.APIGatewayConfigEntry{Name: name}}, nil
-	case structs.BoundAPIGateway:
-		return &ShadowBoundAPIGatewayConfigEntry{BoundAPIGatewayConfigEntry: &structs.BoundAPIGatewayConfigEntry{Name: name}}, nil
-	case structs.InlineCertificate:
-		return &ShadowInlineCertificateConfigEntry{InlineCertificateConfigEntry: &structs.InlineCertificateConfigEntry{Name: name}}, nil
-	case structs.HTTPRoute:
-		return &ShadowHTTPRouteConfigEntry{HTTPRouteConfigEntry: &structs.HTTPRouteConfigEntry{Name: name}}, nil
-	case structs.TCPRoute:
-		return &ShadowTCPRouteConfigEntry{TCPRouteConfigEntry: &structs.TCPRouteConfigEntry{Name: name}}, nil
-	case structs.JWTProvider:
-		return &ShadowJWTProviderConfigEntry{JWTProviderConfigEntry: &structs.JWTProviderConfigEntry{Name: name}}, nil
-	default:
-		return nil, fmt.Errorf("invalid config entry kind: %s", kind)
-	}
-}
-
-type ShadowBase struct {
-	Namespace string
-	Partition string
-}
-
-func (s ShadowBase) CheckEnt() error {
-	if IsEnterpriseData(s.Namespace, s.Partition) {
-		return ErrDroppingTenantedReq
-	}
-	return nil
-}
-
-type ShadowConfigentry interface {
-	CheckEnt() error
-	GetRealConfigEntry() structs.ConfigEntry
-}
-
-type ShadowProxyConfigEntry struct {
-	ShadowBase
-	*structs.ProxyConfigEntry
-}
-
-func (s ShadowProxyConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.ProxyConfigEntry
-}
-
-type ShadowServiceResolverConfigEntry struct {
-	ShadowBase
-	*structs.ServiceResolverConfigEntry
-}
-
-func (s ShadowServiceResolverConfigEntry) CheckEnt() error {
-	if err := s.ShadowBase.CheckEnt(); err != nil {
-		return err
-	}
-	if s.ServiceResolverConfigEntry.Redirect != nil && (IsEnterpriseData(s.ServiceResolverConfigEntry.Redirect.Namespace, s.ServiceResolverConfigEntry.Redirect.Partition) || s.ServiceResolverConfigEntry.Redirect.SamenessGroup != "") {
-		return errIncompatibleTenantedData
-	}
-	for _, failover := range s.ServiceResolverConfigEntry.Failover {
-		if IsEnterpriseData(failover.Namespace, "") || failover.SamenessGroup != "" {
-			return errIncompatibleTenantedData
-		}
-		for _, target := range failover.Targets {
-			if IsEnterpriseData(target.Namespace, target.Partition) {
-				return errIncompatibleTenantedData
-			}
-		}
-	}
-	return nil
-}
-
-func (s ShadowServiceResolverConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.ServiceResolverConfigEntry
-}
-
-func (e *ShadowProxyConfigEntry) UnmarshalBinary(data []byte) error {
-	// The goal here is to add a post-decoding operation to
-	// decoding of a ProxyConfigEntry. The cleanest way I could
-	// find to do so was to implement the BinaryMarshaller interface
-	// and use a type alias to do the original round of decoding,
-	// followed by a MapWalk of the Config to coerce everything
-	// into JSON compatible types.
-	type Alias structs.ProxyConfigEntry
-	as := struct {
-		*ShadowBase
-		*Alias
-	}{
-		ShadowBase: &e.ShadowBase,
-		Alias:      (*Alias)(e.ProxyConfigEntry),
-	}
-	dec := codec.NewDecoderBytes(data, structs.MsgpackHandle)
-	if err := dec.Decode(&as); err != nil {
-		return err
-	}
-	config, err := lib.MapWalk(e.Config)
-	if err != nil {
-		return err
-	}
-	e.Config = config
-	return nil
-}
-
-type ShadowUpstreamConfig struct {
-	ShadowBase
-	*structs.UpstreamConfig
-}
-type ShadowUpstreamConfiguration struct {
-	Overrides []*ShadowUpstreamConfig
-	*structs.UpstreamConfiguration
-}
-type ShadowServiceConfigEntry struct {
-	ShadowBase
-	UpstreamConfig *ShadowUpstreamConfiguration
-	*structs.ServiceConfigEntry
-}
-
-func (s ShadowServiceConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	if s.UpstreamConfig != nil {
-		for _, override := range s.UpstreamConfig.Overrides {
-			if !IsEnterpriseData(override.Namespace, override.Partition) {
-				if s.ServiceConfigEntry.UpstreamConfig == nil {
-					s.ServiceConfigEntry.UpstreamConfig = &structs.UpstreamConfiguration{}
-				}
-				s.ServiceConfigEntry.UpstreamConfig.Overrides = append(s.ServiceConfigEntry.UpstreamConfig.Overrides, override.UpstreamConfig)
-			}
-		}
-	}
-	return s.ServiceConfigEntry
-}
-
-type ShadowServiceRouterConfigEntry struct {
-	ShadowBase
-	*structs.ServiceRouterConfigEntry
-}
-
-func (s ShadowServiceRouterConfigEntry) CheckEnt() error {
-	if err := s.ShadowBase.CheckEnt(); err != nil {
-		return err
-	}
-	for _, route := range s.ServiceRouterConfigEntry.Routes {
-		if IsEnterpriseData(route.Destination.Namespace, route.Destination.Partition) {
-			return errIncompatibleTenantedData
-		}
-	}
-	return nil
-}
-
-func (s ShadowServiceRouterConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.ServiceRouterConfigEntry
-}
-
-type ShadowServiceSplitterConfigEntry struct {
-	ShadowBase
-	*structs.ServiceSplitterConfigEntry
-}
-
-func (s ShadowServiceSplitterConfigEntry) CheckEnt() error {
-	if err := s.ShadowBase.CheckEnt(); err != nil {
-		return err
-	}
-	for _, split := range s.ServiceSplitterConfigEntry.Splits {
-		if IsEnterpriseData(split.Namespace, split.Partition) {
-			return errIncompatibleTenantedData
-		}
-	}
-	return nil
-}
-func (s ShadowServiceSplitterConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.ServiceSplitterConfigEntry
-}
-
-type ShadowIngressService struct {
-	ShadowBase
-	*structs.IngressService
-}
-type ShadowIngressListener struct {
-	Services []ShadowIngressService
-	*structs.IngressListener
-}
-type ShadowIngressGatewayConfigEntry struct {
-	ShadowBase
-	Listeners []ShadowIngressListener
-	*structs.IngressGatewayConfigEntry
-}
-
-func (s ShadowIngressGatewayConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	for _, listner := range s.Listeners {
-		for _, svc := range listner.Services {
-			if !IsEnterpriseData(svc.Namespace, svc.Partition) {
-				listner.IngressListener.Services = append(listner.IngressListener.Services, *svc.IngressService)
-			}
-		}
-		if len(listner.IngressListener.Services) == 0 {
-			continue
-		}
-		s.IngressGatewayConfigEntry.Listeners = append(s.IngressGatewayConfigEntry.Listeners, *listner.IngressListener)
-	}
-	return s.IngressGatewayConfigEntry
-}
-
-type ShadowLinkedService struct {
-	ShadowBase
-	*structs.LinkedService
-}
-
-type ShadowTerminatingGatewayConfigEntry struct {
-	ShadowBase
-	Services []ShadowLinkedService
-	*structs.TerminatingGatewayConfigEntry
-}
-
-func (s ShadowTerminatingGatewayConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	for _, svc := range s.Services {
-		if !IsEnterpriseData(svc.Namespace, svc.Partition) {
-			s.TerminatingGatewayConfigEntry.Services = append(s.TerminatingGatewayConfigEntry.Services, *svc.LinkedService)
-		}
-	}
-	return s.TerminatingGatewayConfigEntry
-}
-
-type ShadowSourceIntention struct {
-	ShadowBase
-	*structs.SourceIntention
-}
-type ShadowServiceIntentionsConfigEntry struct {
-	ShadowBase
-	Sources []*ShadowSourceIntention
-	*structs.ServiceIntentionsConfigEntry
-}
-
-func (s ShadowServiceIntentionsConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	for _, source := range s.Sources {
-		if !IsEnterpriseData(source.Namespace, source.Partition) && source.SamenessGroup == "" {
-			s.ServiceIntentionsConfigEntry.Sources = append(s.ServiceIntentionsConfigEntry.Sources, source.SourceIntention)
-		}
-	}
-	return s.ServiceIntentionsConfigEntry
-}
-
-type ShadowMeshConfigEntry struct {
-	ShadowBase
-	*structs.MeshConfigEntry
-}
-
-func (s ShadowMeshConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.MeshConfigEntry
-}
-
-type ShadowExportedServicesConfigEntry struct {
-	ShadowBase
-	*structs.ExportedServicesConfigEntry
-}
-
-func (s ShadowExportedServicesConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	services := []structs.ExportedService{}
-	for _, svc := range s.ExportedServicesConfigEntry.Services {
-		if !IsEnterpriseData(svc.Namespace, "") {
-			consumers := []structs.ServiceConsumer{}
-			for _, consumer := range svc.Consumers {
-				if !IsEnterpriseData("", consumer.Partition) && consumer.SamenessGroup == "" {
-					consumers = append(consumers, consumer)
-				}
-			}
-			if len(consumers) == 0 {
-				continue
-			}
-			services = append(services, svc)
-		}
-	}
-	s.ExportedServicesConfigEntry.Services = services
-	return s.ExportedServicesConfigEntry
-}
-
-type ShadowSamenessGroupConfigEntry struct {
-	ShadowBase
-	*structs.SamenessGroupConfigEntry
-}
-
-func (s ShadowSamenessGroupConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.SamenessGroupConfigEntry
-}
-
-type ShadowAPIGatewayConfigEntry struct {
-	ShadowBase
-	*structs.APIGatewayConfigEntry
-}
-
-func (s ShadowAPIGatewayConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.APIGatewayConfigEntry
-}
-
-type ShadowBoundAPIGatewayListener struct {
-	Routes       []ShadowResourceReference
-	Certificates []ShadowResourceReference
-	*structs.BoundAPIGatewayListener
-}
-type ShadowBoundAPIGatewayConfigEntry struct {
-	ShadowBase
-	Listeners []ShadowBoundAPIGatewayListener
-	*structs.BoundAPIGatewayConfigEntry
-}
-
-func (s ShadowBoundAPIGatewayConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	for _, listner := range s.Listeners {
-		for _, route := range listner.Routes {
-			if !IsEnterpriseData(route.Namespace, route.Partition) {
-				listner.BoundAPIGatewayListener.Routes = append(listner.BoundAPIGatewayListener.Routes, *route.ResourceReference)
-			}
-		}
-		for _, cf := range listner.Certificates {
-			if !IsEnterpriseData(cf.Namespace, cf.Partition) {
-				listner.BoundAPIGatewayListener.Certificates = append(listner.BoundAPIGatewayListener.Certificates, *cf.ResourceReference)
-			}
-		}
-		s.BoundAPIGatewayConfigEntry.Listeners = append(s.BoundAPIGatewayConfigEntry.Listeners, *listner.BoundAPIGatewayListener)
-	}
-	return s.BoundAPIGatewayConfigEntry
-}
-
-type ShadowInlineCertificateConfigEntry struct {
-	ShadowBase
-	*structs.InlineCertificateConfigEntry
-}
-
-func (s ShadowInlineCertificateConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.InlineCertificateConfigEntry
-}
-
-type ShadowHTTPService struct {
-	ShadowBase
-	*structs.HTTPService
-}
-type ShadowHTTPRouteRule struct {
-	Services []ShadowHTTPService
-	*structs.HTTPRouteRule
-}
-type ShadowResourceReference struct {
-	ShadowBase
-	*structs.ResourceReference
-}
-type ShadowHTTPRouteConfigEntry struct {
-	ShadowBase
-	Parents []ShadowResourceReference
-	Rules   []ShadowHTTPRouteRule
-	*structs.HTTPRouteConfigEntry
-}
-
-func (s ShadowHTTPRouteConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	for _, parent := range s.Parents {
-		if !IsEnterpriseData(parent.Namespace, parent.Partition) {
-			s.HTTPRouteConfigEntry.Parents = append(s.HTTPRouteConfigEntry.Parents, *parent.ResourceReference)
-		}
-	}
-	for _, rule := range s.Rules {
-		for _, svc := range rule.Services {
-			if !IsEnterpriseData(svc.Namespace, svc.Partition) {
-				rule.HTTPRouteRule.Services = append(rule.HTTPRouteRule.Services, *svc.HTTPService)
-			}
-		}
-		s.HTTPRouteConfigEntry.Rules = append(s.HTTPRouteConfigEntry.Rules, *rule.HTTPRouteRule)
-	}
-	return s.HTTPRouteConfigEntry
-}
-
-type ShadowTCPService struct {
-	ShadowBase
-	*structs.TCPService
-}
-type ShadowTCPRouteConfigEntry struct {
-	ShadowBase
-	Parents  []ShadowResourceReference
-	Services []ShadowTCPService
-	*structs.TCPRouteConfigEntry
-}
-
-func (s ShadowTCPRouteConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	for _, parent := range s.Parents {
-		if !IsEnterpriseData(parent.Namespace, parent.Partition) {
-			s.TCPRouteConfigEntry.Parents = append(s.TCPRouteConfigEntry.Parents, *parent.ResourceReference)
-		}
-	}
-	for _, svc := range s.Services {
-		if !IsEnterpriseData(svc.Namespace, svc.Partition) {
-			s.TCPRouteConfigEntry.Services = append(s.TCPRouteConfigEntry.Services, *svc.TCPService)
-		}
-	}
-	return s.TCPRouteConfigEntry
-}
-
-type ShadowJWTProviderConfigEntry struct {
-	ShadowBase
-	*structs.JWTProviderConfigEntry
-}
-
-func (s ShadowJWTProviderConfigEntry) GetRealConfigEntry() structs.ConfigEntry {
-	return s.JWTProviderConfigEntry
-}
diff --git a/agent/consul/fsm/fsm.go b/agent/consul/fsm/fsm.go
index 5a350e4dae778..92a3931b5b331 100644
--- a/agent/consul/fsm/fsm.go
+++ b/agent/consul/fsm/fsm.go
@@ -195,10 +195,6 @@ func (c *FSM) Apply(log *raft.Log) interface{} {
 		c.logger.Warn("ignoring unknown message type, upgrade to newer version", "type", msgType)
 		return nil
 	}
-	if structs.CEDowngrade && msgType >= 64 {
-		c.logger.Warn("ignoring enterprise message, for downgrading to oss", "type", msgType)
-		return nil
-	}
 	panic(fmt.Errorf("failed to apply request: %#v", buf))
 }
 
@@ -267,10 +263,7 @@ func (c *FSM) Restore(old io.ReadCloser) error {
 				return err
 			}
 		default:
-			if structs.CEDowngrade && msg >= 64 {
-				c.logger.Warn("ignoring enterprise message , for downgrading to oss", "type", msg)
-				return nil
-			} else if msg >= 64 {
+			if msg >= 64 {
 				return fmt.Errorf("msg type <%d> is a Consul Enterprise log entry. Consul CE cannot restore it", msg)
 			} else {
 				return fmt.Errorf("Unrecognized msg type %d", msg)
diff --git a/agent/consul/leader.go b/agent/consul/leader.go
index 86ac10bb1287c..fcbf794541f3d 100644
--- a/agent/consul/leader.go
+++ b/agent/consul/leader.go
@@ -5,7 +5,6 @@ package consul
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"reflect"
@@ -17,27 +16,20 @@ import (
 
 	"github.com/armon/go-metrics"
 	"github.com/armon/go-metrics/prometheus"
-	"github.com/oklog/ulid/v2"
-	"golang.org/x/time/rate"
-	"google.golang.org/protobuf/types/known/anypb"
-
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-uuid"
 	"github.com/hashicorp/go-version"
 	"github.com/hashicorp/raft"
 	"github.com/hashicorp/serf/serf"
+	"golang.org/x/time/rate"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/metadata"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/structs/aclfilter"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -349,12 +341,6 @@ func (s *Server) establishLeadership(ctx context.Context) error {
 		s.startLogVerification(ctx)
 	}
 
-	if s.useV2Tenancy {
-		if err := s.initTenancy(ctx, s.resourceServiceServer.Backend); err != nil {
-			return err
-		}
-	}
-
 	if s.config.Reporting.License.Enabled && s.reportingManager != nil {
 		s.reportingManager.StartReportingAgent()
 	}
@@ -1463,61 +1449,3 @@ func (s *serversIntentionsAsConfigEntriesInfo) update(srv *metadata.Server) bool
 	// prevent continuing server evaluation
 	return false
 }
-
-func (s *Server) initTenancy(ctx context.Context, b storage.Backend) error {
-	// we write these defaults directly to the storage backend
-	// without going through the resource service since tenancy
-	// validation hooks block writes to the default namespace
-	// and partition.
-	if err := s.createDefaultPartition(ctx, b); err != nil {
-		return err
-	}
-
-	if err := s.createDefaultNamespace(ctx, b); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *Server) createDefaultNamespace(ctx context.Context, b storage.Backend) error {
-	readID := &pbresource.ID{
-		Type:    pbtenancy.NamespaceType,
-		Name:    resource.DefaultNamespaceName,
-		Tenancy: resource.DefaultPartitionedTenancy(),
-	}
-
-	read, err := b.Read(ctx, storage.StrongConsistency, readID)
-
-	if err != nil && !errors.Is(err, storage.ErrNotFound) {
-		return fmt.Errorf("failed to read the %q namespace: %v", resource.DefaultNamespaceName, err)
-	}
-	if read == nil && errors.Is(err, storage.ErrNotFound) {
-		nsData, err := anypb.New(&pbtenancy.Namespace{Description: "default namespace in default partition"})
-		if err != nil {
-			return err
-		}
-
-		// create a default namespace in default partition
-		nsID := &pbresource.ID{
-			Type:    pbtenancy.NamespaceType,
-			Name:    resource.DefaultNamespaceName,
-			Tenancy: resource.DefaultPartitionedTenancy(),
-			Uid:     ulid.Make().String(),
-		}
-
-		_, err = b.WriteCAS(ctx, &pbresource.Resource{
-			Id:         nsID,
-			Generation: ulid.Make().String(),
-			Data:       nsData,
-			Metadata: map[string]string{
-				"generated_at": time.Now().Format(time.RFC3339),
-			},
-		})
-
-		if err != nil {
-			return fmt.Errorf("failed to create the %q namespace: %v", resource.DefaultNamespaceName, err)
-		}
-	}
-	s.logger.Info("Created", "namespace", resource.DefaultNamespaceName)
-	return nil
-}
diff --git a/agent/consul/leader_ce.go b/agent/consul/leader_ce.go
deleted file mode 100644
index 2d67b7bdedd8f..0000000000000
--- a/agent/consul/leader_ce.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package consul
-
-import (
-	"context"
-
-	"github.com/hashicorp/consul/internal/storage"
-)
-
-func (s *Server) createDefaultPartition(ctx context.Context, b storage.Backend) error {
-	// no-op
-	return nil
-}
diff --git a/agent/consul/leader_ce_test.go b/agent/consul/leader_ce_test.go
index 23009cfbc39bf..8988adb9f7782 100644
--- a/agent/consul/leader_ce_test.go
+++ b/agent/consul/leader_ce_test.go
@@ -5,19 +5,7 @@
 
 package consul
 
-import (
-	"context"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	libserf "github.com/hashicorp/consul/lib/serf"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-	"github.com/hashicorp/consul/testrpc"
-)
+import libserf "github.com/hashicorp/consul/lib/serf"
 
 func updateSerfTags(s *Server, key, value string) {
 	libserf.UpdateTag(s.serfLAN, key, value)
@@ -26,41 +14,3 @@ func updateSerfTags(s *Server, key, value string) {
 		libserf.UpdateTag(s.serfWAN, key, value)
 	}
 }
-
-func TestServer_InitTenancy(t *testing.T) {
-	t.Parallel()
-
-	_, conf := testServerConfig(t)
-	deps := newDefaultDeps(t, conf)
-	deps.Experiments = []string{"v2tenancy"}
-	deps.Registry = NewTypeRegistry()
-
-	s, err := newServerWithDeps(t, conf, deps)
-	require.NoError(t, err)
-
-	// first initTenancy call happens here
-	waitForLeaderEstablishment(t, s)
-	testrpc.WaitForLeader(t, s.RPC, "dc1")
-
-	nsID := &pbresource.ID{
-		Type:    pbtenancy.NamespaceType,
-		Tenancy: resource.DefaultPartitionedTenancy(),
-		Name:    resource.DefaultNamespaceName,
-	}
-
-	ns, err := s.resourceServiceServer.Backend.Read(context.Background(), storage.StrongConsistency, nsID)
-	require.NoError(t, err)
-	require.Equal(t, resource.DefaultNamespaceName, ns.Id.Name)
-
-	// explicitly call initiTenancy to verify we do not re-create namespace
-	err = s.initTenancy(context.Background(), s.resourceServiceServer.Backend)
-	require.NoError(t, err)
-
-	// read again
-	actual, err := s.resourceServiceServer.Backend.Read(context.Background(), storage.StrongConsistency, nsID)
-	require.NoError(t, err)
-
-	require.Equal(t, ns.Id.Uid, actual.Id.Uid)
-	require.Equal(t, ns.Generation, actual.Generation)
-	require.Equal(t, ns.Version, actual.Version)
-}
diff --git a/agent/consul/options.go b/agent/consul/options.go
index 88c16bd1a99c5..6dc754b3aef70 100644
--- a/agent/consul/options.go
+++ b/agent/consul/options.go
@@ -49,7 +49,7 @@ type Deps struct {
 	EnterpriseDeps
 }
 
-// UseV2Resources returns true if "resource-apis" is present in the Experiments
+// 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) {
@@ -58,15 +58,6 @@ func (d Deps) UseV2Resources() bool {
 	return false
 }
 
-// UseV2Tenancy returns true if "v2tenancy" is present in the Experiments
-// array of the agent config.
-func (d Deps) UseV2Tenancy() bool {
-	if stringslice.Contains(d.Experiments, V2TenancyExperimentName) {
-		return true
-	}
-	return false
-}
-
 type GRPCClientConner interface {
 	ClientConn(datacenter string) (*grpc.ClientConn, error)
 	ClientConnLeader() (*grpc.ClientConn, error)
diff --git a/agent/consul/server.go b/agent/consul/server.go
index 505430d634ca8..2e32fa7786810 100644
--- a/agent/consul/server.go
+++ b/agent/consul/server.go
@@ -20,13 +20,6 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"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/go-connlimit"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-memdb"
@@ -37,7 +30,13 @@ import (
 	walmetrics "github.com/hashicorp/raft-wal/metrics"
 	"github.com/hashicorp/raft-wal/verifier"
 	"github.com/hashicorp/serf/serf"
+	"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"
@@ -77,12 +76,10 @@ import (
 	"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/multicluster"
 	"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/internal/tenancy"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/lib/routine"
 	"github.com/hashicorp/consul/lib/stringslice"
@@ -471,9 +468,6 @@ type Server struct {
 	registry resource.Registry
 
 	useV2Resources bool
-
-	// useV2Tenancy is tied to the "v2tenancy" feature flag.
-	useV2Tenancy bool
 }
 
 func (s *Server) DecrementBlockingQueries() uint64 {
@@ -563,7 +557,6 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 		routineManager:          routine.NewManager(logger.Named(logging.ConsulServer)),
 		registry:                flat.Registry,
 		useV2Resources:          flat.UseV2Resources(),
-		useV2Tenancy:            flat.UseV2Tenancy(),
 	}
 	incomingRPCLimiter.Register(s)
 
@@ -841,7 +834,7 @@ func NewServer(config *Config, flat Deps, externalGRPCServer *grpc.Server,
 	go s.reportingManager.Run(&lib.StopChannelContext{StopCh: s.shutdownCh})
 
 	// Setup insecure resource service client.
-	if err := s.setupInsecureResourceServiceClient(flat.Registry, logger); err != nil {
+	if err := s.setupInsecureResourceServiceClient(flat.Registry, logger, flat); err != nil {
 		return nil, err
 	}
 
@@ -938,17 +931,9 @@ func isV1CatalogRequest(rpcName string) bool {
 }
 
 func (s *Server) registerControllers(deps Deps, proxyUpdater ProxyUpdater) error {
-	// When not enabled, the v1 tenancy bridge is used by default.
-	if s.useV2Tenancy {
-		tenancy.RegisterControllers(
-			s.controllerManager,
-			tenancy.Dependencies{Registry: deps.Registry},
-		)
-	}
-
 	if s.useV2Resources {
 		catalog.RegisterControllers(s.controllerManager, catalog.DefaultControllerDependencies())
-		multicluster.RegisterControllers(s.controllerManager)
+
 		defaultAllow, err := s.config.ACLResolverSettings.IsDefaultAllow()
 		if err != nil {
 			return err
@@ -992,7 +977,7 @@ func (s *Server) registerControllers(deps Deps, proxyUpdater ProxyUpdater) error
 		demo.RegisterControllers(s.controllerManager)
 	}
 
-	return s.controllerManager.ValidateDependencies(s.registry.Types())
+	return nil
 }
 
 func newGRPCHandlerFromConfig(deps Deps, config *Config, s *Server) connHandler {
@@ -1471,9 +1456,8 @@ func (s *Server) setupExternalGRPC(config *Config, deps Deps, logger hclog.Logge
 	s.peerStreamServer.Register(s.externalGRPCServer)
 
 	tenancyBridge := NewV1TenancyBridge(s)
-	if s.useV2Tenancy {
-		tenancyBridgeV2 := tenancy.NewV2TenancyBridge()
-		tenancyBridge = tenancyBridgeV2.WithClient(s.insecureResourceServiceClient)
+	if stringslice.Contains(deps.Experiments, V2TenancyExperimentName) {
+		tenancyBridge = resource.NewV2TenancyBridge()
 	}
 
 	s.resourceServiceServer = resourcegrpc.NewServer(resourcegrpc.Config{
@@ -1482,23 +1466,20 @@ func (s *Server) setupExternalGRPC(config *Config, deps Deps, logger hclog.Logge
 		ACLResolver:   s.ACLResolver,
 		Logger:        logger.Named("grpc-api.resource"),
 		TenancyBridge: tenancyBridge,
-		UseV2Tenancy:  s.useV2Tenancy,
 	})
 	s.resourceServiceServer.Register(s.externalGRPCServer)
 
 	reflection.Register(s.externalGRPCServer)
 }
 
-func (s *Server) setupInsecureResourceServiceClient(typeRegistry resource.Registry, logger hclog.Logger) error {
+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")
 	}
 
-	// Can't use interface type var here since v2 specific "WithClient(...)" is called futher down.
 	tenancyBridge := NewV1TenancyBridge(s)
-	tenancyBridgeV2 := tenancy.NewV2TenancyBridge()
-	if s.useV2Tenancy {
-		tenancyBridge = tenancyBridgeV2
+	if stringslice.Contains(deps.Experiments, V2TenancyExperimentName) {
+		tenancyBridge = resource.NewV2TenancyBridge()
 	}
 	server := resourcegrpc.NewServer(resourcegrpc.Config{
 		Registry:      typeRegistry,
@@ -1506,7 +1487,6 @@ func (s *Server) setupInsecureResourceServiceClient(typeRegistry resource.Regist
 		ACLResolver:   resolver.DANGER_NO_AUTH{},
 		Logger:        logger.Named("grpc-api.resource"),
 		TenancyBridge: tenancyBridge,
-		UseV2Tenancy:  s.useV2Tenancy,
 	})
 
 	conn, err := s.runInProcessGRPCServer(server.Register)
@@ -1514,7 +1494,7 @@ func (s *Server) setupInsecureResourceServiceClient(typeRegistry resource.Regist
 		return err
 	}
 	s.insecureResourceServiceClient = pbresource.NewResourceServiceClient(conn)
-	tenancyBridgeV2.WithClient(s.insecureResourceServiceClient)
+
 	return nil
 }
 
diff --git a/agent/consul/server_ce.go b/agent/consul/server_ce.go
index fd554ca2c3432..fb3e55e76519f 100644
--- a/agent/consul/server_ce.go
+++ b/agent/consul/server_ce.go
@@ -11,11 +11,10 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics"
-	"google.golang.org/grpc"
-
 	"github.com/hashicorp/go-multierror"
 	"github.com/hashicorp/serf/coordinate"
 	"github.com/hashicorp/serf/serf"
+	"google.golang.org/grpc"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/agent/consul/reporting"
diff --git a/agent/consul/server_test.go b/agent/consul/server_test.go
index 620df6bfa6c44..e72549babbef1 100644
--- a/agent/consul/server_test.go
+++ b/agent/consul/server_test.go
@@ -7,11 +7,9 @@ import (
 	"context"
 	"crypto/tls"
 	"crypto/x509"
-	"flag"
 	"fmt"
 	"net"
 	"os"
-	"path/filepath"
 	"reflect"
 	"strings"
 	"sync"
@@ -39,12 +37,10 @@ import (
 	external "github.com/hashicorp/consul/agent/grpc-external"
 	grpcmiddleware "github.com/hashicorp/consul/agent/grpc-middleware"
 	hcpclient "github.com/hashicorp/consul/agent/hcp/client"
-	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/agent/metadata"
 	"github.com/hashicorp/consul/agent/rpc/middleware"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/agent/token"
-	proxytracker "github.com/hashicorp/consul/internal/mesh/proxy-tracker"
 	"github.com/hashicorp/consul/ipaddr"
 	"github.com/hashicorp/consul/sdk/freeport"
 	"github.com/hashicorp/consul/sdk/testutil"
@@ -121,7 +117,7 @@ func waitForLeaderEstablishment(t *testing.T, servers ...*Server) {
 	})
 }
 
-func testServerConfig(t testutil.TestingTB) (string, *Config) {
+func testServerConfig(t *testing.T) (string, *Config) {
 	dir := testutil.TempDir(t, "consul")
 	config := DefaultConfig()
 
@@ -237,7 +233,7 @@ func testServerWithConfig(t *testing.T, configOpts ...func(*Config)) (string, *S
 	var deps Deps
 	// Retry added to avoid cases where bind addr is already in use
 	retry.RunWith(retry.ThreeTimes(), t, func(r *retry.R) {
-		dir, config = testServerConfig(r)
+		dir, config = testServerConfig(t)
 		for _, fn := range configOpts {
 			fn(config)
 		}
@@ -250,8 +246,8 @@ func testServerWithConfig(t *testing.T, configOpts ...func(*Config)) (string, *S
 		config.ACLResolverSettings.EnterpriseMeta = *config.AgentEnterpriseMeta()
 
 		var err error
-		deps = newDefaultDeps(r, config)
-		srv, err = newServerWithDeps(r, config, deps)
+		deps = newDefaultDeps(t, config)
+		srv, err = newServerWithDeps(t, config, deps)
 		if err != nil {
 			r.Fatalf("err: %v", err)
 		}
@@ -331,7 +327,7 @@ func newServer(t *testing.T, c *Config) (*Server, error) {
 	return newServerWithDeps(t, c, newDefaultDeps(t, c))
 }
 
-func newServerWithDeps(t testutil.TestingTB, c *Config, deps Deps) (*Server, error) {
+func newServerWithDeps(t *testing.T, c *Config, deps Deps) (*Server, error) {
 	// chain server up notification
 	oldNotify := c.NotifyListen
 	up := make(chan struct{})
@@ -342,8 +338,7 @@ func newServerWithDeps(t testutil.TestingTB, c *Config, deps Deps) (*Server, err
 		}
 	}
 	grpcServer := external.NewServer(deps.Logger.Named("grpc.external"), nil, deps.TLSConfigurator, rpcRate.NullRequestLimitsHandler(), keepalive.ServerParameters{})
-	proxyUpdater := proxytracker.NewProxyTracker(proxytracker.ProxyTrackerConfig{})
-	srv, err := NewServer(c, deps, grpcServer, nil, deps.Logger, proxyUpdater)
+	srv, err := NewServer(c, deps, grpcServer, nil, deps.Logger, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -2251,38 +2246,3 @@ func TestServer_addServerTLSInfo(t *testing.T) {
 		})
 	}
 }
-
-// goldenMarkdown reads and optionally writes the expected data to the goldenMarkdown file,
-// returning the contents as a string.
-func goldenMarkdown(t *testing.T, name, got string) string {
-	t.Helper()
-
-	golden := filepath.Join("testdata", name+".md")
-	update := flag.Lookup("update").Value.(flag.Getter).Get().(bool)
-	if update && got != "" {
-		err := os.WriteFile(golden, []byte(got), 0644)
-		require.NoError(t, err)
-	}
-
-	expected, err := os.ReadFile(golden)
-	require.NoError(t, err)
-
-	return string(expected)
-}
-
-func TestServer_ControllerDependencies(t *testing.T) {
-	t.Parallel()
-
-	_, conf := testServerConfig(t)
-	deps := newDefaultDeps(t, conf)
-	deps.Experiments = []string{"resource-apis"}
-	deps.LeafCertManager = &leafcert.Manager{}
-
-	s1, err := newServerWithDeps(t, conf, deps)
-	require.NoError(t, err)
-
-	waitForLeaderEstablishment(t, s1)
-	actual := fmt.Sprintf("```mermaid\n%s\n```", s1.controllerManager.CalculateDependencies(s1.registry.Types()).ToMermaid())
-	expected := goldenMarkdown(t, "v2-resource-dependencies", actual)
-	require.Equal(t, expected, actual)
-}
diff --git a/agent/consul/state/peering.go b/agent/consul/state/peering.go
index 05dfa59a37af3..1763777cff838 100644
--- a/agent/consul/state/peering.go
+++ b/agent/consul/state/peering.go
@@ -202,9 +202,6 @@ func (s *Store) peeringSecretsWriteTxn(tx WriteTxn, req *pbpeering.SecretsWriteR
 		return fmt.Errorf("failed to read peering by id: %w", err)
 	}
 	if peering == nil {
-		if structs.CEDowngrade {
-			return nil
-		}
 		return fmt.Errorf("unknown peering %q for secret", req.PeerID)
 	}
 
diff --git a/agent/consul/testdata/v2-resource-dependencies.md b/agent/consul/testdata/v2-resource-dependencies.md
deleted file mode 100644
index 0d0d811236113..0000000000000
--- a/agent/consul/testdata/v2-resource-dependencies.md
+++ /dev/null
@@ -1,52 +0,0 @@
-```mermaid
-flowchart TD
-  auth/v2beta1/computedtrafficpermissions --> auth/v2beta1/trafficpermissions
-  auth/v2beta1/computedtrafficpermissions --> auth/v2beta1/workloadidentity
-  catalog/v2beta1/failoverpolicy --> catalog/v2beta1/service
-  catalog/v2beta1/healthstatus
-  catalog/v2beta1/node --> catalog/v2beta1/nodehealthstatus
-  catalog/v2beta1/nodehealthstatus
-  catalog/v2beta1/service
-  catalog/v2beta1/serviceendpoints --> catalog/v2beta1/service
-  catalog/v2beta1/serviceendpoints --> catalog/v2beta1/workload
-  catalog/v2beta1/workload --> catalog/v2beta1/healthstatus
-  catalog/v2beta1/workload --> catalog/v2beta1/node
-  demo/v1/album
-  demo/v1/artist
-  demo/v1/concept
-  demo/v1/executive
-  demo/v1/recordlabel
-  demo/v2/album
-  demo/v2/artist
-  internal/v1/tombstone
-  mesh/v2beta1/computedexplicitdestinations --> catalog/v2beta1/service
-  mesh/v2beta1/computedexplicitdestinations --> catalog/v2beta1/workload
-  mesh/v2beta1/computedexplicitdestinations --> mesh/v2beta1/computedroutes
-  mesh/v2beta1/computedexplicitdestinations --> mesh/v2beta1/destinations
-  mesh/v2beta1/computedproxyconfiguration --> catalog/v2beta1/workload
-  mesh/v2beta1/computedproxyconfiguration --> mesh/v2beta1/proxyconfiguration
-  mesh/v2beta1/computedroutes --> catalog/v2beta1/failoverpolicy
-  mesh/v2beta1/computedroutes --> catalog/v2beta1/service
-  mesh/v2beta1/computedroutes --> mesh/v2beta1/destinationpolicy
-  mesh/v2beta1/computedroutes --> mesh/v2beta1/grpcroute
-  mesh/v2beta1/computedroutes --> mesh/v2beta1/httproute
-  mesh/v2beta1/computedroutes --> mesh/v2beta1/tcproute
-  mesh/v2beta1/destinationpolicy
-  mesh/v2beta1/destinations
-  mesh/v2beta1/grpcroute
-  mesh/v2beta1/httproute
-  mesh/v2beta1/meshconfiguration
-  mesh/v2beta1/meshgateway
-  mesh/v2beta1/proxyconfiguration
-  mesh/v2beta1/proxystatetemplate --> auth/v2beta1/computedtrafficpermissions
-  mesh/v2beta1/proxystatetemplate --> catalog/v2beta1/service
-  mesh/v2beta1/proxystatetemplate --> catalog/v2beta1/workload
-  mesh/v2beta1/proxystatetemplate --> mesh/v2beta1/computedexplicitdestinations
-  mesh/v2beta1/proxystatetemplate --> mesh/v2beta1/computedproxyconfiguration
-  mesh/v2beta1/proxystatetemplate --> mesh/v2beta1/computedroutes
-  mesh/v2beta1/tcproute
-  multicluster/v2beta1/computedexportedservices --> catalog/v2beta1/service
-  multicluster/v2beta1/computedexportedservices --> multicluster/v2beta1/exportedservices
-  multicluster/v2beta1/computedexportedservices --> multicluster/v2beta1/namespaceexportedservices
-  multicluster/v2beta1/computedexportedservices --> multicluster/v2beta1/partitionexportedservices
-```
\ No newline at end of file
diff --git a/agent/consul/type_registry.go b/agent/consul/type_registry.go
index 8bf093c41a112..d93309159d4bb 100644
--- a/agent/consul/type_registry.go
+++ b/agent/consul/type_registry.go
@@ -7,7 +7,6 @@ import (
 	"github.com/hashicorp/consul/internal/auth"
 	"github.com/hashicorp/consul/internal/catalog"
 	"github.com/hashicorp/consul/internal/mesh"
-	"github.com/hashicorp/consul/internal/multicluster"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/demo"
 	"github.com/hashicorp/consul/internal/tenancy"
@@ -28,7 +27,6 @@ func NewTypeRegistry() resource.Registry {
 	catalog.RegisterTypes(registry)
 	auth.RegisterTypes(registry)
 	tenancy.RegisterTypes(registry)
-	multicluster.RegisterTypes(registry)
 
 	return registry
 }
diff --git a/agent/event_endpoint_test.go b/agent/event_endpoint_test.go
index f28b913cfd009..a041088c448c7 100644
--- a/agent/event_endpoint_test.go
+++ b/agent/event_endpoint_test.go
@@ -234,7 +234,7 @@ func TestEventList_ACLFilter(t *testing.T) {
 
 	t.Run("token with access to one event type", func(t *testing.T) {
 		retry.Run(t, func(r *retry.R) {
-			token := testCreateToken(r, a, `
+			token := testCreateToken(t, a, `
 				event "foo" {
 					policy = "read"
 				}
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 2a50094029076..3ae0670e5cf08 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
@@ -7,29 +7,29 @@ import (
 	"context"
 	"testing"
 
+	"github.com/hashicorp/go-hclog"
 	"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/structpb"
 
-	"github.com/hashicorp/go-hclog"
-
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/acl/resolver"
-	external "github.com/hashicorp/consul/agent/grpc-external"
 	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
-	"github.com/hashicorp/consul/agent/grpc-external/testutils"
-	"github.com/hashicorp/consul/agent/structs"
 	"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"
-	"github.com/hashicorp/consul/proto-public/pbdataplane"
 	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"
 )
 
 const (
@@ -262,9 +262,7 @@ func TestGetEnvoyBootstrapParams_Success_EnableV2(t *testing.T) {
 	}
 
 	run := func(t *testing.T, tc testCase) {
-		resourceClient := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(catalog.RegisterTypes, mesh.RegisterTypes).
-			Run(t)
+		resourceClient := svctest.RunResourceService(t, catalog.RegisterTypes, mesh.RegisterTypes)
 
 		options := structs.QueryOptions{Token: testToken}
 		ctx, err := external.ContextWithQueryOptions(context.Background(), options)
@@ -492,9 +490,7 @@ func TestGetEnvoyBootstrapParams_Error_EnableV2(t *testing.T) {
 	}
 
 	run := func(t *testing.T, tc testCase) {
-		resourceClient := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(catalog.RegisterTypes, mesh.RegisterTypes).
-			Run(t)
+		resourceClient := svctest.RunResourceService(t, catalog.RegisterTypes, mesh.RegisterTypes)
 
 		options := structs.QueryOptions{Token: testToken}
 		ctx, err := external.ContextWithQueryOptions(context.Background(), options)
diff --git a/agent/grpc-external/services/peerstream/stream_test.go b/agent/grpc-external/services/peerstream/stream_test.go
index d5a0abd6b444e..ad3399b79f5a9 100644
--- a/agent/grpc-external/services/peerstream/stream_test.go
+++ b/agent/grpc-external/services/peerstream/stream_test.go
@@ -690,7 +690,7 @@ func TestStreamResources_Server_StreamTracker(t *testing.T) {
 			req := msg.GetRequest()
 			require.NotNil(r, req)
 			require.Equal(r, pbpeerstream.TypeURLExportedService, req.ResourceURL)
-			prototest.AssertDeepEqual(r, expectAck, msg)
+			prototest.AssertDeepEqual(t, expectAck, msg)
 		})
 
 		expect := Status{
diff --git a/agent/grpc-external/services/resource/delete.go b/agent/grpc-external/services/resource/delete.go
index 582cc5dbc0a26..2f30e27f983fb 100644
--- a/agent/grpc-external/services/resource/delete.go
+++ b/agent/grpc-external/services/resource/delete.go
@@ -7,7 +7,6 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"strings"
 	"time"
 
 	"github.com/oklog/ulid/v2"
@@ -19,7 +18,6 @@ import (
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/storage"
 	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
 )
 
 // Delete deletes a resource.
@@ -29,7 +27,7 @@ import (
 // - 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.ensureDeleteRequestValid(req)
+	reg, err := s.validateDeleteRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -75,21 +73,6 @@ func (s *Server) Delete(ctx context.Context, req *pbresource.DeleteRequest) (*pb
 		deleteId = existing.Id
 	}
 
-	// Check finalizers for a deferred delete
-	if resource.HasFinalizers(existing) {
-		if resource.IsMarkedForDeletion(existing) {
-			// Delete previously requested and finalizers still present so nothing to do
-			return &pbresource.DeleteResponse{}, nil
-		}
-
-		// Mark for deletion and let controllers that put finalizers in place do their
-		// thing. Note we're passing in a clone of the recently read resource since
-		// we've not crossed a network/serialization boundary since the read and we
-		// don't want to mutate the in-mem reference.
-		return s.markForDeletion(ctx, clone(existing))
-	}
-
-	// Continue with an immediate delete
 	if err := s.maybeCreateTombstone(ctx, deleteId); err != nil {
 		return nil, err
 	}
@@ -105,16 +88,6 @@ func (s *Server) Delete(ctx context.Context, req *pbresource.DeleteRequest) (*pb
 	}
 }
 
-func (s *Server) markForDeletion(ctx context.Context, res *pbresource.Resource) (*pbresource.DeleteResponse, error) {
-	// Write the deletion timestamp
-	res.Metadata[resource.DeletionTimestampKey] = time.Now().Format(time.RFC3339)
-	_, err := s.Write(ctx, &pbresource.WriteRequest{Resource: res})
-	if err != nil {
-		return nil, err
-	}
-	return &pbresource.DeleteResponse{}, nil
-}
-
 // 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
@@ -146,7 +119,7 @@ func (s *Server) maybeCreateTombstone(ctx context.Context, deleteId *pbresource.
 		Id: &pbresource.ID{
 			Type:    resource.TypeV1Tombstone,
 			Tenancy: deleteId.Tenancy,
-			Name:    TombstoneNameFor(deleteId),
+			Name:    tombstoneName(deleteId),
 			Uid:     ulid.Make().String(),
 		},
 		Generation: ulid.Make().String(),
@@ -171,7 +144,7 @@ func (s *Server) maybeCreateTombstone(ctx context.Context, deleteId *pbresource.
 	}
 }
 
-func (s *Server) ensureDeleteRequestValid(req *pbresource.DeleteRequest) (*resource.Registration, error) {
+func (s *Server) validateDeleteRequest(req *pbresource.DeleteRequest) (*resource.Registration, error) {
 	if req.Id == nil {
 		return nil, status.Errorf(codes.InvalidArgument, "id is required")
 	}
@@ -185,32 +158,22 @@ func (s *Server) ensureDeleteRequestValid(req *pbresource.DeleteRequest) (*resou
 		return nil, err
 	}
 
-	if err = checkV2Tenancy(s.UseV2Tenancy, req.Id.Type); err != nil {
-		return nil, err
-	}
-
-	if err := validateScopedTenancy(reg.Scope, reg.Type, req.Id.Tenancy); 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 err := blockBuiltinsDeletion(reg.Type, req.Id); err != nil {
-		return nil, err
-	}
 	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 TombstoneNameFor(deleteId *pbresource.ID) string {
+func tombstoneName(deleteId *pbresource.ID) string {
 	// deleteId.Name is just included for easier identification
-	return fmt.Sprintf("tombstone-%v-%v", deleteId.Name, strings.ToLower(deleteId.Uid))
-}
-
-func blockDefaultNamespaceDeletion(rtype *pbresource.Type, id *pbresource.ID) error {
-	if id.Name == resource.DefaultNamespaceName &&
-		id.Tenancy.Partition == resource.DefaultPartitionName &&
-		resource.EqualType(rtype, pbtenancy.NamespaceType) {
-		return status.Errorf(codes.InvalidArgument, "cannot delete default namespace")
-	}
-	return nil
+	return fmt.Sprintf("tombstone-%v-%v", deleteId.Name, deleteId.Uid)
 }
diff --git a/agent/grpc-external/services/resource/delete_ce.go b/agent/grpc-external/services/resource/delete_ce.go
deleted file mode 100644
index d2ff805a24a47..0000000000000
--- a/agent/grpc-external/services/resource/delete_ce.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package resource
-
-import "github.com/hashicorp/consul/proto-public/pbresource"
-
-func blockBuiltinsDeletion(rtype *pbresource.Type, id *pbresource.ID) error {
-	if err := blockDefaultNamespaceDeletion(rtype, id); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/agent/grpc-external/services/resource/delete_test.go b/agent/grpc-external/services/resource/delete_test.go
index fd5ed321c806e..5f5d7d7e21920 100644
--- a/agent/grpc-external/services/resource/delete_test.go
+++ b/agent/grpc-external/services/resource/delete_test.go
@@ -1,12 +1,10 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+package resource
 
 import (
 	"context"
-	"fmt"
-	"strings"
 	"testing"
 
 	"github.com/stretchr/testify/mock"
@@ -16,158 +14,62 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/hashicorp/consul/acl/resolver"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	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"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-	pbdemo "github.com/hashicorp/consul/proto/private/pbdemo/v1"
 )
 
 func TestDelete_InputValidation(t *testing.T) {
-	type testCase struct {
-		modFn       func(artistId, recordLabelId, executiveId *pbresource.ID) *pbresource.ID
-		errContains string
-	}
-
-	run := func(t *testing.T, client pbresource.ResourceServiceClient, tc testCase) {
-		executive, err := demo.GenerateV1Executive("marvin", "CEO")
-		require.NoError(t, err)
-
-		recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
-		require.NoError(t, err)
+	server := testServer(t)
+	client := testClient(t, server)
 
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
+	demo.RegisterTypes(server.Registry)
 
-		req := &pbresource.DeleteRequest{Id: tc.modFn(artist.Id, recordLabel.Id, executive.Id), Version: ""}
-		_, err = client.Delete(context.Background(), req)
-		require.Error(t, err)
-		require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-		require.ErrorContains(t, err, tc.errContains)
-	}
-
-	testCases := map[string]testCase{
-		"no id": {
-			modFn: func(_, _, _ *pbresource.ID) *pbresource.ID {
-				return nil
-			},
-			errContains: "id is required",
-		},
-		"no type": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Type = nil
-				return artistId
-			},
-			errContains: "id.type is required",
-		},
-		"no name": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = ""
-				return artistId
-			},
-			errContains: "id.name invalid",
-		},
-		"mixed case name": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = "DepecheMode"
-				return artistId
-			},
-			errContains: "id.name invalid",
-		},
-		"name too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = strings.Repeat("n", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "id.name invalid",
-		},
-		"partition mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Partition = "Default"
-				return artistId
-			},
-			errContains: "id.tenancy.partition invalid",
-		},
-		"partition name too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "id.tenancy.partition invalid",
-		},
-		"namespace mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Namespace = "Default"
-				return artistId
-			},
-			errContains: "id.tenancy.namespace invalid",
+	testCases := map[string]func(artistId, recordLabelId *pbresource.ID) *pbresource.ID{
+		"no id": func(artistId, recordLabelId *pbresource.ID) *pbresource.ID {
+			return nil
 		},
-		"namespace name too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "id.tenancy.namespace invalid",
+		"no type": func(artistId, _ *pbresource.ID) *pbresource.ID {
+			artistId.Type = nil
+			return artistId
 		},
-		"partition scoped resource with namespace": {
-			modFn: func(_, recordLabelId, _ *pbresource.ID) *pbresource.ID {
-				recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
-				return recordLabelId
-			},
-			errContains: "cannot have a namespace",
+		"no name": func(artistId, _ *pbresource.ID) *pbresource.ID {
+			artistId.Name = ""
+			return artistId
 		},
-		"cluster scoped resource with partition": {
-			modFn: func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-				executiveId.Tenancy.Partition = "ishouldnothaveapartition"
-				executiveId.Tenancy.Namespace = ""
-				return executiveId
-			},
-			errContains: "cannot have a partition",
-		},
-		"cluster scoped resource with namespace": {
-			modFn: func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-				executiveId.Tenancy.Partition = ""
-				executiveId.Tenancy.Namespace = "ishouldnothaveanamespace"
-				return executiveId
-			},
-			errContains: "cannot have a namespace",
+		"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)
 
-	for _, useV2Tenancy := range []bool{false, true} {
-		t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(useV2Tenancy).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			artist, err := demo.GenerateV2Artist()
+			require.NoError(t, err)
 
-			for desc, tc := range testCases {
-				t.Run(desc, func(t *testing.T) {
-					run(t, client, tc)
-				})
-			}
+			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) {
-	for _, useV2Tenancy := range []bool{false, true} {
-		t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().WithV2Tenancy(useV2Tenancy).Run(t)
+	t.Parallel()
 
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
+	_, client, ctx := testDeps(t)
+	artist, err := demo.GenerateV2Artist()
+	require.NoError(t, err)
 
-			// delete artist with unregistered type
-			_, err = client.Delete(context.Background(), &pbresource.DeleteRequest{Id: artist.Id, Version: ""})
-			require.Error(t, err)
-			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.ErrorContains(t, err, "not registered")
-		})
-	}
+	// 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) {
@@ -193,8 +95,9 @@ func TestDelete_ACLs(t *testing.T) {
 
 	for desc, tc := range testcases {
 		t.Run(desc, func(t *testing.T) {
-			builder := svctest.NewResourceServiceBuilder().WithRegisterFns(demo.RegisterTypes)
-			client := builder.Run(t)
+			server := testServer(t)
+			client := testClient(t, server)
+			demo.RegisterTypes(server.Registry)
 
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
@@ -204,10 +107,10 @@ func TestDelete_ACLs(t *testing.T) {
 			require.NoError(t, err)
 
 			// Mock is put in place after the above "write" since the "write" must also pass the ACL check.
-			mockACLResolver := &svc.MockACLResolver{}
+			mockACLResolver := &MockACLResolver{}
 			mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
 				Return(tc.authz, nil)
-			builder.ServiceImpl().Config.ACLResolver = mockACLResolver
+			server.ACLResolver = mockACLResolver
 
 			// Exercise ACL.
 			_, err = client.Delete(testContext(t), &pbresource.DeleteRequest{Id: rsp.Resource.Id})
@@ -219,70 +122,59 @@ func TestDelete_ACLs(t *testing.T) {
 func TestDelete_Success(t *testing.T) {
 	t.Parallel()
 
-	run := func(t *testing.T, client pbresource.ResourceServiceClient, tc deleteTestCase, modFn func(artistId, recordlabelId *pbresource.ID) *pbresource.ID) {
-		ctx := context.Background()
-
-		recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
-		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 := svc.TombstoneNameFor(originalRecordLabelId)
-		if proto.Equal(deleteId.Type, demo.TypeV2Artist) {
-			tname = svc.TombstoneNameFor(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")
-	}
-
 	for desc, tc := range deleteTestCases() {
 		t.Run(desc, func(t *testing.T) {
 			for tenancyDesc, modFn := range tenancyCases() {
 				t.Run(tenancyDesc, func(t *testing.T) {
-					for _, useV2Tenancy := range []bool{false, true} {
-						t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-							client := svctest.NewResourceServiceBuilder().
-								WithV2Tenancy(useV2Tenancy).
-								WithRegisterFns(demo.RegisterTypes).
-								Run(t)
-							run(t, client, tc, modFn)
-						})
+					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")
 				})
 			}
 		})
@@ -292,188 +184,79 @@ func TestDelete_Success(t *testing.T) {
 func TestDelete_TombstoneDeletionDoesNotCreateNewTombstone(t *testing.T) {
 	t.Parallel()
 
-	for _, useV2Tenancy := range []bool{false, true} {
-		t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-			ctx := context.Background()
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(useV2Tenancy).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+	server, client, ctx := testDeps(t)
+	demo.RegisterTypes(server.Registry)
 
-			artist, err := demo.GenerateV2Artist()
-			require.NoError(t, err)
+	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)
+	rsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: artist})
+	require.NoError(t, err)
+	artist = rsp.Resource
 
-			// verify artist's tombstone created
-			rsp2, err := client.Read(ctx, &pbresource.ReadRequest{
-				Id: &pbresource.ID{
-					Name:    svc.TombstoneNameFor(artist.Id),
-					Type:    resource.TypeV1Tombstone,
-					Tenancy: artist.Id.Tenancy,
-				},
-			})
-			require.NoError(t, err)
-			tombstone := rsp2.Resource
+	// delete artist
+	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: artist.Id, Version: ""})
+	require.NoError(t, err)
 
-			// 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)
-		})
-	}
+	// 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()
 
-	run := func(t *testing.T, client pbresource.ResourceServiceClient, tc deleteTestCase) {
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		// verify delete of non-existant or already deleted resource is a no-op
-		_, err = client.Delete(context.Background(), tc.deleteReqFn(artist))
-		require.NoError(t, err)
-	}
-
-	for _, useV2Tenancy := range []bool{false, true} {
-		t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(useV2Tenancy).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			for desc, tc := range deleteTestCases() {
-				t.Run(desc, func(t *testing.T) {
-					run(t, client, tc)
-				})
-			}
-		})
-	}
-}
-
-func TestDelete_VersionMismatch(t *testing.T) {
-	t.Parallel()
-
-	for _, useV2Tenancy := range []bool{false, true} {
-		t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(useV2Tenancy).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
+	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)
-			rsp, err := client.Write(context.Background(), &pbresource.WriteRequest{Resource: artist})
-			require.NoError(t, err)
-
-			// delete with a version that is different from the stored version
-			_, err = client.Delete(context.Background(), &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 TestDelete_MarkedForDeletionWhenFinalizersPresent(t *testing.T) {
-	for _, useV2Tenancy := range []bool{false, true} {
-		t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-			ctx := context.Background()
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(useV2Tenancy).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			// Create a resource with a finalizer
-			res := rtest.Resource(demo.TypeV1Artist, "manwithnoname").
-				WithTenancy(resource.DefaultClusteredTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Man With No Name"}).
-				WithMeta(resource.FinalizerKey, "finalizer1").
-				Write(t, client)
-
-			// Delete it
-			_, err := client.Delete(ctx, &pbresource.DeleteRequest{Id: res.Id})
-			require.NoError(t, err)
-
-			// Verify resource has been marked for deletion
-			rsp, err := client.Read(ctx, &pbresource.ReadRequest{Id: res.Id})
-			require.NoError(t, err)
-			require.True(t, resource.IsMarkedForDeletion(rsp.Resource))
 
-			// Delete again - should be no-op
-			_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: res.Id})
+			// verify delete of non-existant or already deleted resource is a no-op
+			_, err = client.Delete(ctx, tc.deleteReqFn(artist))
 			require.NoError(t, err)
-
-			// Verify no-op by checking version still the same
-			rsp2, err := client.Read(ctx, &pbresource.ReadRequest{Id: res.Id})
-			require.NoError(t, err)
-			rtest.RequireVersionUnchanged(t, rsp2.Resource, rsp.Resource.Version)
 		})
 	}
 }
 
-func TestDelete_ImmediatelyDeletedAfterFinalizersRemoved(t *testing.T) {
-	for _, useV2Tenancy := range []bool{false, true} {
-		t.Run(fmt.Sprintf("v2tenancy %v", useV2Tenancy), func(t *testing.T) {
-			ctx := context.Background()
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(useV2Tenancy).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			// Create a resource with a finalizer
-			res := rtest.Resource(demo.TypeV1Artist, "manwithnoname").
-				WithTenancy(resource.DefaultClusteredTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Man With No Name"}).
-				WithMeta(resource.FinalizerKey, "finalizer1").
-				Write(t, client)
-
-			// Delete should mark it for deletion
-			_, err := client.Delete(ctx, &pbresource.DeleteRequest{Id: res.Id})
-			require.NoError(t, err)
-
-			// Remove the finalizer
-			rsp, err := client.Read(ctx, &pbresource.ReadRequest{Id: res.Id})
-			require.NoError(t, err)
-			resource.RemoveFinalizer(rsp.Resource, "finalizer1")
-			_, err = client.Write(ctx, &pbresource.WriteRequest{Resource: rsp.Resource})
-			require.NoError(t, err)
+func TestDelete_VersionMismatch(t *testing.T) {
+	t.Parallel()
 
-			// Delete should be immediate
-			_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: rsp.Resource.Id})
-			require.NoError(t, err)
+	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)
 
-			// Verify deleted
-			_, err = client.Read(ctx, &pbresource.ReadRequest{Id: rsp.Resource.Id})
-			require.Error(t, err)
-			require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-		})
-	}
+	// 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 TestDelete_BlockDeleteDefaultNamespace(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().WithV2Tenancy(true).Run(t)
-
-	id := &pbresource.ID{
-		Name:    resource.DefaultNamespaceName,
-		Type:    pbtenancy.NamespaceType,
-		Tenancy: &pbresource.Tenancy{Partition: resource.DefaultPartitionName},
-	}
-	_, err := client.Delete(context.Background(), &pbresource.DeleteRequest{Id: id})
-	require.Error(t, err)
-	require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-	require.ErrorContains(t, err, "cannot delete default namespace")
+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 {
diff --git a/agent/grpc-external/services/resource/list.go b/agent/grpc-external/services/resource/list.go
index dc7f88a404c8e..c1ecb253448ce 100644
--- a/agent/grpc-external/services/resource/list.go
+++ b/agent/grpc-external/services/resource/list.go
@@ -16,7 +16,7 @@ import (
 )
 
 func (s *Server) List(ctx context.Context, req *pbresource.ListRequest) (*pbresource.ListResponse, error) {
-	reg, err := s.ensureListRequestValid(req)
+	reg, err := s.validateListRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -81,7 +81,7 @@ func (s *Server) List(ctx context.Context, req *pbresource.ListRequest) (*pbreso
 	return &pbresource.ListResponse{Resources: result}, nil
 }
 
-func (s *Server) ensureListRequestValid(req *pbresource.ListRequest) (*resource.Registration, error) {
+func (s *Server) validateListRequest(req *pbresource.ListRequest) (*resource.Registration, error) {
 	var field string
 	switch {
 	case req.Type == nil:
@@ -100,13 +100,8 @@ func (s *Server) ensureListRequestValid(req *pbresource.ListRequest) (*resource.
 		return nil, err
 	}
 
-	if err = checkV2Tenancy(s.UseV2Tenancy, req.Type); err != nil {
-		return nil, err
-	}
-
-	if err := validateWildcardTenancy(req.Tenancy, req.NamePrefix); 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 != "" {
diff --git a/agent/grpc-external/services/resource/list_by_owner.go b/agent/grpc-external/services/resource/list_by_owner.go
index 781f36069cf51..2310a5b50eda2 100644
--- a/agent/grpc-external/services/resource/list_by_owner.go
+++ b/agent/grpc-external/services/resource/list_by_owner.go
@@ -15,7 +15,7 @@ import (
 )
 
 func (s *Server) ListByOwner(ctx context.Context, req *pbresource.ListByOwnerRequest) (*pbresource.ListByOwnerResponse, error) {
-	reg, err := s.ensureListByOwnerRequestValid(req)
+	reg, err := s.validateListByOwnerRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -42,6 +42,11 @@ func (s *Server) ListByOwner(ctx context.Context, req *pbresource.ListByOwnerReq
 		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 {
@@ -82,7 +87,7 @@ func (s *Server) ListByOwner(ctx context.Context, req *pbresource.ListByOwnerReq
 	return &pbresource.ListByOwnerResponse{Resources: result}, nil
 }
 
-func (s *Server) ensureListByOwnerRequestValid(req *pbresource.ListByOwnerRequest) (*resource.Registration, error) {
+func (s *Server) validateListByOwnerRequest(req *pbresource.ListByOwnerRequest) (*resource.Registration, error) {
 	if req.Owner == nil {
 		return nil, status.Errorf(codes.InvalidArgument, "owner is required")
 	}
@@ -100,12 +105,17 @@ func (s *Server) ensureListByOwnerRequestValid(req *pbresource.ListByOwnerReques
 		return nil, err
 	}
 
-	if err = checkV2Tenancy(s.UseV2Tenancy, req.Owner.Type); err != nil {
-		return nil, err
-	}
-
-	if err = validateScopedTenancy(reg.Scope, reg.Type, req.Owner.Tenancy); 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
index 92167042ea154..11c6027c0b642 100644
--- a/agent/grpc-external/services/resource/list_by_owner_test.go
+++ b/agent/grpc-external/services/resource/list_by_owner_test.go
@@ -1,162 +1,73 @@
 // // Copyright (c) HashiCorp, Inc.
 // // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+package resource
 
 import (
 	"context"
 	"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/proto"
-
 	"github.com/hashicorp/consul/acl"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
 	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemo "github.com/hashicorp/consul/proto/private/pbdemo/v1"
 	"github.com/hashicorp/consul/proto/private/prototest"
-)
 
-// TODO: Update all tests to use true/false table test for v2tenancy
+	"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) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+	demo.RegisterTypes(server.Registry)
 
-	type testCase struct {
-		modFn       func(artistId, recordlabelId, executiveId *pbresource.ID) *pbresource.ID
-		errContains string
-	}
-	testCases := map[string]testCase{
-		"no owner": {
-			modFn: func(_, _, _ *pbresource.ID) *pbresource.ID {
-				return nil
-			},
-			errContains: "owner is required",
-		},
-		"no type": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Type = nil
-				return artistId
-			},
-			errContains: "owner.type is required",
-		},
-		"no name": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = ""
-				return artistId
-			},
-			errContains: "owner.name invalid",
-		},
-		"name mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = "U2"
-				return artistId
-			},
-			errContains: "owner.name invalid",
+	testCases := map[string]func(artistId, recordlabelId *pbresource.ID) *pbresource.ID{
+		"no owner": func(artistId, recordLabelId *pbresource.ID) *pbresource.ID {
+			return nil
 		},
-		"name too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = strings.Repeat("n", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "owner.name invalid",
+		"no type": func(artistId, _ *pbresource.ID) *pbresource.ID {
+			artistId.Type = nil
+			return artistId
 		},
-		"partition mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Partition = "Default"
-				return artistId
-			},
-			errContains: "owner.tenancy.partition invalid",
+		"no name": func(artistId, _ *pbresource.ID) *pbresource.ID {
+			artistId.Name = ""
+			return artistId
 		},
-		"partition too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "owner.tenancy.partition invalid",
+		"no uid": func(artistId, _ *pbresource.ID) *pbresource.ID {
+			artistId.Uid = ""
+			return artistId
 		},
-		"namespace mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Namespace = "Default"
-				return artistId
-			},
-			errContains: "owner.tenancy.namespace invalid",
-		},
-		"namespace too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "owner.tenancy.namespace invalid",
-		},
-		"no uid": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Uid = ""
-				return artistId
-			},
-			errContains: "owner uid is required",
-		},
-		"partition scope with non-empty namespace": {
-			modFn: func(_, recordLabelId, _ *pbresource.ID) *pbresource.ID {
-				recordLabelId.Uid = ulid.Make().String()
-				recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
-				return recordLabelId
-			},
-			errContains: "cannot have a namespace",
-		},
-		"cluster scope with non-empty partition": {
-			modFn: func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-				executiveId.Uid = ulid.Make().String()
-				executiveId.Tenancy.Partition = "ishouldnothaveapartition"
-				return executiveId
-			},
-			errContains: "cannot have a partition",
-		},
-		"cluster scope with non-empty namespace": {
-			modFn: func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-				executiveId.Uid = ulid.Make().String()
-				executiveId.Tenancy.Namespace = "ishouldnothaveanamespace"
-				return executiveId
-			},
-			errContains: "cannot have a namespace",
+		"partition scope with non-empty namespace": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
+			recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
+			return recordLabelId
 		},
 	}
-	for desc, tc := range testCases {
+	for desc, modFn := range testCases {
 		t.Run(desc, func(t *testing.T) {
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
 
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
-			require.NoError(t, err)
-
-			executive, err := demo.GenerateV1Executive("marvin", "CEO")
+			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: tc.modFn(artist.Id, recordLabel.Id, executive.Id)}
+			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())
-			require.ErrorContains(t, err, tc.errContains)
 		})
 	}
 }
 
 func TestListByOwner_TypeNotRegistered(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
 	_, err := client.ListByOwner(context.Background(), &pbresource.ListByOwnerRequest{
 		Owner: &pbresource.ID{
@@ -172,9 +83,9 @@ func TestListByOwner_TypeNotRegistered(t *testing.T) {
 }
 
 func TestListByOwner_Empty(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	demo.RegisterTypes(server.Registry)
+	client := testClient(t, server)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -188,9 +99,9 @@ func TestListByOwner_Empty(t *testing.T) {
 }
 
 func TestListByOwner_Many(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	demo.RegisterTypes(server.Registry)
+	client := testClient(t, server)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -220,53 +131,47 @@ func TestListByOwner_Many(t *testing.T) {
 }
 
 func TestListByOwner_OwnerTenancyDoesNotExist(t *testing.T) {
-	type testCase struct {
-		modFn func(artistId, recordlabelId *pbresource.ID) *pbresource.ID
-	}
-	tenancyCases := map[string]testCase{
-		"namespace scoped owner with non-existent partition": {
-			modFn: func(artistId, _ *pbresource.ID) *pbresource.ID {
-				id := clone(artistId)
-				id.Tenancy.Partition = "boguspartition"
-				return id
-			},
+	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 scoped owner with non-existent namespace": {
-			modFn: func(artistId, _ *pbresource.ID) *pbresource.ID {
-				id := clone(artistId)
-				id.Tenancy.Namespace = "bogusnamespace"
-				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 scoped owner with non-existent partition": {
-			modFn: func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-				id := clone(recordLabelId)
-				id.Tenancy.Partition = "boguspartition"
-				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, tc := range tenancyCases {
+	for desc, modFn := range tenancyCases {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			recordLabel := resourcetest.Resource(demo.TypeV1RecordLabel, "looney-tunes").
-				WithTenancy(resource.DefaultPartitionedTenancy()).
-				WithData(t, &pbdemo.RecordLabel{Name: "Looney Tunes"}).
-				Write(t, client)
-
-			artist := resourcetest.Resource(demo.TypeV1Artist, "blur").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Blur"}).
-				WithOwner(recordLabel.Id).
-				Write(t, client)
-
-			// Verify non-existant tenancy units in owner return empty list.
-			rsp, err := client.ListByOwner(testContext(t), &pbresource.ListByOwnerRequest{Owner: tc.modFn(artist.Id, recordLabel.Id)})
+			server := testServer(t)
+			demo.RegisterTypes(server.Registry)
+			client := testClient(t, server)
+
+			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 			require.NoError(t, err)
-			require.Empty(t, rsp.Resources)
+			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")
 		})
 	}
 }
@@ -274,12 +179,12 @@ func TestListByOwner_OwnerTenancyDoesNotExist(t *testing.T) {
 func TestListByOwner_Tenancy_Defaults_And_Normalization(t *testing.T) {
 	for tenancyDesc, modFn := range tenancyCases() {
 		t.Run(tenancyDesc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			demo.RegisterTypes(server.Registry)
+			client := testClient(t, server)
 
 			// Create partition scoped recordLabel.
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 			require.NoError(t, err)
 			rsp1, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: recordLabel})
 			require.NoError(t, err)
@@ -346,9 +251,9 @@ func TestListByOwner_ACL_PerTypeAllowed(t *testing.T) {
 
 // roundtrip a ListByOwner which attempts to return a single resource
 func roundTripListByOwner(t *testing.T, authz acl.Authorizer) (*pbresource.Resource, *pbresource.ListByOwnerResponse, error) {
-	builder := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes)
-	client := builder.Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+	demo.RegisterTypes(server.Registry)
 
 	artist, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -364,11 +269,10 @@ func roundTripListByOwner(t *testing.T, authz acl.Authorizer) (*pbresource.Resou
 	album = rsp2.Resource
 	require.NoError(t, err)
 
-	// Mock has to be put in place after the above writes so writes will succeed.
-	mockACLResolver := &svc.MockACLResolver{}
+	mockACLResolver := &MockACLResolver{}
 	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
 		Return(authz, nil)
-	builder.ServiceImpl().ACLResolver = mockACLResolver
+	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
index 780497ec0f458..64026b7d34e59 100644
--- a/agent/grpc-external/services/resource/list_test.go
+++ b/agent/grpc-external/services/resource/list_test.go
@@ -1,103 +1,60 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+package resource
 
 import (
 	"context"
 	"fmt"
-	"strconv"
-	"strings"
 	"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"
-
 	"github.com/hashicorp/consul/acl"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
 	"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"
-)
 
-// TODO: Update all tests to use true/false table test for v2tenancy
+	"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) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
-	type testCase struct {
-		modReqFn    func(req *pbresource.ListRequest)
-		errContains string
-	}
+	demo.RegisterTypes(server.Registry)
 
-	testCases := map[string]testCase{
-		"no type": {
-			modReqFn:    func(req *pbresource.ListRequest) { req.Type = nil },
-			errContains: "type is required",
-		},
-		"no tenancy": {
-			modReqFn:    func(req *pbresource.ListRequest) { req.Tenancy = nil },
-			errContains: "tenancy is required",
-		},
-		"partition mixed case": {
-			modReqFn:    func(req *pbresource.ListRequest) { req.Tenancy.Partition = "Default" },
-			errContains: "tenancy.partition invalid",
-		},
-		"partition too long": {
-			modReqFn: func(req *pbresource.ListRequest) {
-				req.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-			},
-			errContains: "tenancy.partition invalid",
-		},
-		"namespace mixed case": {
-			modReqFn:    func(req *pbresource.ListRequest) { req.Tenancy.Namespace = "Default" },
-			errContains: "tenancy.namespace invalid",
-		},
-		"namespace too long": {
-			modReqFn: func(req *pbresource.ListRequest) {
-				req.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-			},
-			errContains: "tenancy.namespace invalid",
-		},
-		"name_prefix mixed case": {
-			modReqFn:    func(req *pbresource.ListRequest) { req.NamePrefix = "Violator" },
-			errContains: "name_prefix invalid",
-		},
-		"partitioned resource provides non-empty namespace": {
-			modReqFn: func(req *pbresource.ListRequest) {
-				req.Type = demo.TypeV1RecordLabel
-				req.Tenancy.Namespace = "bad"
-			},
-			errContains: "cannot have a namespace",
+	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, tc := range testCases {
+	for desc, modFn := range testCases {
 		t.Run(desc, func(t *testing.T) {
 			req := &pbresource.ListRequest{
 				Type:    demo.TypeV2Album,
 				Tenancy: resource.DefaultNamespacedTenancy(),
 			}
-			tc.modReqFn(req)
+			modFn(req)
 
 			_, err := client.List(testContext(t), req)
 			require.Error(t, err)
 			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.ErrorContains(t, err, tc.errContains)
 		})
 	}
 }
 
 func TestList_TypeNotFound(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
 	_, err := client.List(context.Background(), &pbresource.ListRequest{
 		Type:       demo.TypeV2Artist,
@@ -112,9 +69,9 @@ func TestList_TypeNotFound(t *testing.T) {
 func TestList_Empty(t *testing.T) {
 	for desc, tc := range listTestCases() {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			demo.RegisterTypes(server.Registry)
+			client := testClient(t, server)
 
 			rsp, err := client.List(tc.ctx, &pbresource.ListRequest{
 				Type:       demo.TypeV1Artist,
@@ -130,9 +87,9 @@ func TestList_Empty(t *testing.T) {
 func TestList_Many(t *testing.T) {
 	for desc, tc := range listTestCases() {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			demo.RegisterTypes(server.Registry)
+			client := testClient(t, server)
 
 			resources := make([]*pbresource.Resource, 10)
 			for i := 0; i < len(resources); i++ {
@@ -159,57 +116,17 @@ func TestList_Many(t *testing.T) {
 	}
 }
 
-func TestList_NamePrefix(t *testing.T) {
-	for desc, tc := range listTestCases() {
-		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			expectedResources := []*pbresource.Resource{}
-
-			namePrefixIndex := 0
-			// create a name prefix that is always present
-			namePrefix := fmt.Sprintf("%s-", strconv.Itoa(namePrefixIndex))
-			for i := 0; i < 10; i++ {
-				artist, err := demo.GenerateV2Artist()
-				require.NoError(t, err)
-
-				// Prevent test flakes if the generated names collide.
-				artist.Id.Name = fmt.Sprintf("%d-%s", i, artist.Id.Name)
-
-				rsp, err := client.Write(tc.ctx, &pbresource.WriteRequest{Resource: artist})
-				require.NoError(t, err)
-
-				// only matching name prefix are expected
-				if i == namePrefixIndex {
-					expectedResources = append(expectedResources, rsp.Resource)
-				}
-			}
-
-			rsp, err := client.List(tc.ctx, &pbresource.ListRequest{
-				Type:       demo.TypeV2Artist,
-				Tenancy:    resource.DefaultNamespacedTenancy(),
-				NamePrefix: namePrefix,
-			})
-
-			require.NoError(t, err)
-			prototest.AssertElementsMatch(t, expectedResources, 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) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			demo.RegisterTypes(server.Registry)
+			client := testClient(t, server)
 
 			// Write partition scoped record label
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LooneyTunes")
 			require.NoError(t, err)
 			recordLabelRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: recordLabel})
 			require.NoError(t, err)
@@ -233,20 +150,21 @@ func TestList_Tenancy_Defaults_And_Normalization(t *testing.T) {
 				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) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			demo.RegisterTypes(server.Registry)
+			client := testClient(t, server)
 
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
 
-			_, err = client.Write(tc.ctx, &pbresource.WriteRequest{Resource: artist})
+			_, err = server.Backend.WriteCAS(tc.ctx, artist)
 			require.NoError(t, err)
 
 			rsp, err := client.List(tc.ctx, &pbresource.ListRequest{
@@ -264,7 +182,7 @@ 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 := svc.NewMockBackend(t)
+			mockBackend := NewMockBackend(t)
 			server := testServer(t)
 			server.Backend = mockBackend
 			demo.RegisterTypes(server.Registry)
@@ -325,24 +243,25 @@ func TestList_ACL_ListAllowed_ReadAllowed(t *testing.T) {
 	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)
-	builder := svctest.NewResourceServiceBuilder().WithRegisterFns(demo.RegisterTypes)
-	client := builder.Run(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)
 
-	rsp1, err := client.Write(ctx, &pbresource.WriteRequest{Resource: artist})
+	artist, err = server.Backend.WriteCAS(ctx, artist)
 	require.NoError(t, err)
 
-	// Put ACLResolver in place after above writes so writes not subject to ACLs
-	mockACLResolver := &svc.MockACLResolver{}
-	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
-		Return(authz, nil)
-	builder.ServiceImpl().Config.ACLResolver = mockACLResolver
-
-	rsp2, err := client.List(
+	rsp, err := client.List(
 		ctx,
 		&pbresource.ListRequest{
 			Type:       artist.Id.Type,
@@ -350,7 +269,8 @@ func roundTripList(t *testing.T, authz acl.Authorizer) (*pbresource.Resource, *p
 			NamePrefix: "",
 		},
 	)
-	return rsp1.Resource, rsp2, err
+
+	return artist, rsp, err
 }
 
 type listTestCase struct {
diff --git a/agent/grpc-external/services/resource/read.go b/agent/grpc-external/services/resource/read.go
index 9fe59024ce8e6..b6cec37254566 100644
--- a/agent/grpc-external/services/resource/read.go
+++ b/agent/grpc-external/services/resource/read.go
@@ -18,7 +18,7 @@ import (
 
 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.ensureReadRequestValid(req)
+	reg, err := s.validateReadRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -59,8 +59,8 @@ func (s *Server) Read(ctx context.Context, req *pbresource.ReadRequest) (*pbreso
 		return nil, status.Errorf(codes.Internal, "failed read acl: %v", err)
 	}
 
-	// Check tenancy exists for the V2 resource.
-	if err = tenancyExists(reg, s.TenancyBridge, req.Id.Tenancy, codes.NotFound); err != nil {
+	// Check V1 tenancy exists for the V2 resource.
+	if err = v1TenancyExists(reg, s.TenancyBridge, req.Id.Tenancy, codes.NotFound); err != nil {
 		return nil, err
 	}
 
@@ -87,7 +87,7 @@ func (s *Server) Read(ctx context.Context, req *pbresource.ReadRequest) (*pbreso
 	return &pbresource.ReadResponse{Resource: resource}, nil
 }
 
-func (s *Server) ensureReadRequestValid(req *pbresource.ReadRequest) (*resource.Registration, error) {
+func (s *Server) validateReadRequest(req *pbresource.ReadRequest) (*resource.Registration, error) {
 	if req.Id == nil {
 		return nil, status.Errorf(codes.InvalidArgument, "id is required")
 	}
@@ -102,14 +102,32 @@ func (s *Server) ensureReadRequestValid(req *pbresource.ReadRequest) (*resource.
 		return nil, err
 	}
 
-	if err = checkV2Tenancy(s.UseV2Tenancy, req.Id.Type); err != nil {
-		return nil, err
-	}
-
 	// Check scope
-	if err = validateScopedTenancy(reg.Scope, req.Id.Type, req.Id.Tenancy); err != nil {
-		return nil, err
+	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
index b7367e6390319..2601689bc6c4b 100644
--- a/agent/grpc-external/services/resource/read_test.go
+++ b/agent/grpc-external/services/resource/read_test.go
@@ -1,12 +1,11 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+package resource
 
 import (
 	"context"
 	"fmt"
-	"strings"
 	"sync"
 	"testing"
 
@@ -19,138 +18,68 @@ import (
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
 	"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"
 )
 
-// TODO: Update all tests to use true/false table test for v2tenancy
-
 func TestRead_InputValidation(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
-
-	type testCase struct {
-		modFn       func(artistId, recordlabelId, executiveId *pbresource.ID) *pbresource.ID
-		errContains string
-	}
-
-	testCases := map[string]testCase{
-		"no id": {
-			modFn: func(_, _, _ *pbresource.ID) *pbresource.ID {
-				return nil
-			},
-			errContains: "id is required",
-		},
-		"no type": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Type = nil
-				return artistId
-			},
-			errContains: "id.type is required",
-		},
-		"no name": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = ""
-				return artistId
-			},
-			errContains: "id.name invalid",
-		},
-		"name is mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = "MixedCaseNotAllowed"
-				return artistId
-			},
-			errContains: "id.name invalid",
-		},
-		"name too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Name = strings.Repeat("a", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "id.name invalid",
-		},
-		"partition is mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Partition = "Default"
-				return artistId
-			},
-			errContains: "id.tenancy.partition invalid",
-		},
-		"partition too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "id.tenancy.partition invalid",
-		},
-		"namespace is mixed case": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Namespace = "Default"
-				return artistId
-			},
-			errContains: "id.tenancy.namespace invalid",
+	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
 		},
-		"namespace too long": {
-			modFn: func(artistId, _, _ *pbresource.ID) *pbresource.ID {
-				artistId.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-				return artistId
-			},
-			errContains: "id.tenancy.namespace invalid",
+		"no name": func(artistId, _, _ *pbresource.ID) *pbresource.ID {
+			artistId.Name = ""
+			return artistId
 		},
-		"partition scope with non-empty namespace": {
-			modFn: func(_, recordLabelId, _ *pbresource.ID) *pbresource.ID {
-				recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
-				return recordLabelId
-			},
-			errContains: "cannot have a namespace",
+		"partition scope with non-empty namespace": func(_, recordLabelId, _ *pbresource.ID) *pbresource.ID {
+			recordLabelId.Tenancy.Namespace = "ishouldnothaveanamespace"
+			return recordLabelId
 		},
-		"cluster scope with non-empty partition": {
-			modFn: func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-				executiveId.Tenancy = &pbresource.Tenancy{Partition: resource.DefaultPartitionName}
-				return executiveId
-			},
-			errContains: "cannot have a partition",
+		"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": {
-			modFn: func(_, _, executiveId *pbresource.ID) *pbresource.ID {
-				executiveId.Tenancy = &pbresource.Tenancy{Namespace: resource.DefaultNamespaceName}
-				return executiveId
-			},
-			errContains: "cannot have a namespace",
+		"cluster scope with non-empty namespace": func(_, _, executiveId *pbresource.ID) *pbresource.ID {
+			executiveId.Tenancy = &pbresource.Tenancy{Namespace: resource.DefaultNamespaceName}
+			return executiveId
 		},
 	}
-	for desc, tc := range testCases {
+	for desc, modFn := range testCases {
 		t.Run(desc, func(t *testing.T) {
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
 
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 			require.NoError(t, err)
 
-			executive, err := demo.GenerateV1Executive("music-man", "CEO")
+			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: tc.modFn(artist.Id, recordLabel.Id, executive.Id)}
+			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())
-			require.ErrorContains(t, err, tc.errContains)
 		})
 	}
 }
 
 func TestRead_TypeNotFound(t *testing.T) {
-	server := svc.NewServer(svc.Config{Registry: resource.NewRegistry()})
+	server := NewServer(Config{Registry: resource.NewRegistry()})
 	client := testClient(t, server)
 
 	artist, err := demo.GenerateV2Artist()
@@ -165,65 +94,48 @@ func TestRead_TypeNotFound(t *testing.T) {
 func TestRead_ResourceNotFound(t *testing.T) {
 	for desc, tc := range readTestCases() {
 		t.Run(desc, func(t *testing.T) {
-			type tenancyCase struct {
-				modFn       func(artistId, recordlabelId *pbresource.ID) *pbresource.ID
-				errContains string
-			}
-			tenancyCases := map[string]tenancyCase{
-				"resource not found by name": {
-					modFn: func(artistId, _ *pbresource.ID) *pbresource.ID {
-						artistId.Name = "bogusname"
-						return artistId
-					},
-					errContains: "resource not found",
+			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": {
-					modFn: func(artistId, _ *pbresource.ID) *pbresource.ID {
-						id := clone(artistId)
-						id.Tenancy.Partition = "boguspartition"
-						return id
-					},
-					errContains: "partition not found",
+				"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": {
-					modFn: func(artistId, _ *pbresource.ID) *pbresource.ID {
-						id := clone(artistId)
-						id.Tenancy.Namespace = "bogusnamespace"
-						return id
-					},
-					errContains: "namespace not found",
+				"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": {
-					modFn: func(_, recordLabelId *pbresource.ID) *pbresource.ID {
-						id := clone(recordLabelId)
-						id.Tenancy.Partition = "boguspartition"
-						return id
-					},
-					errContains: "partition not found",
+				"partition not found when partition scoped": func(_, recordLabelId *pbresource.ID) *pbresource.ID {
+					id := clone(recordLabelId)
+					id.Tenancy.Partition = "boguspartition"
+					return id
 				},
 			}
-			for tenancyDesc, tenancyCase := range tenancyCases {
+			for tenancyDesc, modFn := range tenancyCases {
 				t.Run(tenancyDesc, func(t *testing.T) {
-					client := svctest.NewResourceServiceBuilder().
-						WithV2Tenancy(true).
-						WithRegisterFns(demo.RegisterTypes).
-						Run(t)
+					server := testServer(t)
+					demo.RegisterTypes(server.Registry)
+					client := testClient(t, server)
 
-					recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+					recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 					require.NoError(t, err)
-					_, err = client.Write(context.Background(), &pbresource.WriteRequest{Resource: recordLabel})
+					recordLabel, err = server.Backend.WriteCAS(tc.ctx, recordLabel)
 					require.NoError(t, err)
 
 					artist, err := demo.GenerateV2Artist()
 					require.NoError(t, err)
-					_, err = client.Write(context.Background(), &pbresource.WriteRequest{Resource: artist})
+					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: tenancyCase.modFn(artist.Id, recordLabel.Id)})
+					_, 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.ErrorContains(t, err, tenancyCase.errContains)
+					require.Contains(t, err.Error(), "resource not found")
 				})
 			}
 		})
@@ -233,14 +145,15 @@ func TestRead_ResourceNotFound(t *testing.T) {
 func TestRead_GroupVersionMismatch(t *testing.T) {
 	for desc, tc := range readTestCases() {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+
+			demo.RegisterTypes(server.Registry)
+			client := testClient(t, server)
 
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
 
-			_, err = client.Write(tc.ctx, &pbresource.WriteRequest{Resource: artist})
+			_, err = server.Backend.WriteCAS(tc.ctx, artist)
 			require.NoError(t, err)
 
 			id := clone(artist.Id)
@@ -259,20 +172,18 @@ func TestRead_Success(t *testing.T) {
 		t.Run(desc, func(t *testing.T) {
 			for tenancyDesc, modFn := range tenancyCases() {
 				t.Run(tenancyDesc, func(t *testing.T) {
-					client := svctest.NewResourceServiceBuilder().
-						WithRegisterFns(demo.RegisterTypes).
-						Run(t)
+					server := testServer(t)
+					demo.RegisterTypes(server.Registry)
+					client := testClient(t, server)
 
-					recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+					recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 					require.NoError(t, err)
-					rsp1, err := client.Write(tc.ctx, &pbresource.WriteRequest{Resource: recordLabel})
-					recordLabel = rsp1.Resource
+					recordLabel, err = server.Backend.WriteCAS(tc.ctx, recordLabel)
 					require.NoError(t, err)
 
 					artist, err := demo.GenerateV2Artist()
 					require.NoError(t, err)
-					rsp2, err := client.Write(tc.ctx, &pbresource.WriteRequest{Resource: artist})
-					artist = rsp2.Resource
+					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.
@@ -299,7 +210,7 @@ func TestRead_VerifyReadConsistencyArg(t *testing.T) {
 	for desc, tc := range readTestCases() {
 		t.Run(desc, func(t *testing.T) {
 			server := testServer(t)
-			mockBackend := svc.NewMockBackend(t)
+			mockBackend := NewMockBackend(t)
 			server.Backend = mockBackend
 			demo.RegisterTypes(server.Registry)
 
@@ -368,14 +279,15 @@ func TestRead_ACLs(t *testing.T) {
 
 	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
 
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				WithACLResolver(dr).
-				Run(t)
+			demo.RegisterTypes(server.Registry)
 
 			dr.SetResult(tc.authz)
 			testutil.RunStep(t, "does not exist", func(t *testing.T) {
@@ -413,7 +325,7 @@ type dummyACLResolver struct {
 	result resolver.Result
 }
 
-var _ svc.ACLResolver = (*dummyACLResolver)(nil)
+var _ ACLResolver = (*dummyACLResolver)(nil)
 
 func (r *dummyACLResolver) SetResult(result resolver.Result) {
 	r.lock.Lock()
diff --git a/agent/grpc-external/services/resource/server.go b/agent/grpc-external/services/resource/server.go
index b07ebaff38b98..5fc5a01fafd77 100644
--- a/agent/grpc-external/services/resource/server.go
+++ b/agent/grpc-external/services/resource/server.go
@@ -5,16 +5,14 @@ package resource
 
 import (
 	"context"
-	"strings"
 
+	"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/go-hclog"
-
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/acl/resolver"
 	"github.com/hashicorp/consul/internal/resource"
@@ -36,11 +34,6 @@ type Config struct {
 	// TenancyBridge temporarily allows us to use V1 implementations of
 	// partitions and namespaces until V2 implementations are available.
 	TenancyBridge TenancyBridge
-
-	// UseV2Tenancy is true if the "v2tenancy" experiement is active, false otherwise.
-	// Attempts to create v2 tenancy resources (partition or namespace) will fail when the
-	// flag is false.
-	UseV2Tenancy bool
 }
 
 //go:generate mockery --name Registry --inpackage
@@ -136,12 +129,16 @@ func isGRPCStatusError(err error) bool {
 }
 
 func validateId(id *pbresource.ID, errorPrefix string) error {
-	if id.Type == nil {
-		return status.Errorf(codes.InvalidArgument, "%s.type is required", errorPrefix)
+	var field string
+	switch {
+	case id.Type == nil:
+		field = "type"
+	case id.Name == "":
+		field = "name"
 	}
 
-	if err := resource.ValidateName(id.Name); err != nil {
-		return status.Errorf(codes.InvalidArgument, "%s.name invalid: %v", errorPrefix, err)
+	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
@@ -155,145 +152,57 @@ func validateId(id *pbresource.ID, errorPrefix string) error {
 		}
 	}
 
-	if id.Tenancy.Partition != "" {
-		if err := resource.ValidateName(id.Tenancy.Partition); err != nil {
-			return status.Errorf(codes.InvalidArgument, "%s.tenancy.partition invalid: %v", errorPrefix, err)
-		}
-	}
-	if id.Tenancy.Namespace != "" {
-		if err := resource.ValidateName(id.Tenancy.Namespace); err != nil {
-			return status.Errorf(codes.InvalidArgument, "%s.tenancy.namespace invalid: %v", errorPrefix, err)
-		}
-	}
-	// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-	if id.Tenancy.PeerName == "" {
-		id.Tenancy.PeerName = resource.DefaultPeerName
-	}
+	resource.Normalize(id.Tenancy)
 
 	return nil
 }
 
-func validateRef(ref *pbresource.Reference, errorPrefix string) error {
-	if ref.Type == nil {
-		return status.Errorf(codes.InvalidArgument, "%s.type is required", errorPrefix)
-	}
-	if err := resource.ValidateName(ref.Name); err != nil {
-		return status.Errorf(codes.InvalidArgument, "%s.name invalid: %v", errorPrefix, err)
-	}
-	if err := resource.ValidateName(ref.Tenancy.Partition); err != nil {
-		return status.Errorf(codes.InvalidArgument, "%s.tenancy.partition invalid: %v", errorPrefix, err)
-	}
-	if err := resource.ValidateName(ref.Tenancy.Namespace); err != nil {
-		return status.Errorf(codes.InvalidArgument, "%s.tenancy.namespace invalid: %v", errorPrefix, err)
-	}
-	return nil
-}
-
-func validateWildcardTenancy(tenancy *pbresource.Tenancy, namePrefix string) error {
-	// Partition has to be a valid name if not wildcard or empty
-	if tenancy.Partition != "" && tenancy.Partition != "*" {
-		if err := resource.ValidateName(tenancy.Partition); err != nil {
-			return status.Errorf(codes.InvalidArgument, "tenancy.partition invalid: %v", err)
-		}
-	}
-
-	// Namespace has to be a valid name if not wildcard or empty
-	if tenancy.Namespace != "" && tenancy.Namespace != "*" {
-		if err := resource.ValidateName(tenancy.Namespace); err != nil {
-			return status.Errorf(codes.InvalidArgument, "tenancy.namespace invalid: %v", err)
-		}
-	}
-
-	// Not doing a strict resource name validation here because the prefix can be
-	// something like "foo-" which is a valid prefix but not valid resource name.
-	// relax validation to just check for lowercasing
-	if namePrefix != strings.ToLower(namePrefix) {
-		return status.Errorf(codes.InvalidArgument, "name_prefix invalid: must be lowercase alphanumeric, got: %v", namePrefix)
-	}
-
-	// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-	if tenancy.PeerName == "" {
-		tenancy.PeerName = resource.DefaultPeerName
-	}
-
-	return nil
-}
-
-// tenancyExists return an error with the passed in gRPC status code when tenancy partition or namespace do not exist.
-func tenancyExists(reg *resource.Registration, tenancyBridge TenancyBridge, tenancy *pbresource.Tenancy, errCode codes.Code) error {
+// 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 := tenancyBridge.PartitionExists(tenancy.Partition)
+		exists, err := v1Bridge.PartitionExists(tenancy.Partition)
 		switch {
 		case err != nil:
 			return err
 		case !exists:
-			return status.Errorf(errCode, "partition not found: %v", tenancy.Partition)
+			return status.Errorf(errCode, "partition resource not found: %v", tenancy.Partition)
 		}
 	}
 
 	if reg.Scope == resource.ScopeNamespace {
-		exists, err := tenancyBridge.NamespaceExists(tenancy.Partition, tenancy.Namespace)
+		exists, err := v1Bridge.NamespaceExists(tenancy.Partition, tenancy.Namespace)
 		switch {
 		case err != nil:
 			return err
 		case !exists:
-			return status.Errorf(errCode, "namespace not found: %v", tenancy.Namespace)
-		}
-	}
-	return nil
-}
-
-func validateScopedTenancy(scope resource.Scope, resourceType *pbresource.Type, tenancy *pbresource.Tenancy) error {
-	if scope == resource.ScopePartition && tenancy.Namespace != "" {
-		return status.Errorf(
-			codes.InvalidArgument,
-			"partition scoped resource %s cannot have a namespace. got: %s",
-			resource.ToGVK(resourceType),
-			tenancy.Namespace,
-		)
-	}
-	if scope == resource.ScopeCluster {
-		if tenancy.Partition != "" {
-			return status.Errorf(
-				codes.InvalidArgument,
-				"cluster scoped resource %s cannot have a partition: %s",
-				resource.ToGVK(resourceType),
-				tenancy.Partition,
-			)
-		}
-		if tenancy.Namespace != "" {
-			return status.Errorf(
-				codes.InvalidArgument,
-				"cluster scoped resource %s cannot have a namespace: %s",
-				resource.ToGVK(resourceType),
-				tenancy.Namespace,
-			)
+			return status.Errorf(errCode, "namespace resource not found: %v", tenancy.Namespace)
 		}
 	}
 	return nil
 }
 
-func isTenancyMarkedForDeletion(reg *resource.Registration, tenancyBridge TenancyBridge, tenancy *pbresource.Tenancy) (bool, error) {
+// 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 := tenancyBridge.IsPartitionMarkedForDeletion(tenancy.Partition)
-		if err != nil {
-			return false, err
-		}
-		if marked {
-			return marked, nil
+		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 := tenancyBridge.IsNamespaceMarkedForDeletion(tenancy.Partition, tenancy.Namespace)
-		if err != nil {
-			return false, err
+		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 marked, nil
 	}
-
-	// Cluster scope has no tenancy so always return false
-	return false, nil
+	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
index 2e3f792fe1d10..bc48194574131 100644
--- a/agent/grpc-external/services/resource/server_ce.go
+++ b/agent/grpc-external/services/resource/server_ce.go
@@ -6,13 +6,9 @@
 package resource
 
 import (
-	"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"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
 )
 
 func v2TenancyToV1EntMeta(tenancy *pbresource.Tenancy) *acl.EnterpriseMeta {
@@ -28,12 +24,3 @@ func v1EntMetaToV2Tenancy(reg *resource.Registration, entMeta *acl.EnterpriseMet
 		tenancy.Namespace = entMeta.NamespaceOrDefault()
 	}
 }
-
-// checkV2Tenancy returns FailedPrecondition error for namespace resource type
-// when the "v2tenancy" feature flag is not enabled.
-func checkV2Tenancy(useV2Tenancy bool, rtype *pbresource.Type) error {
-	if resource.EqualType(rtype, pbtenancy.NamespaceType) && !useV2Tenancy {
-		return status.Errorf(codes.FailedPrecondition, "use of the v2 namespace resource requires the \"v2tenancy\" feature flag")
-	}
-	return nil
-}
diff --git a/agent/grpc-external/services/resource/server_ce_test.go b/agent/grpc-external/services/resource/server_ce_test.go
index f48ff3b52b992..c385b65f3ceb4 100644
--- a/agent/grpc-external/services/resource/server_ce_test.go
+++ b/agent/grpc-external/services/resource/server_ce_test.go
@@ -3,7 +3,7 @@
 
 //go:build !consulent
 
-package resource_test
+package resource
 
 import "github.com/hashicorp/consul/acl"
 
diff --git a/agent/grpc-external/services/resource/server_test.go b/agent/grpc-external/services/resource/server_test.go
index 6abb4564d8d0f..99add64971218 100644
--- a/agent/grpc-external/services/resource/server_test.go
+++ b/agent/grpc-external/services/resource/server_test.go
@@ -1,24 +1,23 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+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/proto"
 	"google.golang.org/protobuf/types/known/anypb"
 
 	"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"
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/internal/resource"
@@ -53,8 +52,7 @@ func AuthorizerFrom(t *testing.T, policyStrs ...string) resolver.Result {
 	}
 }
 
-// Deprecated: use NewResourceServiceBuilder instead
-func testServer(t *testing.T) *svc.Server {
+func testServer(t *testing.T) *Server {
 	t.Helper()
 
 	backend, err := inmem.NewBackend()
@@ -62,7 +60,7 @@ func testServer(t *testing.T) *svc.Server {
 	go backend.Run(testContext(t))
 
 	// Mock the ACL Resolver to "allow all" for testing.
-	mockACLResolver := &svc.MockACLResolver{}
+	mockACLResolver := &MockACLResolver{}
 	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
 		Return(testutils.ACLsDisabled(t), nil).
 		Run(func(args mock.Arguments) {
@@ -78,8 +76,8 @@ func testServer(t *testing.T) *svc.Server {
 			}
 		})
 
-	// Mock the tenancy bridge since we can't use the real thing.
-	mockTenancyBridge := &svc.MockTenancyBridge{}
+	// 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)
@@ -87,7 +85,7 @@ func testServer(t *testing.T) *svc.Server {
 	mockTenancyBridge.On("IsPartitionMarkedForDeletion", resource.DefaultPartitionName).Return(false, nil)
 	mockTenancyBridge.On("IsNamespaceMarkedForDeletion", resource.DefaultPartitionName, resource.DefaultNamespaceName).Return(false, nil)
 
-	return svc.NewServer(svc.Config{
+	return NewServer(Config{
 		Logger:        testutil.Logger(t),
 		Registry:      resource.NewRegistry(),
 		Backend:       backend,
@@ -96,8 +94,7 @@ func testServer(t *testing.T) *svc.Server {
 	})
 }
 
-// Deprecated: use NewResourceServiceBuilder instead
-func testClient(t *testing.T, server *svc.Server) pbresource.ResourceServiceClient {
+func testClient(t *testing.T, server *Server) pbresource.ResourceServiceClient {
 	t.Helper()
 
 	addr := testutils.RunTestServer(t, server)
@@ -161,20 +158,19 @@ func wildcardTenancyCases() map[string]struct {
 				PeerName:  "local",
 			},
 		},
-		// TODO(spatel): NET-5475 - Remove as part of peer_name moving to PeerTenancy
-		"namespaced type with empty peername": {
+		"namespaced type with empty partition and namespace": {
 			typ: demo.TypeV2Artist,
 			tenancy: &pbresource.Tenancy{
-				Partition: resource.DefaultPartitionName,
-				Namespace: resource.DefaultNamespaceName,
-				PeerName:  "",
+				Partition: "",
+				Namespace: "",
+				PeerName:  "local",
 			},
 		},
-		"namespaced type with empty partition and namespace": {
+		"namespaced type with uppercase partition and namespace": {
 			typ: demo.TypeV2Artist,
 			tenancy: &pbresource.Tenancy{
-				Partition: "",
-				Namespace: "",
+				Partition: "DEFAULT",
+				Namespace: "DEFAULT",
 				PeerName:  "local",
 			},
 		},
@@ -202,6 +198,14 @@ func wildcardTenancyCases() map[string]struct {
 				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{
@@ -220,6 +224,12 @@ func tenancyCases() map[string]func(artistId, recordlabelId *pbresource.ID) *pbr
 		"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 = ""
@@ -244,6 +254,11 @@ func tenancyCases() map[string]func(artistId, recordlabelId *pbresource.ID) *pbr
 		"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 = ""
@@ -257,5 +272,3 @@ func tenancyCases() map[string]func(artistId, recordlabelId *pbresource.ID) *pbr
 	}
 	return tenancyCases
 }
-
-func clone[T proto.Message](v T) T { return proto.Clone(v).(T) }
diff --git a/agent/grpc-external/services/resource/testing/builder.go b/agent/grpc-external/services/resource/testing/builder.go
deleted file mode 100644
index 96c8379c0eae2..0000000000000
--- a/agent/grpc-external/services/resource/testing/builder.go
+++ /dev/null
@@ -1,201 +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/consul/acl"
-	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/internal/resource"
-	"github.com/hashicorp/consul/internal/storage/inmem"
-	"github.com/hashicorp/consul/internal/tenancy"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-)
-
-type builder struct {
-	registry     resource.Registry
-	registerFns  []func(resource.Registry)
-	useV2Tenancy bool
-	tenancies    []*pbresource.Tenancy
-	aclResolver  svc.ACLResolver
-	serviceImpl  *svc.Server
-}
-
-// NewResourceServiceBuilder is the preferred way to configure and run
-// an isolated in-process instance of the resource service for unit
-// testing. The final call to `Run()` returns a client you can use for
-// making requests.
-func NewResourceServiceBuilder() *builder {
-	b := &builder{
-		useV2Tenancy: false,
-		registry:     resource.NewRegistry(),
-		// Regardless of whether using mock of v2tenancy, always make sure
-		// the builtin tenancy exists.
-		tenancies: []*pbresource.Tenancy{resource.DefaultNamespacedTenancy()},
-	}
-	return b
-}
-
-// WithV2Tenancy configures which tenancy bridge is used.
-//
-// true  => real v2 default partition and namespace via v2 tenancy bridge
-// false => mock default partition and namespace since v1 tenancy bridge can't be used (not spinning up an entire server here)
-func (b *builder) WithV2Tenancy(useV2Tenancy bool) *builder {
-	b.useV2Tenancy = useV2Tenancy
-	return b
-}
-
-// Registry provides access to the constructed registry post-Run() when
-// needed by other test dependencies.
-func (b *builder) Registry() resource.Registry {
-	return b.registry
-}
-
-// ServiceImpl provides access to the actual server side implemenation of the resource service. This should never be used
-// used/accessed without good reason. The current justifying use case is to monkeypatch the ACL resolver post-creation
-// to allow unfettered writes which some ACL related tests require to put test data in place.
-func (b *builder) ServiceImpl() *svc.Server {
-	return b.serviceImpl
-}
-
-func (b *builder) WithRegisterFns(registerFns ...func(resource.Registry)) *builder {
-	for _, registerFn := range registerFns {
-		b.registerFns = append(b.registerFns, registerFn)
-	}
-	return b
-}
-
-func (b *builder) WithACLResolver(aclResolver svc.ACLResolver) *builder {
-	b.aclResolver = aclResolver
-	return b
-}
-
-// WithTenancies adds additional partitions and namespaces if default/default
-// is not sufficient.
-func (b *builder) WithTenancies(tenancies ...*pbresource.Tenancy) *builder {
-	for _, tenancy := range tenancies {
-		b.tenancies = append(b.tenancies, tenancy)
-	}
-	return b
-}
-
-// Run starts the resource service and returns a client.
-func (b *builder) Run(t *testing.T) pbresource.ResourceServiceClient {
-	// backend cannot be customized
-	backend, err := inmem.NewBackend()
-	require.NoError(t, err)
-
-	// start the backend and add teardown hook
-	ctx, cancel := context.WithCancel(context.Background())
-	t.Cleanup(cancel)
-	go backend.Run(ctx)
-
-	// Automatically add tenancy types if v2 tenancy enabled
-	if b.useV2Tenancy {
-		b.registerFns = append(b.registerFns, tenancy.RegisterTypes)
-	}
-
-	for _, registerFn := range b.registerFns {
-		registerFn(b.registry)
-	}
-
-	var tenancyBridge resource.TenancyBridge
-	if !b.useV2Tenancy {
-		// use mock tenancy bridge. default/default has already been added out of the box
-		mockTenancyBridge := &svc.MockTenancyBridge{}
-
-		for _, tenancy := range b.tenancies {
-			mockTenancyBridge.On("PartitionExists", tenancy.Partition).Return(true, nil)
-			mockTenancyBridge.On("NamespaceExists", tenancy.Partition, tenancy.Namespace).Return(true, nil)
-			mockTenancyBridge.On("IsPartitionMarkedForDeletion", tenancy.Partition).Return(false, nil)
-			mockTenancyBridge.On("IsNamespaceMarkedForDeletion", tenancy.Partition, tenancy.Namespace).Return(false, nil)
-		}
-
-		tenancyBridge = mockTenancyBridge
-	} else {
-		// use v2 tenancy bridge. population comes later after client injected.
-		tenancyBridge = tenancy.NewV2TenancyBridge()
-	}
-
-	if b.aclResolver == nil {
-		// When not provided (regardless of V1 tenancy or V2 tenancy), configure an ACL resolver
-		// that has ACLs disabled and fills in "default" for the 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)
-				}
-			})
-		b.aclResolver = mockACLResolver
-	}
-
-	config := svc.Config{
-		Logger:        testutil.Logger(t),
-		Registry:      b.registry,
-		Backend:       backend,
-		ACLResolver:   b.aclResolver,
-		TenancyBridge: tenancyBridge,
-		UseV2Tenancy:  b.useV2Tenancy,
-	}
-
-	server := grpc.NewServer()
-
-	b.serviceImpl = svc.NewServer(config)
-	b.serviceImpl.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() })
-
-	client := pbresource.NewResourceServiceClient(conn)
-
-	// HACK ALERT: The client needs to be injected into the V2TenancyBridge
-	// after it has been created due the the circular dependency. This will
-	// go away when the tenancy bridge is removed and V1 is no more, however
-	// long that takes.
-	switch config.TenancyBridge.(type) {
-	case *tenancy.V2TenancyBridge:
-		config.TenancyBridge.(*tenancy.V2TenancyBridge).WithClient(client)
-		// Default partition namespace can finally be created
-		require.NoError(t, initTenancy(ctx, backend))
-
-		for _, tenancy := range b.tenancies {
-			if tenancy.Partition == resource.DefaultPartitionName && tenancy.Namespace == resource.DefaultNamespaceName {
-				continue
-			}
-			t.Fatalf("TODO: implement creation of passed in v2 tenancy: %v", tenancy)
-		}
-	}
-	return client
-}
diff --git a/agent/grpc-external/services/resource/testing/testing.go b/agent/grpc-external/services/resource/testing/testing.go
index 906953b034af1..2375ae95b8894 100644
--- a/agent/grpc-external/services/resource/testing/testing.go
+++ b/agent/grpc-external/services/resource/testing/testing.go
@@ -4,15 +4,26 @@
 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 {
@@ -38,3 +49,97 @@ func AuthorizerFrom(t *testing.T, policyStrs ...string) resolver.Result {
 		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("PartitionExists", "foo").Return(true, nil)
+		mockTenancyBridge.On("NamespaceExists", resource.DefaultPartitionName, resource.DefaultNamespaceName).Return(true, nil)
+		mockTenancyBridge.On("IsPartitionMarkedForDeletion", resource.DefaultPartitionName).Return(false, nil)
+		mockTenancyBridge.On("IsPartitionMarkedForDeletion", "foo").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
index 8042eba55096b..023fa5189cccc 100644
--- a/agent/grpc-external/services/resource/testing/testing_ce.go
+++ b/agent/grpc-external/services/resource/testing/testing_ce.go
@@ -6,19 +6,7 @@
 package testing
 
 import (
-	"context"
-	"errors"
-	"time"
-
-	"github.com/oklog/ulid/v2"
-	"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/internal/storage/inmem"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
 )
 
 func FillEntMeta(entMeta *acl.EnterpriseMeta) {
@@ -28,35 +16,3 @@ func FillEntMeta(entMeta *acl.EnterpriseMeta) {
 func FillAuthorizerContext(authzContext *acl.AuthorizerContext) {
 	// nothing to to in CE.
 }
-
-// initTenancy create the base tenancy objects (default/default)
-func initTenancy(ctx context.Context, b *inmem.Backend) error {
-	nsData, err := anypb.New(&pbtenancy.Namespace{Description: "default namespace in default partition"})
-	if err != nil {
-		return err
-	}
-	nsID := &pbresource.ID{
-		Type:    pbtenancy.NamespaceType,
-		Name:    resource.DefaultNamespaceName,
-		Tenancy: resource.DefaultPartitionedTenancy(),
-		Uid:     ulid.Make().String(),
-	}
-	read, err := b.Read(ctx, storage.StrongConsistency, nsID)
-	if err != nil && !errors.Is(err, storage.ErrNotFound) {
-		return err
-	}
-	if read == nil && errors.Is(err, storage.ErrNotFound) {
-		_, err = b.WriteCAS(ctx, &pbresource.Resource{
-			Id:         nsID,
-			Generation: ulid.Make().String(),
-			Data:       nsData,
-			Metadata: map[string]string{
-				"generated_at": time.Now().Format(time.RFC3339),
-			},
-		})
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/agent/grpc-external/services/resource/watch.go b/agent/grpc-external/services/resource/watch.go
index adabb3d256ee0..f20d3f00f875a 100644
--- a/agent/grpc-external/services/resource/watch.go
+++ b/agent/grpc-external/services/resource/watch.go
@@ -16,7 +16,7 @@ import (
 )
 
 func (s *Server) WatchList(req *pbresource.WatchListRequest, stream pbresource.ResourceService_WatchListServer) error {
-	reg, err := s.ensureWatchListRequestValid(req)
+	reg, err := s.validateWatchListRequest(req)
 	if err != nil {
 		return err
 	}
@@ -91,9 +91,17 @@ func (s *Server) WatchList(req *pbresource.WatchListRequest, stream pbresource.R
 	}
 }
 
-func (s *Server) ensureWatchListRequestValid(req *pbresource.WatchListRequest) (*resource.Registration, error) {
-	if req.Type == nil {
-		return nil, status.Errorf(codes.InvalidArgument, "type is required")
+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.
@@ -102,46 +110,18 @@ func (s *Server) ensureWatchListRequestValid(req *pbresource.WatchListRequest) (
 		return nil, err
 	}
 
-	// if no tenancy is passed defaults to wildcard
-	if req.Tenancy == nil {
-		req.Tenancy = wildcardTenancyFor(reg.Scope)
-	}
-
-	if err = checkV2Tenancy(s.UseV2Tenancy, req.Type); err != nil {
-		return nil, err
-	}
-
-	if err := validateWildcardTenancy(req.Tenancy, req.NamePrefix); err != nil {
-		return nil, err
-	}
-
-	// Check scope
-	if err = validateScopedTenancy(reg.Scope, req.Type, req.Tenancy); 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
 }
-
-func wildcardTenancyFor(scope resource.Scope) *pbresource.Tenancy {
-	var defaultTenancy *pbresource.Tenancy
-
-	switch scope {
-	case resource.ScopeCluster:
-		defaultTenancy = &pbresource.Tenancy{
-			PeerName: storage.Wildcard,
-		}
-	case resource.ScopePartition:
-		defaultTenancy = &pbresource.Tenancy{
-			Partition: storage.Wildcard,
-			PeerName:  storage.Wildcard,
-		}
-	default:
-		defaultTenancy = &pbresource.Tenancy{
-			Partition: storage.Wildcard,
-			PeerName:  storage.Wildcard,
-			Namespace: storage.Wildcard,
-		}
-	}
-	return defaultTenancy
-}
diff --git a/agent/grpc-external/services/resource/watch_test.go b/agent/grpc-external/services/resource/watch_test.go
index 2c596e01b383d..051264441bbc8 100644
--- a/agent/grpc-external/services/resource/watch_test.go
+++ b/agent/grpc-external/services/resource/watch_test.go
@@ -1,102 +1,50 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+package resource
 
 import (
 	"context"
 	"errors"
 	"io"
-	"strings"
 	"testing"
 	"time"
 
-	"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"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
 	"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"
-)
 
-// TODO: Update all tests to use true/false table test for v2tenancy
+	"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) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
-	type testCase struct {
-		modFn       func(*pbresource.WatchListRequest)
-		errContains string
-	}
+	demo.RegisterTypes(server.Registry)
 
-	testCases := map[string]testCase{
-		"no type": {
-			modFn:       func(req *pbresource.WatchListRequest) { req.Type = nil },
-			errContains: "type is required",
-		},
-		"partition mixed case": {
-			modFn:       func(req *pbresource.WatchListRequest) { req.Tenancy.Partition = "Default" },
-			errContains: "tenancy.partition invalid",
-		},
-		"partition too long": {
-			modFn: func(req *pbresource.WatchListRequest) {
-				req.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-			},
-			errContains: "tenancy.partition invalid",
-		},
-		"namespace mixed case": {
-			modFn:       func(req *pbresource.WatchListRequest) { req.Tenancy.Namespace = "Default" },
-			errContains: "tenancy.namespace invalid",
-		},
-		"namespace too long": {
-			modFn: func(req *pbresource.WatchListRequest) {
-				req.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-			},
-			errContains: "tenancy.namespace invalid",
-		},
-		"name_prefix mixed case": {
-			modFn:       func(req *pbresource.WatchListRequest) { req.NamePrefix = "Smashing" },
-			errContains: "name_prefix invalid",
-		},
-		"partitioned type provides non-empty namespace": {
-			modFn: func(req *pbresource.WatchListRequest) {
-				req.Type = demo.TypeV1RecordLabel
-				req.Tenancy.Namespace = "bad"
-			},
-			errContains: "cannot have a namespace",
-		},
-		"cluster scope with non-empty partition": {
-			modFn: func(req *pbresource.WatchListRequest) {
-				req.Type = demo.TypeV1Executive
-				req.Tenancy = &pbresource.Tenancy{Partition: "bad"}
-			},
-			errContains: "cannot have a partition",
-		},
-		"cluster scope with non-empty namespace": {
-			modFn: func(req *pbresource.WatchListRequest) {
-				req.Type = demo.TypeV1Executive
-				req.Tenancy = &pbresource.Tenancy{Namespace: "bad"}
-			},
-			errContains: "cannot have a namespace",
+	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, tc := range testCases {
+	for desc, modFn := range testCases {
 		t.Run(desc, func(t *testing.T) {
 			req := &pbresource.WatchListRequest{
 				Type:    demo.TypeV2Album,
 				Tenancy: resource.DefaultNamespacedTenancy(),
 			}
-			tc.modFn(req)
+			modFn(req)
 
 			stream, err := client.WatchList(testContext(t), req)
 			require.NoError(t, err)
@@ -104,7 +52,6 @@ func TestWatchList_InputValidation(t *testing.T) {
 			_, err = stream.Recv()
 			require.Error(t, err)
 			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.ErrorContains(t, err, tc.errContains)
 		})
 	}
 }
@@ -112,7 +59,8 @@ func TestWatchList_InputValidation(t *testing.T) {
 func TestWatchList_TypeNotFound(t *testing.T) {
 	t.Parallel()
 
-	client := svctest.NewResourceServiceBuilder().Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
 	stream, err := client.WatchList(context.Background(), &pbresource.WatchListRequest{
 		Type:       demo.TypeV2Artist,
@@ -174,9 +122,9 @@ func TestWatchList_Tenancy_Defaults_And_Normalization(t *testing.T) {
 	for desc, tc := range wildcardTenancyCases() {
 		t.Run(desc, func(t *testing.T) {
 			ctx := context.Background()
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			client := testClient(t, server)
+			demo.RegisterTypes(server.Registry)
 
 			// Create a watch.
 			stream, err := client.WatchList(ctx, &pbresource.WatchListRequest{
@@ -188,23 +136,23 @@ func TestWatchList_Tenancy_Defaults_And_Normalization(t *testing.T) {
 			rspCh := handleResourceStream(t, stream)
 
 			// Testcase will pick one of recordLabel or artist based on scope of type.
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LooneyTunes")
 			require.NoError(t, err)
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
 
 			// Create and verify upsert event received.
-			rlRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: recordLabel})
+			recordLabel, err = server.Backend.WriteCAS(ctx, recordLabel)
 			require.NoError(t, err)
-			artistRsp, err := client.Write(ctx, &pbresource.WriteRequest{Resource: artist})
+			artist, err = server.Backend.WriteCAS(ctx, artist)
 			require.NoError(t, err)
 
 			var expected *pbresource.Resource
 			switch {
 			case proto.Equal(tc.typ, demo.TypeV1RecordLabel):
-				expected = rlRsp.Resource
+				expected = recordLabel
 			case proto.Equal(tc.typ, demo.TypeV2Artist):
-				expected = artistRsp.Resource
+				expected = artist
 			default:
 				require.Fail(t, "unsupported type", tc.typ)
 			}
@@ -213,6 +161,7 @@ func TestWatchList_Tenancy_Defaults_And_Normalization(t *testing.T) {
 			require.Equal(t, pbresource.WatchEvent_OPERATION_UPSERT, rsp.Operation)
 			prototest.AssertDeepEqual(t, expected, rsp.Resource)
 		})
+
 	}
 }
 
@@ -306,7 +255,7 @@ func roundTripACL(t *testing.T, authz acl.Authorizer) (<-chan resourceOrError, *
 	server := testServer(t)
 	client := testClient(t, server)
 
-	mockACLResolver := &svc.MockACLResolver{}
+	mockACLResolver := &MockACLResolver{}
 	mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
 		Return(authz, nil)
 	server.ACLResolver = mockACLResolver
@@ -394,31 +343,3 @@ type resourceOrError struct {
 	rsp *pbresource.WatchEvent
 	err error
 }
-
-func TestWatchList_NoTenancy(t *testing.T) {
-	t.Parallel()
-
-	ctx := context.Background()
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
-
-	// Create a watch.
-	stream, err := client.WatchList(ctx, &pbresource.WatchListRequest{
-		Type: demo.TypeV1RecordLabel,
-	})
-	require.NoError(t, err)
-	rspCh := handleResourceStream(t, stream)
-
-	recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
-	require.NoError(t, err)
-
-	// Create and verify upsert event received.
-	rsp1, err := client.Write(ctx, &pbresource.WriteRequest{Resource: recordLabel})
-	require.NoError(t, err)
-
-	rsp2 := mustGetResource(t, rspCh)
-
-	require.Equal(t, pbresource.WatchEvent_OPERATION_UPSERT, rsp2.Operation)
-	prototest.AssertDeepEqual(t, rsp1.Resource, rsp2.Resource)
-}
diff --git a/agent/grpc-external/services/resource/write.go b/agent/grpc-external/services/resource/write.go
index 87091ed920302..7110122313fa3 100644
--- a/agent/grpc-external/services/resource/write.go
+++ b/agent/grpc-external/services/resource/write.go
@@ -10,10 +10,8 @@ import (
 	"time"
 
 	"github.com/oklog/ulid/v2"
-	"golang.org/x/exp/maps"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/proto"
 
 	"github.com/hashicorp/consul/acl"
 	"github.com/hashicorp/consul/internal/resource"
@@ -39,7 +37,7 @@ import (
 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.ensureWriteRequestValid(req)
+	reg, err := s.validateWriteRequest(req)
 	if err != nil {
 		return nil, err
 	}
@@ -80,16 +78,14 @@ func (s *Server) Write(ctx context.Context, req *pbresource.WriteRequest) (*pbre
 		return nil, status.Errorf(codes.Internal, "failed write acl: %v", err)
 	}
 
-	// Check tenancy exists for the V2 resource
-	if err = tenancyExists(reg, s.TenancyBridge, req.Resource.Id.Tenancy, codes.InvalidArgument); err != nil {
+	// 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
 	}
 
-	// This is used later in the "create" and "update" paths to block non-delete related writes
-	// when a tenancy unit has been marked for deletion.
-	tenancyMarkedForDeletion, err := isTenancyMarkedForDeletion(reg, s.TenancyBridge, req.Resource.Id.Tenancy)
-	if err != nil {
-		return nil, status.Errorf(codes.Internal, "failed tenancy marked for deletion check: %v", 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.
@@ -131,16 +127,6 @@ func (s *Server) Write(ctx context.Context, req *pbresource.WriteRequest) (*pbre
 				return errUseWriteStatus
 			}
 
-			// Reject creation in tenancy unit marked for deletion.
-			if tenancyMarkedForDeletion {
-				return status.Errorf(codes.InvalidArgument, "tenancy marked for deletion: %v", input.Id.Tenancy.String())
-			}
-
-			// Reject attempts to create a resource with a deletionTimestamp.
-			if resource.IsMarkedForDeletion(input) {
-				return status.Errorf(codes.InvalidArgument, "resource.metadata.%s can't be set on resource creation", resource.DeletionTimestampKey)
-			}
-
 			// 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
@@ -182,11 +168,9 @@ func (s *Server) Write(ctx context.Context, req *pbresource.WriteRequest) (*pbre
 			// just want to update the current resource.
 			input.Id = existing.Id
 
-			// User is doing a non-CAS write, use the current version and preserve
-			// deferred deletion metadata if not present.
+			// User is doing a non-CAS write, use the current version.
 			if input.Version == "" {
 				input.Version = existing.Version
-				preserveDeferredDeletionMetadata(input, existing)
 			}
 
 			// Check the stored version matches the user-given version.
@@ -224,13 +208,6 @@ func (s *Server) Write(ctx context.Context, req *pbresource.WriteRequest) (*pbre
 				return errUseWriteStatus
 			}
 
-			// If the write is related to a deferred deletion (marking for deletion or removal
-			// of finalizers), make sure nothing else is changed.
-			if err := vetIfDeleteRelated(input, existing, tenancyMarkedForDeletion); err != nil {
-				return err
-			}
-
-			// Otherwise, let the write continue
 		default:
 			return err
 		}
@@ -288,7 +265,7 @@ func (s *Server) retryCAS(ctx context.Context, vsn string, cas func() error) err
 	return err
 }
 
-func (s *Server) ensureWriteRequestValid(req *pbresource.WriteRequest) (*resource.Registration, error) {
+func (s *Server) validateWriteRequest(req *pbresource.WriteRequest) (*resource.Registration, error) {
 	var field string
 	switch {
 	case req.Resource == nil:
@@ -317,10 +294,6 @@ func (s *Server) ensureWriteRequestValid(req *pbresource.WriteRequest) (*resourc
 		return nil, err
 	}
 
-	if err = checkV2Tenancy(s.UseV2Tenancy, req.Resource.Id.Type); err != nil {
-		return nil, err
-	}
-
 	// Check scope
 	if reg.Scope == resource.ScopePartition && req.Resource.Id.Tenancy.Namespace != "" {
 		return nil, status.Errorf(
@@ -333,140 +306,3 @@ func (s *Server) ensureWriteRequestValid(req *pbresource.WriteRequest) (*resourc
 
 	return reg, nil
 }
-
-func ensureMetadataSameExceptFor(input *pbresource.Resource, existing *pbresource.Resource, ignoreKey string) error {
-	// Work on copies since we're mutating them
-	inputCopy := maps.Clone(input.Metadata)
-	existingCopy := maps.Clone(existing.Metadata)
-
-	delete(inputCopy, ignoreKey)
-	delete(existingCopy, ignoreKey)
-
-	if !maps.Equal(inputCopy, existingCopy) {
-		return status.Error(codes.InvalidArgument, "cannot modify metadata")
-	}
-
-	return nil
-}
-
-func ensureDataUnchanged(input *pbresource.Resource, existing *pbresource.Resource) error {
-	// Check data last since this could potentially be the most expensive comparison.
-	if !proto.Equal(input.Data, existing.Data) {
-		return status.Error(codes.InvalidArgument, "cannot modify data")
-	}
-	return nil
-}
-
-// EnsureFinalizerRemoved ensures at least one finalizer was removed.
-// TODO: only public for test to access
-func EnsureFinalizerRemoved(input *pbresource.Resource, existing *pbresource.Resource) error {
-	inputFinalizers := resource.GetFinalizers(input)
-	existingFinalizers := resource.GetFinalizers(existing)
-	if !inputFinalizers.IsProperSubset(existingFinalizers) {
-		return status.Error(codes.InvalidArgument, "expected at least one finalizer to be removed")
-	}
-	return nil
-}
-
-func vetIfDeleteRelated(input, existing *pbresource.Resource, tenancyMarkedForDeletion bool) error {
-	// Keep track of whether this write is a normal write or a write that is related
-	// to deferred resource deletion involving setting the deletionTimestamp or the
-	// removal of finalizers.
-	deleteRelated := false
-
-	existingMarked := resource.IsMarkedForDeletion(existing)
-	inputMarked := resource.IsMarkedForDeletion(input)
-
-	// Block removal of deletion timestamp
-	if !inputMarked && existingMarked {
-		return status.Errorf(codes.InvalidArgument, "cannot remove %s", resource.DeletionTimestampKey)
-	}
-
-	// Block modification of existing deletion timestamp
-	if existing.Metadata[resource.DeletionTimestampKey] != "" && (existing.Metadata[resource.DeletionTimestampKey] != input.Metadata[resource.DeletionTimestampKey]) {
-		return status.Errorf(codes.InvalidArgument, "cannot modify %s", resource.DeletionTimestampKey)
-	}
-
-	// Block writes that do more than just adding a deletion timestamp
-	if inputMarked && !existingMarked {
-		deleteRelated = deleteRelated || true
-		// Verify rest of resource is unchanged
-		if err := ensureMetadataSameExceptFor(input, existing, resource.DeletionTimestampKey); err != nil {
-			return err
-		}
-		if err := ensureDataUnchanged(input, existing); err != nil {
-			return err
-		}
-	}
-
-	// Block no-op writes writes to resource that already has a deletion timestamp. The
-	// only valid writes should be removal of finalizers.
-	if inputMarked && existingMarked {
-		deleteRelated = deleteRelated || true
-		// Check if a no-op
-		errMetadataSame := ensureMetadataSameExceptFor(input, existing, resource.DeletionTimestampKey)
-		errDataUnchanged := ensureDataUnchanged(input, existing)
-		if errMetadataSame == nil && errDataUnchanged == nil {
-			return status.Error(codes.InvalidArgument, "cannot no-op write resource marked for deletion")
-		}
-	}
-
-	// Block writes that do more than removing finalizers if previously marked for deletion.
-	if inputMarked && existingMarked && resource.HasFinalizers(existing) {
-		deleteRelated = deleteRelated || true
-		if err := ensureMetadataSameExceptFor(input, existing, resource.FinalizerKey); err != nil {
-			return err
-		}
-		if err := ensureDataUnchanged(input, existing); err != nil {
-			return err
-		}
-		if err := EnsureFinalizerRemoved(input, existing); err != nil {
-			return err
-		}
-	}
-
-	// Classify writes that just remove finalizer as deleteRelated regardless of deletion state.
-	if err := EnsureFinalizerRemoved(input, existing); err == nil {
-		if err := ensureDataUnchanged(input, existing); err == nil {
-			deleteRelated = deleteRelated || true
-		}
-	}
-
-	// Lastly, block writes when the resource's tenancy unit has been marked for deletion and
-	// the write is not related a valid delete scenario.
-	if tenancyMarkedForDeletion && !deleteRelated {
-		return status.Errorf(codes.InvalidArgument, "cannot write resource when tenancy marked for deletion: %s", existing.Id.Tenancy)
-	}
-
-	return nil
-}
-
-// preserveDeferredDeletionMetadata only applies to user writes (Version == "") which is a precondition.
-func preserveDeferredDeletionMetadata(input, existing *pbresource.Resource) {
-	// preserve existing deletionTimestamp if not provided in input
-	if !resource.IsMarkedForDeletion(input) && resource.IsMarkedForDeletion(existing) {
-		if input.Metadata == nil {
-			input.Metadata = make(map[string]string)
-		}
-		input.Metadata[resource.DeletionTimestampKey] = existing.Metadata[resource.DeletionTimestampKey]
-	}
-
-	// Only preserve finalizers if the is key absent from input and present in existing.
-	// If the key is present in input, the user clearly wants to remove finalizers!
-	inputHasKey := false
-	if input.Metadata != nil {
-		_, inputHasKey = input.Metadata[resource.FinalizerKey]
-	}
-
-	existingHasKey := false
-	if existing.Metadata != nil {
-		_, existingHasKey = existing.Metadata[resource.FinalizerKey]
-	}
-
-	if !inputHasKey && existingHasKey {
-		if input.Metadata == nil {
-			input.Metadata = make(map[string]string)
-		}
-		input.Metadata[resource.FinalizerKey] = existing.Metadata[resource.FinalizerKey]
-	}
-}
diff --git a/agent/grpc-external/services/resource/write_status.go b/agent/grpc-external/services/resource/write_status.go
index 7009a7fd72bb2..0d3b68bb08766 100644
--- a/agent/grpc-external/services/resource/write_status.go
+++ b/agent/grpc-external/services/resource/write_status.go
@@ -34,9 +34,9 @@ func (s *Server) WriteStatus(ctx context.Context, req *pbresource.WriteStatusReq
 	// Apply defaults when tenancy units empty.
 	v1EntMetaToV2Tenancy(reg, entMeta, req.Id.Tenancy)
 
-	// Check tenancy exists for the V2 resource. Ignore "marked for deletion" since status updates
+	// Check V1 tenancy exists for the V2 resource. Ignore "marked for deletion" since status updates
 	// should still work regardless.
-	if err = tenancyExists(reg, s.TenancyBridge, req.Id.Tenancy, codes.InvalidArgument); err != nil {
+	if err = v1TenancyExists(reg, s.TenancyBridge, req.Id.Tenancy, codes.InvalidArgument); err != nil {
 		return nil, err
 	}
 
@@ -178,17 +178,8 @@ func (s *Server) validateWriteStatusRequest(req *pbresource.WriteStatusRequest)
 		}
 	}
 
-	if err := validateId(req.Id, "id"); err != nil {
-		return nil, err
-	}
-
-	for i, condition := range req.Status.Conditions {
-		if condition.Resource != nil {
-			if err := validateRef(condition.Resource, fmt.Sprintf("status.conditions[%d].resource", i)); err != nil {
-				return nil, err
-			}
-		}
-	}
+	// Lowercase
+	resource.Normalize(req.Id.Tenancy)
 
 	// Check type exists.
 	reg, err := s.resolveType(req.Id.Type)
diff --git a/agent/grpc-external/services/resource/write_status_test.go b/agent/grpc-external/services/resource/write_status_test.go
index e84266673b645..5b71983475d94 100644
--- a/agent/grpc-external/services/resource/write_status_test.go
+++ b/agent/grpc-external/services/resource/write_status_test.go
@@ -1,7 +1,7 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+package resource
 
 import (
 	"fmt"
@@ -16,15 +16,11 @@ import (
 	"google.golang.org/protobuf/types/known/timestamppb"
 
 	"github.com/hashicorp/consul/acl/resolver"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/demo"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-// TODO: Update all tests to use true/false table test for v2tenancy
-
 func TestWriteStatus_ACL(t *testing.T) {
 	type testCase struct {
 		authz       resolver.Result
@@ -48,8 +44,9 @@ func TestWriteStatus_ACL(t *testing.T) {
 
 	for desc, tc := range testcases {
 		t.Run(desc, func(t *testing.T) {
-			builder := svctest.NewResourceServiceBuilder().WithRegisterFns(demo.RegisterTypes)
-			client := builder.Run(t)
+			server := testServer(t)
+			client := testClient(t, server)
+			demo.RegisterTypes(server.Registry)
 
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
@@ -59,10 +56,10 @@ func TestWriteStatus_ACL(t *testing.T) {
 			artist = rsp.Resource
 
 			// Defer mocking out authz since above write is necessary to set up the test resource.
-			mockACLResolver := &svc.MockACLResolver{}
+			mockACLResolver := &MockACLResolver{}
 			mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
 				Return(tc.authz, nil)
-			builder.ServiceImpl().Config.ACLResolver = mockACLResolver
+			server.ACLResolver = mockACLResolver
 
 			// exercise ACL
 			_, err = client.WriteStatus(testContext(t), validWriteStatusRequest(t, artist))
@@ -72,160 +69,69 @@ func TestWriteStatus_ACL(t *testing.T) {
 }
 
 func TestWriteStatus_InputValidation(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+	demo.RegisterTypes(server.Registry)
 
 	testCases := map[string]struct {
-		typ         *pbresource.Type
-		modFn       func(req *pbresource.WriteStatusRequest)
-		errContains string
+		typ   *pbresource.Type
+		modFn func(req *pbresource.WriteStatusRequest)
 	}{
 		"no id": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id = nil },
-			errContains: "id is required",
+			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 },
-			errContains: "id.type is required",
+			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 = "" },
-			errContains: "id.name is required",
+			typ:   demo.TypeV2Artist,
+			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Name = "" },
 		},
 		"no uid": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id.Uid = "" },
-			errContains: "id.uid is required",
-		},
-		"name mixed case": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id.Name = "U2" },
-			errContains: "id.name invalid",
-		},
-		"name too long": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Id.Name = strings.Repeat("a", resource.MaxNameLength+1)
-			},
-			errContains: "id.name invalid",
-		},
-		"partition mixed case": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Partition = "Default" },
-			errContains: "id.tenancy.partition invalid",
-		},
-		"partition too long": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Id.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-			},
-			errContains: "id.tenancy.partition invalid",
-		},
-		"namespace mixed case": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Namespace = "Default" },
-			errContains: "id.tenancy.namespace invalid",
-		},
-		"namespace too long": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Id.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-			},
-			errContains: "id.tenancy.namespace invalid",
+			typ:   demo.TypeV2Artist,
+			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Uid = "" },
 		},
 		"no key": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Key = "" },
-			errContains: "key is required",
+			typ:   demo.TypeV2Artist,
+			modFn: func(req *pbresource.WriteStatusRequest) { req.Key = "" },
 		},
 		"no status": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Status = nil },
-			errContains: "status is required",
+			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 = "" },
-			errContains: "status.observed_generation is required",
+			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" },
-			errContains: "status.observed_generation is not valid",
+			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 = "" },
-			errContains: "status.conditions[0].type is required",
+			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 },
-			errContains: "status.conditions[0].resource.type is required",
+			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 },
-			errContains: "status.conditions[0].resource.tenancy is required",
+			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 = "" },
-			errContains: "status.conditions[0].resource.name is required",
-		},
-		"reference name mixed case": {
-			typ:         demo.TypeV2Artist,
-			modFn:       func(req *pbresource.WriteStatusRequest) { req.Status.Conditions[0].Resource.Name = "U2" },
-			errContains: "status.conditions[0].resource.name invalid",
-		},
-		"reference name too long": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Status.Conditions[0].Resource.Name = strings.Repeat("r", resource.MaxNameLength+1)
-			},
-			errContains: "status.conditions[0].resource.name invalid",
-		},
-		"reference partition mixed case": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Status.Conditions[0].Resource.Tenancy.Partition = "Default"
-			},
-			errContains: "status.conditions[0].resource.tenancy.partition invalid",
-		},
-		"reference partition too long": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Status.Conditions[0].Resource.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-			},
-			errContains: "status.conditions[0].resource.tenancy.partition invalid",
-		},
-		"reference namespace mixed case": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Status.Conditions[0].Resource.Tenancy.Namespace = "Default"
-			},
-			errContains: "status.conditions[0].resource.tenancy.namespace invalid",
-		},
-		"reference namespace too long": {
-			typ: demo.TypeV2Artist,
-			modFn: func(req *pbresource.WriteStatusRequest) {
-				req.Status.Conditions[0].Resource.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-			},
-			errContains: "status.conditions[0].resource.tenancy.namespace invalid",
+			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() },
-			errContains: "status.updated_at is automatically set and cannot be 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" },
-			errContains: "cannot have a namespace",
+			typ:   demo.TypeV1RecordLabel,
+			modFn: func(req *pbresource.WriteStatusRequest) { req.Id.Tenancy.Namespace = "bad" },
 		},
 	}
 	for desc, tc := range testCases {
@@ -236,7 +142,7 @@ func TestWriteStatus_InputValidation(t *testing.T) {
 			case resource.EqualType(demo.TypeV2Artist, tc.typ):
 				res, err = demo.GenerateV2Artist()
 			case resource.EqualType(demo.TypeV1RecordLabel, tc.typ):
-				res, err = demo.GenerateV1RecordLabel("looney-tunes")
+				res, err = demo.GenerateV1RecordLabel("Looney Tunes")
 			default:
 				t.Fatal("unsupported type", tc.typ)
 			}
@@ -251,7 +157,6 @@ func TestWriteStatus_InputValidation(t *testing.T) {
 			_, err = client.WriteStatus(testContext(t), req)
 			require.Error(t, err)
 			require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-			require.ErrorContains(t, err, tc.errContains)
 		})
 	}
 }
@@ -262,9 +167,9 @@ func TestWriteStatus_Success(t *testing.T) {
 		"Non CAS": func(req *pbresource.WriteStatusRequest) { req.Version = "" },
 	} {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			client := testClient(t, server)
+			demo.RegisterTypes(server.Registry)
 
 			res, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
@@ -305,6 +210,13 @@ func TestWriteStatus_Tenancy_Defaults(t *testing.T) {
 			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 = "" },
@@ -328,15 +240,21 @@ func TestWriteStatus_Tenancy_Defaults(t *testing.T) {
 			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) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(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
@@ -345,7 +263,7 @@ func TestWriteStatus_Tenancy_Defaults(t *testing.T) {
 			case resource.ScopeNamespace:
 				res, err = demo.GenerateV2Artist()
 			case resource.ScopePartition:
-				res, err = demo.GenerateV1RecordLabel("looney-tunes")
+				res, err = demo.GenerateV1RecordLabel("Looney Tunes")
 			}
 			require.NoError(t, err)
 
@@ -362,7 +280,7 @@ func TestWriteStatus_Tenancy_Defaults(t *testing.T) {
 			require.NoError(t, err)
 			res = rsp.Resource
 
-			// Re-read resource and verify status successfully written (not nil)
+			// 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
@@ -398,10 +316,9 @@ func TestWriteStatus_Tenancy_NotFound(t *testing.T) {
 		},
 	} {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(true).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(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
@@ -410,7 +327,7 @@ func TestWriteStatus_Tenancy_NotFound(t *testing.T) {
 			case resource.ScopeNamespace:
 				res, err = demo.GenerateV2Artist()
 			case resource.ScopePartition:
-				res, err = demo.GenerateV1RecordLabel("looney-tunes")
+				res, err = demo.GenerateV1RecordLabel("Looney Tunes")
 			}
 			require.NoError(t, err)
 
@@ -432,9 +349,10 @@ func TestWriteStatus_Tenancy_NotFound(t *testing.T) {
 }
 
 func TestWriteStatus_CASFailure(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -452,7 +370,8 @@ func TestWriteStatus_CASFailure(t *testing.T) {
 }
 
 func TestWriteStatus_TypeNotFound(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -466,9 +385,9 @@ func TestWriteStatus_TypeNotFound(t *testing.T) {
 }
 
 func TestWriteStatus_ResourceNotFound(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -481,9 +400,9 @@ func TestWriteStatus_ResourceNotFound(t *testing.T) {
 }
 
 func TestWriteStatus_WrongUid(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
diff --git a/agent/grpc-external/services/resource/write_test.go b/agent/grpc-external/services/resource/write_test.go
index 5c6c7732106a8..3828ff9753f2d 100644
--- a/agent/grpc-external/services/resource/write_test.go
+++ b/agent/grpc-external/services/resource/write_test.go
@@ -1,14 +1,13 @@
 // Copyright (c) HashiCorp, Inc.
 // SPDX-License-Identifier: BUSL-1.1
 
-package resource_test
+package resource
 
 import (
 	"context"
 	"strings"
 	"sync/atomic"
 	"testing"
-	"time"
 
 	"github.com/oklog/ulid/v2"
 	"github.com/stretchr/testify/mock"
@@ -18,149 +17,75 @@ import (
 	"google.golang.org/protobuf/types/known/anypb"
 
 	"github.com/hashicorp/consul/acl/resolver"
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
-	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/internal/storage"
 	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbdemo "github.com/hashicorp/consul/proto/private/pbdemo/v1"
 	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"
 )
 
-// TODO: Update all tests to use true/false table test for v2tenancy
-
 func TestWrite_InputValidation(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
-	type testCase struct {
-		modFn       func(artist, recordLabel *pbresource.Resource) *pbresource.Resource
-		errContains string
-	}
+	demo.RegisterTypes(server.Registry)
 
-	testCases := map[string]testCase{
-		"no resource": {
-			modFn: func(_, _ *pbresource.Resource) *pbresource.Resource {
-				return nil
-			},
-			errContains: "resource is required",
-		},
-		"no id": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id = nil
-				return artist
-			},
-			errContains: "resource.id is required",
-		},
-		"no type": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Type = nil
-				return artist
-			},
-			errContains: "resource.id.type is required",
-		},
-		"no name": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Name = ""
-				return artist
-			},
-			errContains: "resource.id.name invalid",
+	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
 		},
-		"name is mixed case": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Name = "MixedCaseNotAllowed"
-				return artist
-			},
-			errContains: "resource.id.name invalid",
+		"no type": func(artist, _ *pbresource.Resource) *pbresource.Resource {
+			artist.Id.Type = nil
+			return artist
 		},
-		"name too long": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Name = strings.Repeat("a", resource.MaxNameLength+1)
-				return artist
-			},
-			errContains: "resource.id.name invalid",
+		"no name": func(artist, _ *pbresource.Resource) *pbresource.Resource {
+			artist.Id.Name = ""
+			return artist
 		},
-		"wrong data type": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				var err error
-				artist.Data, err = anypb.New(&pbdemov2.Album{})
-				require.NoError(t, err)
-				return artist
-			},
-			errContains: "resource.data is of wrong type",
-		},
-		"partition is mixed case": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Partition = "Default"
-				return artist
-			},
-			errContains: "resource.id.tenancy.partition invalid",
-		},
-		"partition too long": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-				return artist
-			},
-			errContains: "resource.id.tenancy.partition invalid",
-		},
-		"namespace is mixed case": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Namespace = "Default"
-				return artist
-			},
-			errContains: "resource.id.tenancy.namespace invalid",
-		},
-		"namespace too long": {
-			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
-				artist.Id.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-				return artist
-			},
-			errContains: "resource.id.tenancy.namespace invalid",
+		"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": {
-			modFn: 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
-			},
-			errContains: "artist.name required",
+		"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": {
-			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
-				recordLabel.Id.Tenancy.Namespace = "bogus"
-				return recordLabel
-			},
-			errContains: "cannot have a namespace",
+		"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, tc := range testCases {
+	for desc, modFn := range testCases {
 		t.Run(desc, func(t *testing.T) {
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
 
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 			require.NoError(t, err)
 
-			req := &pbresource.WriteRequest{Resource: tc.modFn(artist, recordLabel)}
+			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())
-			require.ErrorContains(t, err, tc.errContains)
 		})
 	}
 }
 
 func TestWrite_OwnerValidation(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	type testCase struct {
 		modReqFn      func(req *pbresource.WriteRequest)
@@ -169,49 +94,15 @@ func TestWrite_OwnerValidation(t *testing.T) {
 	testCases := map[string]testCase{
 		"no owner type": {
 			modReqFn:      func(req *pbresource.WriteRequest) { req.Resource.Owner.Type = nil },
-			errorContains: "resource.owner.type is required",
+			errorContains: "resource.owner.type",
 		},
 		"no owner tenancy": {
 			modReqFn:      func(req *pbresource.WriteRequest) { req.Resource.Owner.Tenancy = nil },
-			errorContains: "resource.owner does not exist",
+			errorContains: "resource.owner",
 		},
 		"no owner name": {
 			modReqFn:      func(req *pbresource.WriteRequest) { req.Resource.Owner.Name = "" },
-			errorContains: "resource.owner.name invalid",
-		},
-		"mixed case owner name": {
-			modReqFn:      func(req *pbresource.WriteRequest) { req.Resource.Owner.Name = strings.ToUpper(req.Resource.Owner.Name) },
-			errorContains: "resource.owner.name invalid",
-		},
-		"owner name too long": {
-			modReqFn: func(req *pbresource.WriteRequest) {
-				req.Resource.Owner.Name = strings.Repeat("a", resource.MaxNameLength+1)
-			},
-			errorContains: "resource.owner.name invalid",
-		},
-		"owner partition is mixed case": {
-			modReqFn: func(req *pbresource.WriteRequest) {
-				req.Resource.Owner.Tenancy.Partition = "Default"
-			},
-			errorContains: "resource.owner.tenancy.partition invalid",
-		},
-		"owner partition too long": {
-			modReqFn: func(req *pbresource.WriteRequest) {
-				req.Resource.Owner.Tenancy.Partition = strings.Repeat("p", resource.MaxNameLength+1)
-			},
-			errorContains: "resource.owner.tenancy.partition invalid",
-		},
-		"owner namespace is mixed case": {
-			modReqFn: func(req *pbresource.WriteRequest) {
-				req.Resource.Owner.Tenancy.Namespace = "Default"
-			},
-			errorContains: "resource.owner.tenancy.namespace invalid",
-		},
-		"owner namespace too long": {
-			modReqFn: func(req *pbresource.WriteRequest) {
-				req.Resource.Owner.Tenancy.Namespace = strings.Repeat("n", resource.MaxNameLength+1)
-			},
-			errorContains: "resource.owner.tenancy.namespace invalid",
+			errorContains: "resource.owner.name",
 		},
 	}
 	for desc, tc := range testCases {
@@ -234,7 +125,8 @@ func TestWrite_OwnerValidation(t *testing.T) {
 }
 
 func TestWrite_TypeNotFound(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -268,14 +160,14 @@ func TestWrite_ACLs(t *testing.T) {
 
 	for desc, tc := range testcases {
 		t.Run(desc, func(t *testing.T) {
-			mockACLResolver := &svc.MockACLResolver{}
+			server := testServer(t)
+			client := testClient(t, server)
+
+			mockACLResolver := &MockACLResolver{}
 			mockACLResolver.On("ResolveTokenAndDefaultMeta", mock.Anything, mock.Anything, mock.Anything).
 				Return(tc.authz, nil)
-
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				WithACLResolver(mockACLResolver).
-				Run(t)
+			server.ACLResolver = mockACLResolver
+			demo.RegisterTypes(server.Registry)
 
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
@@ -288,9 +180,9 @@ func TestWrite_ACLs(t *testing.T) {
 }
 
 func TestWrite_Mutate(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+	demo.RegisterTypes(server.Registry)
 
 	artist, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -323,6 +215,14 @@ func TestWrite_Create_Success(t *testing.T) {
 			},
 			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 = ""
@@ -366,6 +266,13 @@ func TestWrite_Create_Success(t *testing.T) {
 			},
 			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 = ""
@@ -392,11 +299,11 @@ func TestWrite_Create_Success(t *testing.T) {
 	}
 	for desc, tc := range testCases {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			client := testClient(t, server)
+			demo.RegisterTypes(server.Registry)
 
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 			require.NoError(t, err)
 
 			artist, err := demo.GenerateV2Artist()
@@ -424,7 +331,7 @@ func TestWrite_Create_Tenancy_NotFound(t *testing.T) {
 				return artist
 			},
 			errCode:     codes.InvalidArgument,
-			errContains: "partition not found",
+			errContains: "partition",
 		},
 		"namespaced resource provides nonexistant namespace": {
 			modFn: func(artist, _ *pbresource.Resource) *pbresource.Resource {
@@ -432,7 +339,7 @@ func TestWrite_Create_Tenancy_NotFound(t *testing.T) {
 				return artist
 			},
 			errCode:     codes.InvalidArgument,
-			errContains: "namespace not found",
+			errContains: "namespace",
 		},
 		"partitioned resource provides nonexistant partition": {
 			modFn: func(_, recordLabel *pbresource.Resource) *pbresource.Resource {
@@ -440,17 +347,16 @@ func TestWrite_Create_Tenancy_NotFound(t *testing.T) {
 				return recordLabel
 			},
 			errCode:     codes.InvalidArgument,
-			errContains: "partition not found",
+			errContains: "partition",
 		},
 	}
 	for desc, tc := range testCases {
 		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(true).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
+			server := testServer(t)
+			client := testClient(t, server)
+			demo.RegisterTypes(server.Registry)
 
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 			require.NoError(t, err)
 
 			artist, err := demo.GenerateV2Artist()
@@ -464,51 +370,33 @@ func TestWrite_Create_Tenancy_NotFound(t *testing.T) {
 	}
 }
 
-func TestWrite_Create_With_DeletionTimestamp_Fails(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithV2Tenancy(true).
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
-
-	res := rtest.Resource(demo.TypeV1Artist, "blur").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		WithData(t, &pbdemov1.Artist{Name: "Blur"}).
-		WithMeta(resource.DeletionTimestampKey, time.Now().Format(time.RFC3339)).
-		Build()
-
-	_, 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.DeletionTimestampKey)
-}
-
-func TestWrite_Create_With_TenancyMarkedForDeletion_Fails(t *testing.T) {
+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 *svc.MockTenancyBridge) *pbresource.Resource
+		modFn       func(artist, recordLabel *pbresource.Resource, mockTenancyBridge *MockTenancyBridge) *pbresource.Resource
 		errContains string
 	}{
 		"namespaced resources partition marked for deletion": {
-			modFn: func(artist, _ *pbresource.Resource, mockTenancyBridge *svc.MockTenancyBridge) *pbresource.Resource {
-				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "ap1").Return(true, nil)
+			modFn: func(artist, _ *pbresource.Resource, mockTenancyBridge *MockTenancyBridge) *pbresource.Resource {
+				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "part1").Return(true, nil)
 				return artist
 			},
-			errContains: "tenancy marked for deletion",
+			errContains: "partition marked for deletion",
 		},
 		"namespaced resources namespace marked for deletion": {
-			modFn: func(artist, _ *pbresource.Resource, mockTenancyBridge *svc.MockTenancyBridge) *pbresource.Resource {
-				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "ap1").Return(false, nil)
-				mockTenancyBridge.On("IsNamespaceMarkedForDeletion", "ap1", "ns1").Return(true, nil)
+			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: "tenancy marked for deletion",
+			errContains: "namespace marked for deletion",
 		},
 		"partitioned resources partition marked for deletion": {
-			modFn: func(_, recordLabel *pbresource.Resource, mockTenancyBridge *svc.MockTenancyBridge) *pbresource.Resource {
-				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "ap1").Return(true, nil)
+			modFn: func(_, recordLabel *pbresource.Resource, mockTenancyBridge *MockTenancyBridge) *pbresource.Resource {
+				mockTenancyBridge.On("IsPartitionMarkedForDeletion", "part1").Return(true, nil)
 				return recordLabel
 			},
-			errContains: "tenancy marked for deletion",
+			errContains: "partition marked for deletion",
 		},
 	}
 	for desc, tc := range testCases {
@@ -516,19 +404,18 @@ func TestWrite_Create_With_TenancyMarkedForDeletion_Fails(t *testing.T) {
 			server := testServer(t)
 			client := testClient(t, server)
 			demo.RegisterTypes(server.Registry)
-
-			recordLabel, err := demo.GenerateV1RecordLabel("looney-tunes")
+			recordLabel, err := demo.GenerateV1RecordLabel("LoonyTunes")
 			require.NoError(t, err)
-			recordLabel.Id.Tenancy.Partition = "ap1"
+			recordLabel.Id.Tenancy.Partition = "part1"
 
 			artist, err := demo.GenerateV2Artist()
 			require.NoError(t, err)
-			artist.Id.Tenancy.Partition = "ap1"
+			artist.Id.Tenancy.Partition = "part1"
 			artist.Id.Tenancy.Namespace = "ns1"
 
-			mockTenancyBridge := &svc.MockTenancyBridge{}
-			mockTenancyBridge.On("PartitionExists", "ap1").Return(true, nil)
-			mockTenancyBridge.On("NamespaceExists", "ap1", "ns1").Return(true, nil)
+			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)})
@@ -540,9 +427,10 @@ func TestWrite_Create_With_TenancyMarkedForDeletion_Fails(t *testing.T) {
 }
 
 func TestWrite_CASUpdate_Success(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -561,9 +449,10 @@ func TestWrite_CASUpdate_Success(t *testing.T) {
 }
 
 func TestWrite_ResourceCreation_StatusProvided(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -579,9 +468,10 @@ func TestWrite_ResourceCreation_StatusProvided(t *testing.T) {
 }
 
 func TestWrite_CASUpdate_Failure(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -599,9 +489,10 @@ func TestWrite_CASUpdate_Failure(t *testing.T) {
 }
 
 func TestWrite_Update_WrongUid(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -619,9 +510,10 @@ func TestWrite_Update_WrongUid(t *testing.T) {
 }
 
 func TestWrite_Update_StatusModified(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -648,9 +540,10 @@ func TestWrite_Update_StatusModified(t *testing.T) {
 }
 
 func TestWrite_Update_NilStatus(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -671,9 +564,10 @@ func TestWrite_Update_NilStatus(t *testing.T) {
 }
 
 func TestWrite_Update_NoUid(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -689,9 +583,10 @@ func TestWrite_Update_NoUid(t *testing.T) {
 }
 
 func TestWrite_Update_GroupVersion(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -718,9 +613,10 @@ func TestWrite_Update_GroupVersion(t *testing.T) {
 }
 
 func TestWrite_NonCASUpdate_Success(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -740,6 +636,7 @@ func TestWrite_NonCASUpdate_Success(t *testing.T) {
 func TestWrite_NonCASUpdate_Retry(t *testing.T) {
 	server := testServer(t)
 	client := testClient(t, server)
+
 	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV2Artist()
@@ -784,9 +681,10 @@ func TestWrite_NonCASUpdate_Retry(t *testing.T) {
 }
 
 func TestWrite_NoData(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	res, err := demo.GenerateV1Concept("jazz")
 	require.NoError(t, err)
@@ -801,9 +699,10 @@ 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.
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	artist, err := demo.GenerateV2Artist()
 	require.NoError(t, err)
@@ -828,9 +727,10 @@ func TestWrite_Owner_Immutable(t *testing.T) {
 }
 
 func TestWrite_Owner_Uid(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	server := testServer(t)
+	client := testClient(t, server)
+
+	demo.RegisterTypes(server.Registry)
 
 	t.Run("uid given", func(t *testing.T) {
 		artist, err := demo.GenerateV2Artist()
@@ -916,318 +816,3 @@ func (b *blockOnceBackend) Read(ctx context.Context, consistency storage.ReadCon
 
 	return res, err
 }
-
-func TestEnsureFinalizerRemoved(t *testing.T) {
-	type testCase struct {
-		mod         func(input, existing *pbresource.Resource)
-		errContains string
-	}
-
-	testCases := map[string]testCase{
-		"one finalizer removed from input": {
-			mod: func(input, existing *pbresource.Resource) {
-				resource.AddFinalizer(existing, "f1")
-				resource.AddFinalizer(existing, "f2")
-				resource.AddFinalizer(input, "f1")
-			},
-		},
-		"all finalizers removed from input": {
-			mod: func(input, existing *pbresource.Resource) {
-				resource.AddFinalizer(existing, "f1")
-				resource.AddFinalizer(existing, "f2")
-				resource.AddFinalizer(input, "f1")
-				resource.RemoveFinalizer(input, "f1")
-			},
-		},
-		"all finalizers removed from input and no finalizer key": {
-			mod: func(input, existing *pbresource.Resource) {
-				resource.AddFinalizer(existing, "f1")
-				resource.AddFinalizer(existing, "f2")
-			},
-		},
-		"no finalizers removed from input": {
-			mod: func(input, existing *pbresource.Resource) {
-				resource.AddFinalizer(existing, "f1")
-				resource.AddFinalizer(input, "f1")
-			},
-			errContains: "expected at least one finalizer to be removed",
-		},
-		"input finalizers not proper subset of existing": {
-			mod: func(input, existing *pbresource.Resource) {
-				resource.AddFinalizer(existing, "f1")
-				resource.AddFinalizer(existing, "f2")
-				resource.AddFinalizer(input, "f3")
-			},
-			errContains: "expected at least one finalizer to be removed",
-		},
-		"existing has no finalizers for input to remove": {
-			mod: func(input, existing *pbresource.Resource) {
-				resource.AddFinalizer(input, "f3")
-			},
-			errContains: "expected at least one finalizer to be removed",
-		},
-	}
-
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			input := rtest.Resource(demo.TypeV1Artist, "artist1").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemov1.Artist{Name: "artist1"}).
-				WithMeta(resource.DeletionTimestampKey, "someTimestamp").
-				Build()
-
-			existing := rtest.Resource(demo.TypeV1Artist, "artist1").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemov1.Artist{Name: "artist1"}).
-				WithMeta(resource.DeletionTimestampKey, "someTimestamp").
-				Build()
-
-			tc.mod(input, existing)
-
-			err := svc.EnsureFinalizerRemoved(input, existing)
-			if tc.errContains != "" {
-				require.Error(t, err)
-				require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-				require.ErrorContains(t, err, tc.errContains)
-			} else {
-				require.NoError(t, err)
-			}
-		})
-	}
-}
-
-func TestWrite_ResourceFrozenAfterMarkedForDeletion(t *testing.T) {
-	type testCase struct {
-		modFn       func(res *pbresource.Resource)
-		errContains string
-	}
-	testCases := map[string]testCase{
-		"no-op write rejected": {
-			modFn:       func(res *pbresource.Resource) {},
-			errContains: "cannot no-op write resource marked for deletion",
-		},
-		"remove one finalizer": {
-			modFn: func(res *pbresource.Resource) {
-				resource.RemoveFinalizer(res, "finalizer1")
-			},
-		},
-		"remove all finalizers": {
-			modFn: func(res *pbresource.Resource) {
-				resource.RemoveFinalizer(res, "finalizer1")
-				resource.RemoveFinalizer(res, "finalizer2")
-			},
-		},
-		"adding finalizer fails": {
-			modFn: func(res *pbresource.Resource) {
-				resource.AddFinalizer(res, "finalizer3")
-			},
-			errContains: "expected at least one finalizer to be removed",
-		},
-		"remove deletionTimestamp fails": {
-			modFn: func(res *pbresource.Resource) {
-				delete(res.Metadata, resource.DeletionTimestampKey)
-			},
-			errContains: "cannot remove deletionTimestamp",
-		},
-		"modify deletionTimestamp fails": {
-			modFn: func(res *pbresource.Resource) {
-				res.Metadata[resource.DeletionTimestampKey] = "bad"
-			},
-			errContains: "cannot modify deletionTimestamp",
-		},
-		"modify data fails": {
-			modFn: func(res *pbresource.Resource) {
-				var err error
-				res.Data, err = anypb.New(&pbdemo.Artist{Name: "New Order"})
-				require.NoError(t, err)
-			},
-			errContains: "cannot modify data",
-		},
-	}
-
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(true).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			// Create a resource with finalizers
-			res := rtest.Resource(demo.TypeV1Artist, "joydivision").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Joy Division"}).
-				WithMeta(resource.FinalizerKey, "finalizer1 finalizer2").
-				Write(t, client)
-
-			// Mark for deletion - resource should now be frozen
-			_, err := client.Delete(context.Background(), &pbresource.DeleteRequest{Id: res.Id})
-			require.NoError(t, err)
-
-			// Verify marked for deletion
-			rsp, err := client.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
-			require.NoError(t, err)
-			require.True(t, resource.IsMarkedForDeletion(rsp.Resource))
-
-			// Apply test case mods
-			tc.modFn(rsp.Resource)
-
-			// Verify write results
-			_, err = client.Write(context.Background(), &pbresource.WriteRequest{Resource: rsp.Resource})
-			if tc.errContains == "" {
-				require.NoError(t, err)
-			} else {
-				require.Error(t, err)
-				require.Equal(t, codes.InvalidArgument.String(), status.Code(err).String())
-				require.ErrorContains(t, err, tc.errContains)
-			}
-		})
-	}
-}
-
-func TestWrite_NonCASWritePreservesFinalizers(t *testing.T) {
-	type testCase struct {
-		existingMeta map[string]string
-		inputMeta    map[string]string
-		expectedMeta map[string]string
-	}
-	testCases := map[string]testCase{
-		"input nil metadata preserves existing finalizers": {
-			inputMeta:    nil,
-			existingMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-			expectedMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-		},
-		"input metadata and no finalizer key preserves existing finalizers": {
-			inputMeta:    map[string]string{},
-			existingMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-			expectedMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-		},
-		"input metadata and with empty finalizer key overwrites existing finalizers": {
-			inputMeta:    map[string]string{resource.FinalizerKey: ""},
-			existingMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-			expectedMeta: map[string]string{resource.FinalizerKey: ""},
-		},
-		"input metadata with one finalizer key overwrites multiple existing finalizers": {
-			inputMeta:    map[string]string{resource.FinalizerKey: "finalizer2"},
-			existingMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-			expectedMeta: map[string]string{resource.FinalizerKey: "finalizer2"},
-		},
-	}
-
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(true).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			// Create the resource based on tc.existingMetadata
-			builder := rtest.Resource(demo.TypeV1Artist, "joydivision").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Joy"})
-
-			if tc.existingMeta != nil {
-				for k, v := range tc.existingMeta {
-					builder.WithMeta(k, v)
-				}
-			}
-			res := builder.Write(t, client)
-
-			// Build resource for user write based on tc.inputMetadata
-			builder = rtest.Resource(demo.TypeV1Artist, res.Id.Name).
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Joy Division"})
-
-			if tc.inputMeta != nil {
-				for k, v := range tc.inputMeta {
-					builder.WithMeta(k, v)
-				}
-			}
-			userRes := builder.Build()
-
-			// Perform the user write
-			rsp, err := client.Write(context.Background(), &pbresource.WriteRequest{Resource: userRes})
-			require.NoError(t, err)
-
-			// Verify write result preserved metadata based on testcase.expecteMetadata
-			for k := range tc.expectedMeta {
-				require.Equal(t, tc.expectedMeta[k], rsp.Resource.Metadata[k])
-			}
-			require.Equal(t, len(tc.expectedMeta), len(rsp.Resource.Metadata))
-		})
-	}
-}
-
-func TestWrite_NonCASWritePreservesDeletionTimestamp(t *testing.T) {
-	type testCase struct {
-		existingMeta map[string]string
-		inputMeta    map[string]string
-		expectedMeta map[string]string
-	}
-
-	// deletionTimestamp has to be generated via Delete() call and can't be embedded in testdata
-	// even though testcase desc refers to it.
-	testCases := map[string]testCase{
-		"input metadata no deletion timestamp preserves existing deletion timestamp and removes single finalizer": {
-			inputMeta:    map[string]string{resource.FinalizerKey: "finalizer1"},
-			existingMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-			expectedMeta: map[string]string{resource.FinalizerKey: "finalizer1"},
-		},
-		"input metadata no deletion timestamp preserves existing deletion timestamp and removes all finalizers": {
-			inputMeta:    map[string]string{resource.FinalizerKey: ""},
-			existingMeta: map[string]string{resource.FinalizerKey: "finalizer1 finalizer2"},
-			expectedMeta: map[string]string{resource.FinalizerKey: ""},
-		},
-	}
-
-	for desc, tc := range testCases {
-		t.Run(desc, func(t *testing.T) {
-			client := svctest.NewResourceServiceBuilder().
-				WithV2Tenancy(true).
-				WithRegisterFns(demo.RegisterTypes).
-				Run(t)
-
-			// Create the resource based on tc.existingMetadata
-			builder := rtest.Resource(demo.TypeV1Artist, "joydivision").
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Joy Division"})
-
-			if tc.existingMeta != nil {
-				for k, v := range tc.existingMeta {
-					builder.WithMeta(k, v)
-				}
-			}
-			res := builder.Write(t, client)
-
-			// Mark for deletion
-			_, err := client.Delete(context.Background(), &pbresource.DeleteRequest{Id: res.Id})
-			require.NoError(t, err)
-
-			// Re-read the deleted res for future comparison of deletionTimestamp
-			delRsp, err := client.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
-			require.NoError(t, err)
-
-			// Build resource for user write based on tc.inputMetadata
-			builder = rtest.Resource(demo.TypeV1Artist, res.Id.Name).
-				WithTenancy(resource.DefaultNamespacedTenancy()).
-				WithData(t, &pbdemo.Artist{Name: "Joy Division"})
-
-			if tc.inputMeta != nil {
-				for k, v := range tc.inputMeta {
-					builder.WithMeta(k, v)
-				}
-			}
-			userRes := builder.Build()
-
-			// Perform the non-CAS user write
-			rsp, err := client.Write(context.Background(), &pbresource.WriteRequest{Resource: userRes})
-			require.NoError(t, err)
-
-			// Verify write result preserved metadata based on testcase.expecteMetadata
-			for k := range tc.expectedMeta {
-				require.Equal(t, tc.expectedMeta[k], rsp.Resource.Metadata[k])
-			}
-			// Verify deletion timestamp preserved even though it wasn't passed in to the write
-			require.Equal(t, delRsp.Resource.Metadata[resource.DeletionTimestampKey], rsp.Resource.Metadata[resource.DeletionTimestampKey])
-		})
-	}
-}
diff --git a/agent/health_endpoint_test.go b/agent/health_endpoint_test.go
index 86dd7be70f78f..4c491e9cb2761 100644
--- a/agent/health_endpoint_test.go
+++ b/agent/health_endpoint_test.go
@@ -258,7 +258,7 @@ func TestHealthChecksInState_DistanceSort(t *testing.T) {
 		if err != nil {
 			r.Fatalf("err: %v", err)
 		}
-		assertIndex(r, resp)
+		assertIndex(t, resp)
 		nodes = obj.(structs.HealthChecks)
 		if len(nodes) != 2 {
 			r.Fatalf("bad: %v", nodes)
@@ -613,7 +613,7 @@ func TestHealthServiceChecks_DistanceSort(t *testing.T) {
 		if err != nil {
 			r.Fatalf("err: %v", err)
 		}
-		assertIndex(r, resp)
+		assertIndex(t, resp)
 		nodes = obj.(structs.HealthChecks)
 		if len(nodes) != 2 {
 			r.Fatalf("bad: %v", obj)
@@ -1371,7 +1371,7 @@ func TestHealthServiceNodes_DistanceSort(t *testing.T) {
 		if err != nil {
 			r.Fatalf("err: %v", err)
 		}
-		assertIndex(r, resp)
+		assertIndex(t, resp)
 		nodes = obj.(structs.CheckServiceNodes)
 		if len(nodes) != 2 {
 			r.Fatalf("bad: %v", obj)
diff --git a/agent/http_test.go b/agent/http_test.go
index 607061d8681f7..f2469acc83526 100644
--- a/agent/http_test.go
+++ b/agent/http_test.go
@@ -1628,8 +1628,10 @@ func TestAllowedNets(t *testing.T) {
 }
 
 // assertIndex tests that X-Consul-Index is set and non-zero
-func assertIndex(t testutil.TestingTB, resp *httptest.ResponseRecorder) {
-	t.Helper()
+func assertIndex(t require.TestingT, resp *httptest.ResponseRecorder) {
+	if tt, ok := t.(*testing.T); ok {
+		tt.Helper()
+	}
 	require.NoError(t, checkIndex(resp))
 }
 
diff --git a/agent/proxycfg/manager.go b/agent/proxycfg/manager.go
index b01787f2c1d12..71b6270fefc41 100644
--- a/agent/proxycfg/manager.go
+++ b/agent/proxycfg/manager.go
@@ -5,7 +5,6 @@ package proxycfg
 
 import (
 	"errors"
-	"github.com/hashicorp/consul/lib/channels"
 	"runtime/debug"
 	"sync"
 
@@ -260,15 +259,37 @@ 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 proxysnapshot.ProxySnapshot, ch chan proxysnapshot.ProxySnapshot) {
-	m.Logger.Trace("delivering latest proxy snapshot to proxy", "proxyID", snap.(*ConfigSnapshot).ProxyID)
-	err := channels.DeliverLatest(snap, ch)
-	if err != nil {
-		m.Logger.Error("failed to deliver proxyState to proxy",
-			"proxy", snap.(*ConfigSnapshot).ProxyID,
-		)
+func (m *Manager) deliverLatest(snap *ConfigSnapshot, ch chan proxysnapshot.ProxySnapshot) {
+	// Send if chan is empty
+	select {
+	case ch <- snap:
+		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 <- snap:
+		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.
+		m.Logger.Error("failed to deliver ConfigSnapshot to proxy",
+			"proxy", snap.ProxyID.String(),
+		)
+	}
 }
 
 // Watch registers a watch on a proxy. It might not exist yet in which case this
diff --git a/agent/proxycfg/testing_ingress_gateway.go b/agent/proxycfg/testing_ingress_gateway.go
index f178955c18ab4..96918a261bd05 100644
--- a/agent/proxycfg/testing_ingress_gateway.go
+++ b/agent/proxycfg/testing_ingress_gateway.go
@@ -1364,7 +1364,7 @@ func TestConfigSnapshotIngressGateway_TLSMinVersionListenersGatewayDefaults(t te
 					Port:     8083,
 					Protocol: "http",
 					Services: []structs.IngressService{
-						{Name: "s4"},
+						{Name: "s3"},
 					},
 					TLS: &structs.GatewayTLSConfig{
 						Enabled:       true,
diff --git a/agent/remote_exec_test.go b/agent/remote_exec_test.go
index 2488f6b4f2e07..f077de895a396 100644
--- a/agent/remote_exec_test.go
+++ b/agent/remote_exec_test.go
@@ -15,7 +15,6 @@ import (
 
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/hashicorp/consul/testrpc"
 	"github.com/hashicorp/go-uuid"
@@ -359,9 +358,9 @@ func testHandleRemoteExec(t *testing.T, command string, expectedSubstring string
 	retry.Run(t, func(r *retry.R) {
 		event := &remoteExecEvent{
 			Prefix:  "_rexec",
-			Session: makeRexecSession(r, a.Agent, ""),
+			Session: makeRexecSession(t, a.Agent, ""),
 		}
-		defer destroySession(r, a.Agent, event.Session, "")
+		defer destroySession(t, a.Agent, event.Session, "")
 
 		spec := &remoteExecSpec{
 			Command: command,
@@ -430,7 +429,7 @@ func TestHandleRemoteExecFailed(t *testing.T) {
 	testHandleRemoteExec(t, "echo failing;exit 2", "failing", "2")
 }
 
-func makeRexecSession(t testutil.TestingTB, a *Agent, token string) string {
+func makeRexecSession(t *testing.T, a *Agent, token string) string {
 	args := structs.SessionRequest{
 		Datacenter: a.config.Datacenter,
 		Op:         structs.SessionCreate,
@@ -449,7 +448,7 @@ func makeRexecSession(t testutil.TestingTB, a *Agent, token string) string {
 	return out
 }
 
-func destroySession(t testutil.TestingTB, a *Agent, session string, token string) {
+func destroySession(t *testing.T, a *Agent, session string, token string) {
 	args := structs.SessionRequest{
 		Datacenter: a.config.Datacenter,
 		Op:         structs.SessionDestroy,
diff --git a/agent/session_endpoint_test.go b/agent/session_endpoint_test.go
index d44285f29bb78..ae5a492808d7c 100644
--- a/agent/session_endpoint_test.go
+++ b/agent/session_endpoint_test.go
@@ -15,14 +15,13 @@ import (
 
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
-	"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/stretchr/testify/require"
 )
 
-func verifySession(t testutil.TestingTB, a *TestAgent, want structs.Session) {
+func verifySession(t *testing.T, r *retry.R, a *TestAgent, want structs.Session) {
 	t.Helper()
 
 	args := &structs.SessionSpecificRequest{
@@ -31,10 +30,10 @@ func verifySession(t testutil.TestingTB, a *TestAgent, want structs.Session) {
 	}
 	var out structs.IndexedSessions
 	if err := a.RPC(context.Background(), "Session.Get", args, &out); err != nil {
-		t.Fatalf("err: %v", err)
+		r.Fatalf("err: %v", err)
 	}
 	if len(out.Sessions) != 1 {
-		t.Fatalf("bad: %#v", out.Sessions)
+		r.Fatalf("bad: %#v", out.Sessions)
 	}
 
 	// Make a copy so we don't modify the state store copy for an in-mem
@@ -124,7 +123,7 @@ func TestSessionCreate(t *testing.T) {
 			LockDelay:  20 * time.Second,
 			Behavior:   structs.SessionKeysRelease,
 		}
-		verifySession(r, a, want)
+		verifySession(t, r, a, want)
 	})
 }
 
@@ -189,7 +188,7 @@ func TestSessionCreate_NodeChecks(t *testing.T) {
 			LockDelay:     20 * time.Second,
 			Behavior:      structs.SessionKeysRelease,
 		}
-		verifySession(r, a, want)
+		verifySession(t, r, a, want)
 	})
 }
 
@@ -251,7 +250,7 @@ func TestSessionCreate_Delete(t *testing.T) {
 			LockDelay:  20 * time.Second,
 			Behavior:   structs.SessionKeysDelete,
 		}
-		verifySession(r, a, want)
+		verifySession(t, r, a, want)
 	})
 }
 
@@ -289,7 +288,7 @@ func TestSessionCreate_DefaultCheck(t *testing.T) {
 			LockDelay:  20 * time.Second,
 			Behavior:   structs.SessionKeysRelease,
 		}
-		verifySession(r, a, want)
+		verifySession(t, r, a, want)
 	})
 }
 
@@ -330,7 +329,7 @@ func TestSessionCreate_NoCheck(t *testing.T) {
 				LockDelay:  20 * time.Second,
 				Behavior:   structs.SessionKeysRelease,
 			}
-			verifySession(r, a, want)
+			verifySession(t, r, a, want)
 		})
 	})
 
@@ -360,7 +359,7 @@ func TestSessionCreate_NoCheck(t *testing.T) {
 				LockDelay:  20 * time.Second,
 				Behavior:   structs.SessionKeysRelease,
 			}
-			verifySession(r, a, want)
+			verifySession(t, r, a, want)
 		})
 	})
 
@@ -392,7 +391,7 @@ func TestSessionCreate_NoCheck(t *testing.T) {
 				LockDelay:  20 * time.Second,
 				Behavior:   structs.SessionKeysRelease,
 			}
-			verifySession(r, a, want)
+			verifySession(t, r, a, want)
 		})
 	})
 }
@@ -431,7 +430,7 @@ func makeTestSessionDelete(t *testing.T, srv *HTTPHandlers) string {
 	return sessResp.ID
 }
 
-func makeTestSessionTTL(t testutil.TestingTB, srv *HTTPHandlers, ttl string) string {
+func makeTestSessionTTL(t *testing.T, srv *HTTPHandlers, ttl string) string {
 	t.Helper()
 	// Create Session with TTL
 	body := bytes.NewBuffer(nil)
@@ -489,7 +488,7 @@ func TestSessionCustomTTL(t *testing.T) {
 	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
 
 	retry.Run(t, func(r *retry.R) {
-		id := makeTestSessionTTL(r, a.srv, ttl.String())
+		id := makeTestSessionTTL(t, a.srv, ttl.String())
 
 		req, _ := http.NewRequest("GET", "/v1/session/info/"+id, nil)
 		resp := httptest.NewRecorder()
diff --git a/agent/structs/acl.go b/agent/structs/acl.go
index d856ce0af2eaf..4d76dffa4e8e0 100644
--- a/agent/structs/acl.go
+++ b/agent/structs/acl.go
@@ -1084,21 +1084,6 @@ const (
 	//   },
 	// }
 	BindingRuleBindTypeTemplatedPolicy = "templated-policy"
-
-	// BindingRuleBindTypePolicy is the binding rule bind type that only allows
-	// the binding rule to function if a policy with the given name (BindName)
-	// exists at login-time. If it does the token that is created is directly
-	// linked to that policy like:
-	//
-	// &ACLToken{
-	//   ...other fields...
-	//   Policies: *ACLTokenPolicyLink{
-	//     { Name: "<computed BindName>" },
-	//   }
-	// }
-	//
-	// If it does not exist at login-time the rule is ignored.
-	BindingRuleBindTypePolicy = "policy"
 )
 
 type ACLBindingRule struct {
@@ -1121,7 +1106,6 @@ type ACLBindingRule struct {
 	//  - BindingRuleBindTypeService         = "service"
 	//  - BindingRuleBindTypeNode            = "node"
 	//  - BindingRuleBindTypeRole            = "role"
-	//  - BindingRuleBindTypePolicy          = "policy"
 	//  - BindingRuleBindTypeTemplatedPolicy = "templated-policy"
 	BindType string
 
diff --git a/agent/structs/structs.go b/agent/structs/structs.go
index 9b2685946cbeb..5a6fd95118920 100644
--- a/agent/structs/structs.go
+++ b/agent/structs/structs.go
@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"math/rand"
-	"os"
 	"reflect"
 	"regexp"
 	"sort"
@@ -228,9 +227,6 @@ const (
 
 var allowedConsulMetaKeysForMeshGateway = map[string]struct{}{MetaWANFederationKey: {}}
 
-// CEDowngrade indicates if we are in downgrading from ent to ce
-var CEDowngrade = os.Getenv("CONSUL_ENTERPRISE_DOWNGRADE_TO_CE") == "true"
-
 var (
 	NodeMaintCheckID = NewCheckID(NodeMaint, nil)
 )
diff --git a/agent/testagent.go b/agent/testagent.go
index 110c2f1804352..037bdc76da688 100644
--- a/agent/testagent.go
+++ b/agent/testagent.go
@@ -117,8 +117,8 @@ func NewTestAgentWithConfigFile(t *testing.T, hcl string, configFiles []string)
 func StartTestAgent(t *testing.T, a TestAgent) *TestAgent {
 	t.Helper()
 	retry.RunWith(retry.ThreeTimes(), t, func(r *retry.R) {
-		r.Helper()
-		if err := a.Start(r); err != nil {
+		t.Helper()
+		if err := a.Start(t); err != nil {
 			r.Fatal(err)
 		}
 	})
@@ -152,7 +152,7 @@ func TestConfigHCL(nodeID string) string {
 
 // Start starts a test agent. It returns an error if the agent could not be started.
 // If no error is returned, the caller must call Shutdown() when finished.
-func (a *TestAgent) Start(t testutil.TestingTB) error {
+func (a *TestAgent) Start(t *testing.T) error {
 	t.Helper()
 	if a.Agent != nil {
 		return fmt.Errorf("TestAgent already started")
@@ -442,10 +442,10 @@ func (r *retryShim) Name() string {
 // chance of port conflicts for concurrently executed test binaries.
 // 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 testutil.TestingTB, useHTTPS bool) string {
+func randomPortsSource(t *testing.T, useHTTPS bool) string {
 	var ports []int
 	retry.RunWith(retry.TwoSeconds(), t, func(r *retry.R) {
-		ports = freeport.GetN(r, 7)
+		ports = freeport.GetN(&retryShim{r, t.Name()}, 7)
 	})
 
 	var http, https int
diff --git a/agent/uiserver/dist/assets/chunk.143.db9b393ab5086aec385b.css b/agent/uiserver/dist/assets/chunk.143.30749b40e28f0c692295.css
similarity index 90%
rename from agent/uiserver/dist/assets/chunk.143.db9b393ab5086aec385b.css
rename to agent/uiserver/dist/assets/chunk.143.30749b40e28f0c692295.css
index 0f89c12af7f79..f066b66e7f30d 100644
--- a/agent/uiserver/dist/assets/chunk.143.db9b393ab5086aec385b.css
+++ b/agent/uiserver/dist/assets/chunk.143.30749b40e28f0c692295.css
@@ -1,3 +1,3 @@
 .tippy-box[data-placement^=top]>.tippy-svg-arrow{bottom:0}.tippy-box[data-placement^=top]>.tippy-svg-arrow:after,.tippy-box[data-placement^=top]>.tippy-svg-arrow>svg{top:16px;transform:rotate(180deg)}.tippy-box[data-placement^=bottom]>.tippy-svg-arrow{top:0}.tippy-box[data-placement^=bottom]>.tippy-svg-arrow>svg{bottom:16px}.tippy-box[data-placement^=left]>.tippy-svg-arrow{right:0}.tippy-box[data-placement^=left]>.tippy-svg-arrow:after,.tippy-box[data-placement^=left]>.tippy-svg-arrow>svg{transform:rotate(90deg);top:calc(50% - 3px);left:11px}.tippy-box[data-placement^=right]>.tippy-svg-arrow{left:0}.tippy-box[data-placement^=right]>.tippy-svg-arrow:after,.tippy-box[data-placement^=right]>.tippy-svg-arrow>svg{transform:rotate(-90deg);top:calc(50% - 3px);right:11px}.tippy-svg-arrow{width:16px;height:16px;fill:#333;text-align:initial}.tippy-svg-arrow,.tippy-svg-arrow>svg{position:absolute}
 
-/*# sourceMappingURL=chunk.143.db9b393ab5086aec385b.css-481e257b97fcf81c5a59ed89bec95f69.map*/
\ No newline at end of file
+/*# sourceMappingURL=chunk.143.30749b40e28f0c692295.css-68f4950fab34e7ff0e45d48a25a6e5f7.map*/
\ No newline at end of file
diff --git a/agent/uiserver/dist/assets/chunk.143.db9b393ab5086aec385b.js b/agent/uiserver/dist/assets/chunk.143.30749b40e28f0c692295.js
similarity index 97%
rename from agent/uiserver/dist/assets/chunk.143.db9b393ab5086aec385b.js
rename to agent/uiserver/dist/assets/chunk.143.30749b40e28f0c692295.js
index 9e26ff5adc0d2..991d9d511e66c 100644
--- a/agent/uiserver/dist/assets/chunk.143.db9b393ab5086aec385b.js
+++ b/agent/uiserver/dist/assets/chunk.143.30749b40e28f0c692295.js
@@ -7,8 +7,8 @@ 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")},657:(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(6604)})),n("@hashicorp/flight-icons/svg-sprite/svg-sprite-module",[],(function(){return t(2654)})),n("@lit/reactive-element",[],(function(){return t(8531)})),n("@xstate/fsm",[],(function(){return t(7440)})),n("a11y-dialog",[],(function(){return t(1413)})),n("base64-js",[],(function(){return t(8294)})),n("clipboard",[],(function(){return t(9079)})),n("d3-array",[],(function(){return t(5447)})),n("d3-scale",[],(function(){return t(5134)})),n("d3-scale-chromatic",[],(function(){return t(2331)})),n("d3-selection",[],(function(){return t(8740)})),n("d3-shape",[],(function(){return t(5043)})),n("dayjs",[],(function(){return t(2350)})),n("dayjs/plugin/calendar",[],(function(){return t(8888)})),n("dayjs/plugin/relativeTime",[],(function(){return t(2543)})),n("deepmerge",[],(function(){return t(3924)})),n("ember-focus-trap/modifiers/focus-trap.js",["@ember/modifier"],(function(){return t(3109)})),n("ember-keyboard/helpers/if-key.js",["@ember/component/helper","@ember/debug","@ember/utils"],(function(){return t(3481)})),n("ember-keyboard/helpers/on-key.js",["@ember/component/helper","@ember/debug","@ember/service"],(function(){return t(6415)})),n("ember-keyboard/modifiers/on-key.js",["@ember/application","@ember/modifier","@ember/destroyable","@ember/service","@ember/object","@ember/debug","@ember/utils"],(function(){return t(4146)})),n("ember-keyboard/services/keyboard.js",["@ember/service","@ember/application","@ember/object","@ember/runloop","@ember/debug","@ember/utils"],(function(){return t(9690)})),n("ember-modifier",["@ember/application","@ember/modifier","@ember/destroyable"],(function(){return t(2509)})),n("fast-memoize",[],(function(){return t(3276)})),n("flat",[],(function(){return t(2349)})),n("intl-messageformat",[],(function(){return t(5861)})),n("intl-messageformat-parser",[],(function(){return t(5011)})),n("mnemonist/multi-map",[],(function(){return t(5709)})),n("mnemonist/set",[],(function(){return t(2519)})),n("ngraph.graph",[],(function(){return t(6001)})),n("parse-duration",[],(function(){return t(89)})),n("pretty-ms",[],(function(){return t(9837)})),n("tippy.js",[],(function(){return t(9640)})),n("tippy.js/dist/svg-arrow.css",[],(function(){return t(2959)})),n("validated-changeset",[],(function(){return t(6885)})),n("wayfarer",[],(function(){return t(7116)})),n("_eai_dyn_dialog-polyfill",[],(function(){return t.e(121).then(t.bind(t,4121))})),void n("_eai_dyn_dialog-polyfill-css",[],(function(){return t.e(744).then(t.bind(t,7744))})))},1760:function(e,r){window._eai_r=require,window._eai_d=define}},o={}
+e.exports=require("@ember/utils")},3638:(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(6604)})),n("@hashicorp/flight-icons/svg-sprite/svg-sprite-module",[],(function(){return t(2654)})),n("@lit/reactive-element",[],(function(){return t(8531)})),n("@xstate/fsm",[],(function(){return t(7440)})),n("a11y-dialog",[],(function(){return t(1413)})),n("base64-js",[],(function(){return t(8294)})),n("clipboard",[],(function(){return t(9079)})),n("d3-array",[],(function(){return t(5447)})),n("d3-scale",[],(function(){return t(5134)})),n("d3-scale-chromatic",[],(function(){return t(2331)})),n("d3-selection",[],(function(){return t(8740)})),n("d3-shape",[],(function(){return t(5043)})),n("dayjs",[],(function(){return t(2350)})),n("dayjs/plugin/calendar",[],(function(){return t(8888)})),n("dayjs/plugin/relativeTime",[],(function(){return t(2543)})),n("deepmerge",[],(function(){return t(3924)})),n("ember-focus-trap/modifiers/focus-trap.js",["@ember/modifier"],(function(){return t(3109)})),n("ember-keyboard/helpers/if-key.js",["@ember/component/helper","@ember/debug","@ember/utils"],(function(){return t(3481)})),n("ember-keyboard/helpers/on-key.js",["@ember/component/helper","@ember/debug","@ember/service"],(function(){return t(6415)})),n("ember-keyboard/modifiers/on-key.js",["@ember/application","@ember/modifier","@ember/destroyable","@ember/service","@ember/object","@ember/debug","@ember/utils"],(function(){return t(4146)})),n("ember-keyboard/services/keyboard.js",["@ember/service","@ember/application","@ember/object","@ember/runloop","@ember/debug","@ember/utils"],(function(){return t(9690)})),n("ember-modifier",["@ember/application","@ember/modifier","@ember/destroyable"],(function(){return t(2509)})),n("fast-memoize",[],(function(){return t(3276)})),n("flat",[],(function(){return t(2349)})),n("intl-messageformat",[],(function(){return t(5861)})),n("intl-messageformat-parser",[],(function(){return t(5011)})),n("mnemonist/multi-map",[],(function(){return t(5709)})),n("mnemonist/set",[],(function(){return t(2519)})),n("ngraph.graph",[],(function(){return t(6001)})),n("parse-duration",[],(function(){return t(89)})),n("pretty-ms",[],(function(){return t(9837)})),n("tippy.js",[],(function(){return t(9640)})),n("tippy.js/dist/svg-arrow.css",[],(function(){return t(2959)})),n("validated-changeset",[],(function(){return t(6885)})),n("wayfarer",[],(function(){return t(7116)})),n("_eai_dyn_dialog-polyfill",[],(function(){return t.e(121).then(t.bind(t,4121))})),void n("_eai_dyn_dialog-polyfill-css",[],(function(){return t.e(744).then(t.bind(t,7744))})))},5428:function(e,r){window._eai_r=require,window._eai_d=define}},o={}
 function i(e){var r=o[e]
 if(void 0!==r)return r.exports
 var t=o[e]={exports:{}}
@@ -47,6 +47,6 @@ var r=(r,t)=>{var n,o,[u,a,s]=t,c=0
 if(u.some((r=>0!==e[r]))){for(n in a)i.o(a,n)&&(i.m[n]=a[n])
 if(s)var l=s(i)}for(r&&r(t);c<u.length;c++)o=u[c],i.o(e,o)&&e[o]&&e[o][0](),e[o]=0
 return i.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))})(),i.O(void 0,[924],(()=>i(1760)))
-var u=i.O(void 0,[924],(()=>i(657)))
+t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),i.O(void 0,[924],(()=>i(5428)))
+var u=i.O(void 0,[924],(()=>i(3638)))
 u=i.O(u),__ember_auto_import__=u})()
diff --git a/agent/uiserver/dist/assets/chunk.178.ee7822d83932910fd2ef.js b/agent/uiserver/dist/assets/chunk.178.8bf5466faa2ca779a58d.js
similarity index 91%
rename from agent/uiserver/dist/assets/chunk.178.ee7822d83932910fd2ef.js
rename to agent/uiserver/dist/assets/chunk.178.8bf5466faa2ca779a58d.js
index 2c477d5653f71..448c2c55bbd5a 100644
--- a/agent/uiserver/dist/assets/chunk.178.ee7822d83932910fd2ef.js
+++ b/agent/uiserver/dist/assets/chunk.178.8bf5466faa2ca779a58d.js
@@ -1,4 +1,4 @@
-var __ember_auto_import__;(()=>{var r,e={9265:()=>{},3642:()=>{},1760:function(r,e){window._eai_r=require,window._eai_d=define},1471:(r,e,t)=>{var o,n
+var __ember_auto_import__;(()=>{var r,e={9265:()=>{},3642:()=>{},5428:function(r,e){window._eai_r=require,window._eai_d=define},8783:(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(9542)})),o("lodash.last",[],(function(){return t(9644)})),o("lodash.omit",[],(function(){return t(1609)})),o("qunit",[],(function(){return t(2053)})),void o("yadda",[],(function(){return t(2216)})))}},t={}
 function o(r){var n=t[r]
 if(void 0!==n)return n.exports
@@ -16,6 +16,6 @@ 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,[778],(()=>o(1760)))
-var n=o.O(void 0,[778],(()=>o(1471)))
+t.forEach(e.bind(null,0)),t.push=e.bind(null,t.push.bind(t))})(),o.O(void 0,[778],(()=>o(5428)))
+var n=o.O(void 0,[778],(()=>o(8783)))
 n=o.O(n),__ember_auto_import__=n})()
diff --git a/agent/uiserver/dist/assets/consul-ui-88f8ddeb1f6a751c68c9f1de8978befa.js b/agent/uiserver/dist/assets/consul-ui-698b9ad7e3ebf8146d4d081130554ca9.js
similarity index 95%
rename from agent/uiserver/dist/assets/consul-ui-88f8ddeb1f6a751c68c9f1de8978befa.js
rename to agent/uiserver/dist/assets/consul-ui-698b9ad7e3ebf8146d4d081130554ca9.js
index 15e96ebf2e3a1..b0b71600a993f 100644
--- a/agent/uiserver/dist/assets/consul-ui-88f8ddeb1f6a751c68c9f1de8978befa.js
+++ b/agent/uiserver/dist/assets/consul-ui-698b9ad7e3ebf8146d4d081130554ca9.js
@@ -771,7 +771,7 @@ 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","@glimmer/component","@ember/object","@glimmer/tracking"],(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:"5vaQzlVR",block:'[[[1,"\\n"],[44,[[30,1]],[[[41,[28,[37,2],[[30,3,["length"]],1],null],[[[1,"    "],[8,[30,2,["Title"]],[[24,0,"consul-side-nav__selector-title"]],null,[["default"],[[[[1,[28,[35,3],["components.hashicorp-consul.side-nav.datacenters.title"],null]]],[]]]]],[1,"\\n    "],[8,[39,4],[[24,0,"consul-datacenter-selector"]],[["@list","@items","@item","@key","@icon","@placeholder","@description"],[[30,2],[28,[37,5],["Primary:desc","Local:desc","Name:asc",[30,3]],null],[30,4],"Name","server-cluster",[28,[37,3],["components.hashicorp-consul.side-nav.datacenters.placeholder"],null],[28,[37,3],["components.hashicorp-consul.side-nav.datacenters.description"],null]]],[["default"],[[[[1,"\\n      "],[8,[30,5,["Checkmark"]],[[24,0,"consul-datacenter-selector__item"]],[["@selected","@href","@isHrefExternal"],[[28,[37,6],[[30,4,["Name"]],[30,6,["Name"]]],null],[28,[37,7],["."],[["params"],[[28,[37,8],null,[["dc","partition","nspace"],[[30,6,["Name"]],[27],[52,[28,[37,2],[[30,7,["length"]],0],null],[30,7],[27]]]]]]]],false]],[["default"],[[[[1,"\\n        "],[10,1],[14,0,"consul-datacenter-selector__dc-name"],[12],[1,"\\n          "],[1,[30,6,["Name"]]],[1,"\\n\\n"],[41,[28,[37,9],[[30,6,["Local"]],[30,6,["Primary"]]],null],[[[1,"            "],[10,1],[14,0,"consul-datacenter-selector__badges"],[12],[1,"\\n"],[41,[30,6,["Primary"]],[[[1,"                "],[8,[39,10],null,[["@text"],["Primary"]],null],[1,"\\n"]],[]],null],[41,[30,6,["Local"]],[[[1,"                "],[8,[39,10],null,[["@text"],["Local"]],null],[1,"\\n"]],[]],null],[1,"            "],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[5,6]]]]],[1,"\\n"]],[]],[[[1,"    "],[8,[30,2,["Item"]],[[24,0,"consul-side-nav__datacenter"]],null,[["default"],[[[[1,"\\n      "],[8,[39,11],null,[["@name","@color"],["server-cluster","var(--token-form-control-disabled-foreground-color)"]],null],[1,"\\n      "],[8,[39,12],null,[["@size","@color"],["200","disabled"]],[["default"],[[[[1,[30,4,["Name"]]]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]]],[2]]]],["@list","SNL","@dcs","@dc","Dropdown","item","@nspace"],false,["let","if","gt","t","nav-selector","sort-by","eq","href-to","hash","or","hds/badge","flight-icon","hds/text/display"]]',moduleName:"consul-ui/components/consul/datacenter/selector/index.hbs",isStrictMode:!1})
+const s=(0,n.createTemplateFactory)({id:"xS/PrPr6",block:'[[[1,"\\n"],[44,[[30,1]],[[[41,[28,[37,2],[[30,3,["length"]],1],null],[[[1,"    "],[8,[30,2,["Title"]],[[24,0,"consul-side-nav__selector-title"]],null,[["default"],[[[[1,[28,[35,3],["components.hashicorp-consul.side-nav.datacenters.title"],null]]],[]]]]],[1,"\\n    "],[8,[39,4],[[24,0,"consul-datacenter-selector"]],[["@list","@items","@item","@key","@icon","@placeholder","@description"],[[30,2],[28,[37,5],["Primary:desc","Local:desc","Name:asc",[30,3]],null],[30,4],"Name","server-cluster",[28,[37,3],["components.hashicorp-consul.side-nav.datacenters.placeholder"],null],[28,[37,3],["components.hashicorp-consul.side-nav.datacenters.description"],null]]],[["default"],[[[[1,"\\n      "],[8,[30,5,["Dropdown","Checkmark"]],[[24,0,"consul-datacenter-selector__item"]],[["@selected","@href","@isHrefExternal"],[[28,[37,6],[[30,4,["Name"]],[30,5,["item","Name"]]],null],[28,[37,7],["."],[["params"],[[28,[37,8],null,[["dc","partition","nspace"],[[30,5,["item","Name"]],[27],[52,[28,[37,2],[[30,6,["length"]],0],null],[30,6],[27]]]]]]]],false]],[["default"],[[[[1,"\\n        "],[10,1],[14,0,"consul-datacenter-selector__dc-name"],[12],[1,"\\n          "],[1,[30,5,["item","Name"]]],[1,"\\n\\n"],[41,[28,[37,9],[[30,5,["item","Local"]],[30,5,["item","Primary"]]],null],[[[1,"            "],[10,1],[14,0,"consul-datacenter-selector__badges"],[12],[1,"\\n"],[41,[30,5,["item","Primary"]],[[[1,"                "],[8,[39,10],null,[["@text"],["Primary"]],null],[1,"\\n"]],[]],null],[41,[30,5,["item","Local"]],[[[1,"                "],[8,[39,10],null,[["@text"],["Local"]],null],[1,"\\n"]],[]],null],[1,"            "],[13],[1,"\\n"]],[]],null],[1,"        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[5]]]]],[1,"\\n"]],[]],[[[1,"    "],[8,[30,2,["Item"]],[[24,0,"consul-side-nav__datacenter"]],null,[["default"],[[[[1,"\\n      "],[8,[39,11],null,[["@name","@color"],["server-cluster","var(--token-form-control-disabled-foreground-color)"]],null],[1,"\\n      "],[8,[39,12],null,[["@size","@color"],["200","disabled"]],[["default"],[[[[1,[30,4,["Name"]]]],[]]]]],[1,"\\n    "]],[]]]]],[1,"\\n"]],[]]]],[2]]]],["@list","SNL","@dcs","@dc","Selector","@nspace"],false,["let","if","gt","t","nav-selector","sort-by","eq","href-to","hash","or","hds/badge","flight-icon","hds/text/display"]]',moduleName:"consul-ui/components/consul/datacenter/selector/index.hbs",isStrictMode:!1})
 let c=(o=class extends l.default{constructor(){var e,t,n,l
 super(...arguments),e=this,t="search",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})}get filteredItems(){const e=this.search.toLowerCase()
 return this.args.dcs.filter((t=>t.Name.toLowerCase().includes(e)))}onSearchInput(e){this.search=e.target.value}},a=u(o.prototype,"search",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),u(o.prototype,"onSearchInput",[r.action],Object.getOwnPropertyDescriptor(o.prototype,"onSearchInput"),o.prototype),o)
@@ -837,7 +837,7 @@ e.default=i})),define("consul-ui/components/consul/external-source/index",["expo
 const r=(0,n.createTemplateFactory)({id:"uG5lBIhe",block:'[[[1,"\\n"],[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:"HbjP3hiy",block:'[[[1,"\\n"],[44,[[30,1],[28,[37,1],["CONSUL_HCP_URL"],null]],[[[1,"  "],[1,[54,[[30,3]]]],[1,"\\n"],[41,[28,[37,4],[[30,2],[30,3]],null],[[[1,"    "],[8,[30,2,["BackLink"]],null,[["@text","@href","@isHrefExternal"],[[28,[37,5],["components.hashicorp-consul.side-nav.hcp"],null],[30,3],true]],null],[1,"\\n"]],[]],null]],[2,3]]]],["@list","SNL","hcpUrl"],false,["let","env","log","if","and","t"]]',moduleName:"consul-ui/components/consul/hcp/home/index.hbs",isStrictMode:!1})
+const r=(0,n.createTemplateFactory)({id:"72uvEJHV",block:'[[[1,"\\n"],[44,[[30,1],[28,[37,1],["CONSUL_HCP_URL"],null]],[[[41,[28,[37,3],[[30,2],[30,3]],null],[[[1,"    "],[8,[30,2,["BackLink"]],null,[["@text","@href","@isHrefExternal"],[[28,[37,4],["components.hashicorp-consul.side-nav.hcp"],null],[30,3],true]],null],[1,"\\n"]],[]],null]],[2,3]]]],["@list","SNL","hcpUrl"],false,["let","env","if","and","t"]]',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
@@ -1010,7 +1010,7 @@ e.default=i})),define("consul-ui/components/consul/nspace/search-bar/index",["ex
 const r=(0,n.createTemplateFactory)({id:"DelkwCZ4",block:'[[[1,"\\n"],[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:"5UTTzYK/",block:'[[[1,"\\n"],[41,[28,[37,1],[[28,[37,2],["use nspaces"],null],[28,[37,2],["choose nspaces"],null]],null],[[[1,"  "],[8,[39,3],null,[["@src","@onchange"],[[28,[37,4],["/${partition}/*/${dc}/namespaces",[28,[37,5],null,[["partition","dc"],[[30,1],[30,2,["Name"]]]]]],null],[28,[37,6],[[28,[37,7],[[30,3]],null]],null]]],null],[1,"\\n"],[44,[[30,4],[52,[30,5],[28,[37,5],null,[["Name"],[[30,5]]]],[28,[37,5],null,[["Name"],["default"]]]],[28,[37,9],["dc.nspaces",[30,2,["Name"]]],null]],[[[1,"    "],[8,[30,6,["Title"]],[[24,0,"consul-side-nav__selector-title"]],null,[["default"],[[[[1,[28,[35,10],["components.hashicorp-consul.side-nav.nspaces.title"],null]]],[]]]]],[1,"\\n    "],[8,[39,11],null,[["@list","@items","@item","@key","@icon","@placeholder","@footerLink","@footerLinkText"],[[30,4],[28,[37,12],["Name:asc",[28,[37,13],["DeletedAt",[30,9]],null]],null],[30,7],"Name","folder",[28,[37,10],["components.hashicorp-consul.side-nav.nspaces.placeholder"],null],[28,[37,14],["dc.nspaces",[30,2,["Name"]]],null],[28,[37,10],["components.hashicorp-consul.side-nav.nspaces.footer"],null]]],[["default"],[[[[1,"\\n      "],[8,[30,10,["Checkmark"]],null,[["@selected","@href","@isHrefExternal"],[[28,[37,15],[[30,7,["Name"]],[30,11,["Name"]]],null],[52,[30,8],[28,[37,14],["dc.services.index"],[["params"],[[28,[37,5],null,[["partition","nspace","dc"],[[52,[28,[37,16],[[30,1,["length"]],0],null],[30,1],[27]],[30,11,["Name"]],[30,2,["Name"]]]]]]]],[28,[37,14],["."],[["params"],[[28,[37,5],null,[["partition","nspace"],[[52,[28,[37,16],[[30,1,["length"]],0],null],[30,1],[27]],[30,11,["Name"]]]]]]]]],false]],[["default"],[[[[1,"\\n        "],[1,[30,11,["Name"]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[10,11]]]]],[1,"\\n"]],[6,7,8]]]],[]],null]],["@partition","@dc","@onchange","@list","@nspace","SNL","nspace","isManaging","@nspaces","Dropdown","item"],false,["if","and","can","data-source","uri","hash","fn","optional","let","is-href","t","nav-selector","sort-by","reject-by","href-to","eq","gt"]]',moduleName:"consul-ui/components/consul/nspace/selector/index.hbs",isStrictMode:!1})
+const r=(0,n.createTemplateFactory)({id:"ZHMEj55d",block:'[[[1,"\\n"],[41,[28,[37,1],[[28,[37,2],["use nspaces"],null],[28,[37,2],["choose nspaces"],null]],null],[[[44,[[30,1],[52,[30,2],[28,[37,4],null,[["Name"],[[30,2]]]],[28,[37,4],null,[["Name"],["default"]]]],[28,[37,5],["dc.nspaces",[30,3,["Name"]]],null]],[[[1,"    "],[8,[30,4,["Title"]],[[24,0,"consul-side-nav__selector-title"]],null,[["default"],[[[[1,[28,[35,6],["components.hashicorp-consul.side-nav.nspaces.title"],null]]],[]]]]],[1,"\\n    "],[8,[39,7],null,[["@list","@items","@item","@key","@icon","@placeholder","@footerLink","@footerLinkText"],[[30,1],[28,[37,8],["Name:asc",[28,[37,9],["DeletedAt",[30,7]],null]],null],[30,5],"Name","folder",[28,[37,6],["components.hashicorp-consul.side-nav.nspaces.placeholder"],null],[28,[37,10],["dc.nspaces",[30,3,["Name"]]],null],[28,[37,6],["components.hashicorp-consul.side-nav.nspaces.footer"],null]]],[["default"],[[[[1,"\\n      "],[8,[30,8,["Data"]],null,null,[["default"],[[[[1,"\\n        "],[8,[39,11],null,[["@src","@loading","@onchange"],[[28,[37,12],["/${partition}/*/${dc}/namespaces",[28,[37,4],null,[["partition","dc"],[[30,9],[30,3,["Name"]]]]]],null],"lazy",[28,[37,13],[[28,[37,14],[[30,10]],null]],null]]],null],[1,"\\n      "]],[]]]]],[1,"\\n      "],[8,[30,8,["Dropdown","Checkmark"]],null,[["@selected","@href","@isHrefExternal"],[[28,[37,15],[[30,5,["Name"]],[30,8,["item","Name"]]],null],[28,[37,10],["dc.services.index"],[["params"],[[28,[37,4],null,[["partition","nspace","peer","dc"],[[52,[28,[37,16],[[30,9,["length"]],0],null],[30,9],[27]],[30,8,["item","Name"]],[27],[30,3,["Name"]]]]]]]],false]],[["default"],[[[[1,"\\n        "],[1,[30,8,["item","Name"]]],[1,"\\n      "]],[]]]]],[1,"\\n    "]],[8]]]]],[1,"\\n"]],[4,5,6]]]],[]],null]],["@list","@nspace","@dc","SNL","nspace","isManaging","@nspaces","Selector","@partition","@onchange"],false,["if","and","can","let","hash","is-href","t","nav-selector","sort-by","reject-by","href-to","data-source","uri","fn","optional","eq","gt"]]',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:"IFfwt6JG",block:'[[[1,"\\n"],[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})
@@ -1025,7 +1025,7 @@ e.default=i})),define("consul-ui/components/consul/partition/search-bar/index",[
 const r=(0,n.createTemplateFactory)({id:"IuHkFeus",block:'[[[1,"\\n"],[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:"2skwmygl",block:'[[[1,"\\n"],[44,[[30,1],[52,[30,2],[28,[37,2],null,[["Name"],[[30,2]]]],[28,[37,2],null,[["Name"],["default"]]]],[28,[37,3],["dc.partitions",[30,3,["Name"]]],null],[28,[37,4],["choose partitions"],[["dc"],[[30,3]]]]],[[[1,"  "],[8,[39,5],null,[["@src","@onchange"],[[28,[37,6],["/*/*/${dc}/partitions",[28,[37,2],null,[["dc"],[[30,3,["Name"]]]]]],null],[28,[37,7],[[28,[37,8],[[30,8]],null]],null]]],null],[1,"\\n  "],[8,[30,4,["Title"]],[[24,0,"consul-side-nav__selector-title"]],null,[["default"],[[[[1,[28,[35,9],["components.hashicorp-consul.side-nav.partitions.title"],null]]],[]]]]],[1,"\\n  "],[8,[39,10],null,[["@list","@items","@item","@key","@icon","@placeholder","@footerLink","@footerLinkText","@disabled"],[[30,1],[28,[37,11],["Name:asc",[28,[37,12],["DeletedAt",[30,9]],null]],null],[30,5],"Name","users",[28,[37,9],["components.hashicorp-consul.side-nav.partitions.placeholder"],null],[28,[37,13],["dc.partitions",[30,3,["Name"]]],null],[28,[37,9],["components.hashicorp-consul.side-nav.partitions.footer"],null],[28,[37,14],[[30,7]],null]]],[["default"],[[[[1,"\\n"],[41,[30,7],[[[1,"      "],[8,[30,10,["Checkmark"]],null,[["@selected","@href","@isHrefExternal"],[[28,[37,15],[[30,5,["Name"]],[30,11,["Name"]]],null],[52,[30,11,["href"]],[30,11,["href"]],[52,[30,6],[28,[37,13],["dc.services.index"],[["params"],[[28,[37,2],null,[["partition","nspace","dc"],[[30,11,["Name"]],[27],[30,3,["Name"]]]]]]]],[28,[37,13],["."],[["params"],[[28,[37,2],null,[["partition","nspace"],[[30,11,["Name"]],[27]]]]]]]]],false]],[["default"],[[[[1,"\\n        "],[1,[30,11,["Name"]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]],null],[1,"  "]],[10,11]]]]],[1,"\\n"]],[4,5,6,7]]]],["@list","@partition","@dc","SNL","partition","isManaging","canChoose","@onchange","@partitions","Dropdown","item"],false,["let","if","hash","is-href","can","data-source","uri","fn","optional","t","nav-selector","sort-by","reject-by","href-to","not","eq"]]',moduleName:"consul-ui/components/consul/partition/selector/index.hbs",isStrictMode:!1})
+const r=(0,n.createTemplateFactory)({id:"kdZOlgGd",block:'[[[1,"\\n"],[44,[[30,1],[52,[30,2],[28,[37,2],null,[["Name"],[[30,2]]]],[28,[37,2],null,[["Name"],["default"]]]],[28,[37,3],["dc.partitions",[30,3,["Name"]]],null],[28,[37,4],["choose partitions"],[["dc"],[[30,3]]]]],[[[1,"  "],[8,[30,4,["Title"]],[[24,0,"consul-side-nav__selector-title"]],null,[["default"],[[[[1,[28,[35,5],["components.hashicorp-consul.side-nav.partitions.title"],null]]],[]]]]],[1,"\\n  "],[8,[39,6],null,[["@list","@items","@item","@key","@icon","@placeholder","@footerLink","@footerLinkText","@disabled"],[[30,1],[28,[37,7],["Name:asc",[28,[37,8],["DeletedAt",[30,8]],null]],null],[30,5],"Name","users",[28,[37,5],["components.hashicorp-consul.side-nav.partitions.placeholder"],null],[28,[37,9],["dc.partitions",[30,3,["Name"]]],null],[28,[37,5],["components.hashicorp-consul.side-nav.partitions.footer"],null],[28,[37,10],[[30,7]],null]]],[["default"],[[[[1,"\\n    "],[8,[30,9,["Data"]],null,null,[["default"],[[[[1,"\\n      "],[8,[39,11],null,[["@src","@loading","@onchange"],[[28,[37,12],["/*/*/${dc}/partitions",[28,[37,2],null,[["dc"],[[30,3,["Name"]]]]]],null],"lazy",[28,[37,13],[[28,[37,14],[[30,10]],null]],null]]],null],[1,"\\n    "]],[]]]]],[1,"\\n"],[41,[30,7],[[[1,"      "],[8,[30,9,["Dropdown","Checkmark"]],null,[["@selected","@href","@isHrefExternal"],[[28,[37,15],[[30,5,["Name"]],[30,9,["item","Name"]]],null],[52,[30,9,["item","href"]],[30,9,["item","href"]],[28,[37,9],["dc.services.index"],[["params"],[[28,[37,2],null,[["partition","nspace","peer","dc"],[[30,9,["item","Name"]],[27],[27],[30,3,["Name"]]]]]]]]],false]],[["default"],[[[[1,"\\n        "],[1,[30,9,["item","Name"]]],[1,"\\n      "]],[]]]]],[1,"\\n"]],[]],null],[1,"  "]],[9]]]]],[1,"\\n"]],[4,5,6,7]]]],["@list","@partition","@dc","SNL","partition","isManaging","canChoose","@partitions","Selector","@onchange"],false,["let","if","hash","is-href","can","t","nav-selector","sort-by","reject-by","href-to","not","data-source","uri","fn","optional","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:"TNoxeoLi",block:'[[[1,"\\n"],[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","consul-copy-button"]]',moduleName:"consul-ui/components/consul/peer/address/list/index.hbs",isStrictMode:!1})
@@ -1115,9 +1115,12 @@ return(null===(t=e.Service)||void 0===t||null===(n=t.Meta)||void 0===n?void 0:n[
 const r=(0,n.createTemplateFactory)({id:"VjdzBiZi",block:'[[[1,"\\n"],[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:"DY2ljV0F",block:'[[[1,"\\n"],[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})
+const r=(0,n.createTemplateFactory)({id:"xPCwneUJ",block:'[[[1,"\\n"],[8,[39,0],[[24,0,"consul-service-list"],[17,1]],[["@items","@linkable"],[[30,2],"linkable service"]],[["default"],[[[[1,"\\n  "],[8,[39,1],null,[["@item","@partition","@nspace"],[[30,3],[30,5],[30,6]]],null],[1,"\\n"]],[3,4]]]]],[1,"\\n"]],["&attrs","@items","item","index","@partition","@nspace"],false,["list-collection","consul/service/list/item"]]',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
+e.default=i})),define("consul-ui/components/consul/service/list/item/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:"cAe7geUl",block:'[[[1,"\\n"],[8,[39,0],null,[["@name"],["header"]],[["default"],[[[[1,"\\n  "],[10,"dl"],[15,0,[30,1,["MeshStatus"]]],[12],[1,"\\n    "],[10,"dt"],[12],[1,"\\n      Health\\n    "],[13],[1,"\\n    "],[11,"dd"],[4,[38,1],[[30,1,["healthTooltipText"]]],null],[12],[13],[1,"\\n  "],[13],[1,"\\n"],[41,[28,[37,3],[[30,1,["InstanceCount"]],0],null],[[[1,"    "],[10,3],[15,6,[28,[37,4],["dc.services.show.index",[30,1,["Name"]]],[["params"],[[30,0,["linkParams"]]]]]],[12],[1,"\\n      "],[1,[30,1,["Name"]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[1,"    "],[10,2],[12],[1,"\\n      "],[1,[30,1,["Name"]]],[1,"\\n    "],[13],[1,"\\n"]],[]]]],[]]]]],[1,"\\n"],[8,[39,0],null,[["@name"],["details"]],[["default"],[[[[1,"\\n  "],[8,[39,5],null,[["@item"],[[30,1]]],null],[1,"\\n  "],[8,[39,6],null,[["@item"],[[30,1]]],null],[1,"\\n"],[41,[28,[37,7],[[28,[37,8],[[30,1,["InstanceCount"]],0],null],[28,[37,7],[[28,[37,8],[[30,1,["Kind"]],"terminating-gateway"],null],[28,[37,8],[[30,1,["Kind"]],"ingress-gateway"],null]],null]],null],[[[1,"    "],[10,1],[12],[1,"\\n      "],[1,[28,[35,9],[[30,1,["InstanceCount"]]],null]],[1,"\\n      "],[1,[28,[35,10],[[30,1,["InstanceCount"]],"instance"],[["without-count"],[true]]]],[1,"\\n    "],[13],[1,"\\n"]],[]],null],[41,[51,[30,2]],[[[1,"    "],[8,[39,12],null,[["@item","@nspace","@partition"],[[30,1],[30,3],[30,4]]],null],[1,"\\n"]],[]],null],[41,[28,[37,13],[[30,1,["Kind"]],"terminating-gateway"],null],[[[1,"    "],[10,1],[12],[1,"\\n      "],[1,[28,[35,9],[[30,1,["GatewayConfig","AssociatedServiceCount"]]],null]],[1,"\\n      "],[1,[28,[35,10],[[30,1,["GatewayConfig","AssociatedServiceCount"]],"linked service"],[["without-count"],[true]]]],[1,"\\n    "],[13],[1,"\\n"]],[]],[[[41,[28,[37,13],[[30,1,["Kind"]],"ingress-gateway"],null],[[[1,"    "],[10,1],[12],[1,"\\n      "],[1,[28,[35,9],[[30,1,["GatewayConfig","AssociatedServiceCount"]]],null]],[1,"\\n      "],[1,[28,[35,10],[[30,1,["GatewayConfig","AssociatedServiceCount"]],"upstream"],[["without-count"],[true]]]],[1,"\\n    "],[13],[1,"\\n  "]],[]],null]],[]]],[41,[28,[37,14],[[30,1,["ConnectedWithGateway"]],[30,1,["ConnectedWithProxy"]]],null],[[[1,"    "],[10,"dl"],[14,0,"mesh"],[12],[1,"\\n      "],[10,"dt"],[12],[1,"\\n        "],[8,[39,1],null,null,[["default"],[[[[1,"\\n          This service uses a proxy for the Consul service mesh\\n        "]],[]]]]],[1,"\\n      "],[13],[1,"\\n"],[41,[28,[37,7],[[30,1,["ConnectedWithGateway"]],[30,1,["ConnectedWithProxy"]]],null],[[[1,"        "],[10,"dd"],[12],[1,"\\n          in service mesh with proxy and gateway\\n        "],[13],[1,"\\n"]],[]],[[[41,[30,1,["ConnectedWithProxy"]],[[[1,"        "],[10,"dd"],[12],[1,"\\n          in service mesh with proxy\\n        "],[13],[1,"\\n"]],[]],[[[41,[30,1,["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,15],null,[["@item"],[[30,1]]],null],[1,"\\n"]],[]]]]]],["@item","@isPeerDetail","@nspace","@partition"],false,["block-slot","tooltip","if","gt","href-to","consul/kind","consul/external-source","and","not-eq","format-number","pluralize","unless","consul/bucket/list","eq","or","tag-list"]]',moduleName:"consul-ui/components/consul/service/list/item/index.hbs",isStrictMode:!1})
+class i extends l.default{get linkParams(){const e={}
+return this.args.item.Partition&&this.args.partition!==this.args.item.Partition?(e.partition=this.args.item.Partition,e.nspace=this.args.Namespace):this.args.item.Namespace&&this.args.nspace!==this.args.item.Namespace&&(e.nspace=this.args.item.Namespace),this.args.item.PeerName&&(e.peer=this.args.item.PeerName),e}}e.default=i,(0,t.setComponentTemplate)(r,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:"4sJ6oMs1",block:'[[[1,"\\n"],[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
@@ -1198,11 +1201,11 @@ try{this.form=this.builder.form(this.type)}catch(e){}},willRender:function(){thi
 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
+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:"FfdegZAa",block:'[[[1,"\\n"],[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.send("change",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
+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:"hxJqQ0VJ",block:'[[[1,"\\n"],[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")
@@ -1311,18 +1314,18 @@ 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:"QsBvWU14",block:'[[[1,"\\n"],[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:"xnhilElo",block:'[[[1,"\\n"],[8,[39,0],[[24,0,"hashicorp-consul"],[17,1]],null,[["notifications","side-nav","main"],[[[[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,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-out"],null]],[1,"\\n"]],[]],[[[1,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-out-error"],null]],[1,"\\n"]],[]]]],[]],[[[41,[28,[37,9],[[30,5],"authorize"],null],[[[41,[28,[37,9],[[30,4],"success"],null],[[[1,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-in"],null]],[1,"\\n"]],[]],[[[1,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-in-error"],null]],[1,"\\n"]],[]]]],[]],[[[41,[28,[37,12],[[28,[37,9],[[30,5],"use"],null],[28,[37,9],[[30,3,["model"]],"token"],null]],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"]],"intention"],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"]],"role"],null],[[[1,"                    "],[8,[39,15],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,16],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    "],[8,[39,17],[[24,0,"consul-side-nav"]],[["@isResponsive"],[false]],[["header","body","footer"],[[[[1,"\\n        "],[8,[39,18],null,null,[["logo","actions"],[[[[1,"\\n            "],[8,[39,19],null,[["@icon","@ariaLabel","@href","@isHrefExternal"],["consul-color","Consul",[28,[37,20],["index"],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false]],null],[1,"\\n          "]],[]],[[[1,"\\n            "],[8,[39,22],[[24,0,"hds-side-nav__dropdown"]],[["@listPosition"],["bottom-left"]],[["default"],[[[[1,"\\n              "],[8,[30,7,["ToggleIcon"]],null,[["@icon","@text"],["help","Help & Support menu"]],null],[1,"\\n              "],[8,[39,23],null,[["@dropdown"],[[30,7]]],null],[1,"\\n              "],[8,[30,7,["Interactive"]],null,[["@href","@isHrefExternal","@text"],[[28,[37,24],["CONSUL_DOCS_URL"],null],true,[28,[37,11],["components.hashicorp-consul.side-nav.support-menu.docs"],null]]],null],[1,"\\n              "],[8,[30,7,["Interactive"]],null,[["@href","@isHrefExternal","@text"],[[28,[37,25],[[28,[37,24],["CONSUL_DOCS_LEARN_URL"],null],"/consul"],null],true,[28,[37,11],["components.hashicorp-consul.side-nav.support-menu.tutorials"],null]]],null],[1,"\\n              "],[8,[30,7,["Interactive"]],null,[["@href","@isHrefExternal","@text"],[[28,[37,24],["CONSUL_REPO_ISSUES_URL"],null],true,[28,[37,11],["components.hashicorp-consul.side-nav.support-menu.feedback"],null]]],null],[1,"\\n            "]],[7]]]]],[1,"\\n\\n            "],[8,[39,26],null,[["@dc","@partition","@nspace","@onchange"],[[30,8],[30,9],[30,10],[30,11]]],[["default"],[[[[1,"\\n              "],[8,[39,27],null,[["@target","@name","@value"],[[30,0],"tokenSelector",[30,12]]],null],[1,"\\n            "]],[12]]]]],[1,"\\n          "]],[]]]]],[1,"\\n      "]],[]],[[[1,"\\n        "],[8,[39,28],[[24,0,"hds-side-nav-hide-when-minimized consul-side-nav__selector-group"]],null,[["default"],[[[[1,"\\n          "],[8,[39,29],null,[["@list"],[[30,13]]],null],[1,"\\n          "],[8,[39,30],null,[["@list","@dc","@partition","@nspace","@dcs"],[[30,13],[30,8],[30,9],[30,10],[30,14]]],null],[1,"\\n\\n          "],[8,[39,31],null,[["@dc","@partition","@nspace","@partitions","@list","@onchange"],[[30,8],[30,9],[30,10],[30,0,["partitions"]],[30,13],[28,[37,32],[[30,0],[28,[37,33],[[30,0,["partitions"]]],null]],[["value"],["data"]]]]],null],[1,"\\n          "],[8,[39,34],null,[["@list","@dc","@partition","@nspace","@nspaces","@onchange"],[[30,13],[30,8],[30,9],[30,10],[30,0,["nspaces"]],[28,[37,32],[[30,0],[28,[37,33],[[30,0,["nspaces"]]],null]],[["value"],["data"]]]]],null],[1,"\\n        "]],[13]]]]],[1,"\\n        "],[8,[39,28],[[24,0,"hds-side-nav-hide-when-minimized"]],null,[["default"],[[[[1,"\\n"],[41,[28,[37,35],["access overview"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@route","@models","@query","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.overview"],null],"dc.show",[28,[37,36],[[30,8,["Name"]]],null],[28,[37,21],null,[["peer"],[[27]]]],[28,[37,37],["dc.show",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read services"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.services"],null],[28,[37,20],["dc.services",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.services",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read nodes"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.nodes"],null],[28,[37,20],["dc.nodes",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.nodes",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read kv"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.kv"],null],[28,[37,20],["dc.kv",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.kv",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read intentions"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.intentions"],null],[28,[37,20],["dc.intentions",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.intentions",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[1,"\\n          "],[8,[39,38],null,[["@dc","@partition","@nspace","@list"],[[30,8],[30,9],[30,10],[30,15]]],null],[1,"\\n          "],[8,[39,39],null,[["@dc","@partition","@nspace","@list"],[[30,8],[30,9],[30,10],[30,15]]],null],[1,"\\n        "]],[15]]]]],[1,"\\n      "]],[]],[[[1,"\\n        "],[10,"footer"],[14,"role","contentinfo"],[12],[1,"\\n          "],[8,[39,40],[[24,0,"hds-side-nav-hide-when-minimized"]],[["@size","@color"],["100","disabled"]],[["default"],[[[[1,"\\n            "],[1,[28,[35,11],["components.hashicorp-consul.side-nav.footer"],[["version"],[[28,[37,24],["CONSUL_VERSION"],null]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[2,[28,[37,25],["\x3c!-- ",[28,[37,24],["CONSUL_GIT_SHA"],null],"--\x3e"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n  "]],[]],[[[1,"\\n    "],[18,16,[[28,[37,21],null,[["login"],[[52,[30,0,["tokenSelector"]],[30,0,["tokenSelector"]],[28,[37,21],null,[["open","close"],[[27],[27]]]]]]]]]],[1,"\\n  "]],[]]]]]],["&attrs","app","flash","status","type","T","dd","@dc","@partition","@nspace","@onchange","selector","SNL","@dcs","SNL","&default"],false,["app","each","-track-array","flashMessages","sub","if","let","lowercase","hds/toast","eq","capitalize","t","or","consul/token/notifications","consul/intention/notifications","consul/role/notifications","consul/policy/notifications","hds/side-nav","hds/side-nav/header","hds/side-nav/header/home-link","href-to","hash","hds/dropdown","debug/navigation","env","concat","consul/token/selector","ref","hds/side-nav/list","consul/hcp/home","consul/datacenter/selector","consul/partition/selector","action","mut","consul/nspace/selector","can","array","is-href","consul/acl/selector","consul/peer/selector","hds/text/display","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/accordion/index",["exports","@hashicorp/design-system-components/components/hds/accordion/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/accordion/item/button",["exports","@hashicorp/design-system-components/components/hds/accordion/item/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/accordion/item/index",["exports","@hashicorp/design-system-components/components/hds/accordion/item/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/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/app-footer/copyright",["exports","@hashicorp/design-system-components/components/hds/app-footer/copyright"],(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/app-footer/index",["exports","@hashicorp/design-system-components/components/hds/app-footer/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/app-footer/item",["exports","@hashicorp/design-system-components/components/hds/app-footer/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/app-footer/legal-links",["exports","@hashicorp/design-system-components/components/hds/app-footer/legal-links"],(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/app-footer/link",["exports","@hashicorp/design-system-components/components/hds/app-footer/link"],(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/app-footer/status-link",["exports","@hashicorp/design-system-components/components/hds/app-footer/status-link"],(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/app-frame/index",["exports","@hashicorp/design-system-components/components/hds/app-frame/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/app-frame/parts/footer",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/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/app-frame/parts/header",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/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/app-frame/parts/main",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/main"],(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/app-frame/parts/modals",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/modals"],(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/app-frame/parts/sidebar",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/sidebar"],(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/application-state/body",["exports","@hashicorp/design-system-components/components/hds/application-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/application-state/footer",["exports","@hashicorp/design-system-components/components/hds/application-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/application-state/header",["exports","@hashicorp/design-system-components/components/hds/application-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/application-state/index",["exports","@hashicorp/design-system-components/components/hds/application-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/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/copy/button/index",["exports","@hashicorp/design-system-components/components/hds/copy/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/copy/snippet/index",["exports","@hashicorp/design-system-components/components/hds/copy/snippet/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/disclosure-primitive/index",["exports","@hashicorp/design-system-components/components/hds/disclosure-primitive/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/footer",["exports","@hashicorp/design-system-components/components/hds/dropdown/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/dropdown/header",["exports","@hashicorp/design-system-components/components/hds/dropdown/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/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/checkbox",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/checkbox"],(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/checkmark",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/checkmark"],(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/radio",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/radio"],(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/chevron",["exports","@hashicorp/design-system-components/components/hds/dropdown/toggle/chevron"],(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/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/footer",["exports","@hashicorp/design-system-components/components/hds/flyout/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/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/file-input/base",["exports","@hashicorp/design-system-components/components/hds/form/file-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/file-input/field",["exports","@hashicorp/design-system-components/components/hds/form/file-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/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/masked-input/base",["exports","@hashicorp/design-system-components/components/hds/form/masked-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/masked-input/field",["exports","@hashicorp/design-system-components/components/hds/form/masked-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/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/form/visibility-toggle/index",["exports","@hashicorp/design-system-components/components/hds/form/visibility-toggle/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/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/menu-primitive/index",["exports","@hashicorp/design-system-components/components/hds/menu-primitive/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/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/page-header/actions",["exports","@hashicorp/design-system-components/components/hds/page-header/actions"],(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/page-header/badges",["exports","@hashicorp/design-system-components/components/hds/page-header/badges"],(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/page-header/description",["exports","@hashicorp/design-system-components/components/hds/page-header/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/page-header/index",["exports","@hashicorp/design-system-components/components/hds/page-header/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/page-header/subtitle",["exports","@hashicorp/design-system-components/components/hds/page-header/subtitle"],(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/page-header/title",["exports","@hashicorp/design-system-components/components/hds/page-header/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/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/reveal/index",["exports","@hashicorp/design-system-components/components/hds/reveal/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/reveal/toggle/button",["exports","@hashicorp/design-system-components/components/hds/reveal/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/segmented-group/index",["exports","@hashicorp/design-system-components/components/hds/segmented-group/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/separator/index",["exports","@hashicorp/design-system-components/components/hds/separator/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/side-nav/base",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/side-nav/header/home-link",["exports","@hashicorp/design-system-components/components/hds/side-nav/header/home-link"],(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/side-nav/header/icon-button",["exports","@hashicorp/design-system-components/components/hds/side-nav/header/icon-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/side-nav/header/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/side-nav/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/side-nav/list/back-link",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/back-link"],(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/side-nav/list/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/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/side-nav/list/item",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/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/side-nav/list/link",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/link"],(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/side-nav/list/title",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/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/side-nav/portal/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/portal/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/side-nav/portal/target",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/hds/side-nav/toggle-button",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/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/text/body",["exports","@hashicorp/design-system-components/components/hds/text/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/text/code",["exports","@hashicorp/design-system-components/components/hds/text/code"],(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/text/display",["exports","@hashicorp/design-system-components/components/hds/text/display"],(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/text/index",["exports","@hashicorp/design-system-components/components/hds/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/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/tooltip-button/index",["exports","@hashicorp/design-system-components/components/hds/tooltip-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/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
+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,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
+const p=(0,n.createTemplateFactory)({id:"aqN2qduu",block:'[[[1,"\\n"],[8,[39,0],[[24,0,"hashicorp-consul"],[17,1]],null,[["notifications","side-nav","main"],[[[[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,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-out"],null]],[1,"\\n"]],[]],[[[1,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-out-error"],null]],[1,"\\n"]],[]]]],[]],[[[41,[28,[37,9],[[30,5],"authorize"],null],[[[41,[28,[37,9],[[30,4],"success"],null],[[[1,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-in"],null]],[1,"\\n"]],[]],[[[1,"                    "],[1,[28,[35,11],["components.hashicorp-consul.notifications.logged-in-error"],null]],[1,"\\n"]],[]]]],[]],[[[41,[28,[37,12],[[28,[37,9],[[30,5],"use"],null],[28,[37,9],[[30,3,["model"]],"token"],null]],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"]],"intention"],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"]],"role"],null],[[[1,"                    "],[8,[39,15],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,16],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    "],[8,[39,17],[[24,0,"consul-side-nav"]],[["@isResponsive"],[false]],[["header","body","footer"],[[[[1,"\\n        "],[8,[39,18],null,null,[["logo","actions"],[[[[1,"\\n            "],[8,[39,19],null,[["@icon","@ariaLabel","@href","@isHrefExternal"],["consul-color","Consul",[28,[37,20],["index"],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false]],null],[1,"\\n          "]],[]],[[[1,"\\n            "],[8,[39,22],[[24,0,"hds-side-nav__dropdown"]],[["@listPosition"],["bottom-left"]],[["default"],[[[[1,"\\n              "],[8,[30,7,["ToggleIcon"]],null,[["@icon","@text"],["help","Help & Support menu"]],null],[1,"\\n              "],[8,[39,23],null,[["@dropdown"],[[30,7]]],null],[1,"\\n              "],[8,[30,7,["Interactive"]],null,[["@href","@isHrefExternal","@text"],[[28,[37,24],["CONSUL_DOCS_URL"],null],true,[28,[37,11],["components.hashicorp-consul.side-nav.support-menu.docs"],null]]],null],[1,"\\n              "],[8,[30,7,["Interactive"]],null,[["@href","@isHrefExternal","@text"],[[28,[37,25],[[28,[37,24],["CONSUL_DOCS_LEARN_URL"],null],"/consul"],null],true,[28,[37,11],["components.hashicorp-consul.side-nav.support-menu.tutorials"],null]]],null],[1,"\\n              "],[8,[30,7,["Interactive"]],null,[["@href","@isHrefExternal","@text"],[[28,[37,24],["CONSUL_REPO_ISSUES_URL"],null],true,[28,[37,11],["components.hashicorp-consul.side-nav.support-menu.feedback"],null]]],null],[1,"\\n            "]],[7]]]]],[1,"\\n\\n            "],[8,[39,26],null,[["@dc","@partition","@nspace","@onchange"],[[30,8],[30,9],[30,10],[30,11]]],[["default"],[[[[1,"\\n              "],[8,[39,27],null,[["@target","@name","@value"],[[30,0],"tokenSelector",[30,12]]],null],[1,"\\n            "]],[12]]]]],[1,"\\n          "]],[]]]]],[1,"\\n      "]],[]],[[[1,"\\n        "],[8,[39,28],[[24,0,"hds-side-nav-hide-when-minimized consul-side-nav__selector-group"]],null,[["default"],[[[[1,"\\n          "],[8,[39,29],null,[["@list"],[[30,13]]],null],[1,"\\n          "],[8,[39,30],null,[["@list","@dc","@partition","@nspace","@dcs"],[[30,13],[30,8],[30,9],[30,10],[30,14]]],null],[1,"\\n\\n          "],[8,[39,31],null,[["@dc","@partition","@nspace","@partitions","@list","@onchange"],[[30,8],[30,9],[30,10],[30,0,["partitions"]],[30,13],[28,[37,32],[[30,0],[28,[37,33],[[30,0,["partitions"]]],null]],[["value"],["data"]]]]],null],[1,"\\n          "],[8,[39,34],null,[["@list","@dc","@partition","@nspace","@nspaces","@onchange"],[[30,13],[30,8],[30,9],[30,10],[30,0,["nspaces"]],[28,[37,32],[[30,0],[28,[37,33],[[30,0,["nspaces"]]],null]],[["value"],["data"]]]]],null],[1,"\\n        "]],[13]]]]],[1,"\\n        "],[8,[39,28],[[24,0,"hds-side-nav-hide-when-minimized"]],null,[["default"],[[[[1,"\\n"],[41,[28,[37,35],["access overview"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@route","@models","@query","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.overview"],null],"dc.show",[28,[37,36],[[30,8,["Name"]]],null],[28,[37,21],null,[["peer"],[[27]]]],[28,[37,37],["dc.show",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read services"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.services"],null],[28,[37,20],["dc.services",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.services",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read nodes"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.nodes"],null],[28,[37,20],["dc.nodes",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.nodes",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read kv"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.kv"],null],[28,[37,20],["dc.kv",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.kv",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[41,[28,[37,35],["read intentions"],null],[[[1,"            "],[8,[30,15,["Link"]],null,[["@text","@href","@isHrefExternal","@isActive"],[[28,[37,11],["components.hashicorp-consul.side-nav.intentions"],null],[28,[37,20],["dc.intentions",[30,8,["Name"]]],[["params"],[[28,[37,21],null,[["peer"],[[27]]]]]]],false,[28,[37,37],["dc.intentions",[30,8,["Name"]]],null]]],null],[1,"\\n"]],[]],null],[1,"\\n          "],[8,[39,38],null,[["@dc","@partition","@nspace","@list"],[[30,8],[30,9],[30,10],[30,15]]],null],[1,"\\n          "],[8,[39,39],null,[["@dc","@partition","@nspace","@list"],[[30,8],[30,9],[30,10],[30,15]]],null],[1,"\\n        "]],[15]]]]],[1,"\\n      "]],[]],[[[1,"\\n        "],[10,"footer"],[14,"role","contentinfo"],[12],[1,"\\n          "],[8,[39,40],[[24,0,"hds-side-nav-hide-when-minimized"]],[["@size","@color"],["100","disabled"]],[["default"],[[[[1,"\\n            "],[1,[28,[35,11],["components.hashicorp-consul.side-nav.footer"],[["version"],[[30,0,["consulVersion"]]]]]],[1,"\\n          "]],[]]]]],[1,"\\n          "],[2,[28,[37,25],["\x3c!-- ",[28,[37,24],["CONSUL_GIT_SHA"],null],"--\x3e"],null]],[1,"\\n        "],[13],[1,"\\n      "]],[]]]]],[1,"\\n  "]],[]],[[[1,"\\n    "],[18,16,[[28,[37,21],null,[["login"],[[52,[30,0,["tokenSelector"]],[30,0,["tokenSelector"]],[28,[37,21],null,[["open","close"],[[27],[27]]]]]]]]]],[1,"\\n  "]],[]]]]]],["&attrs","app","flash","status","type","T","dd","@dc","@partition","@nspace","@onchange","selector","SNL","@dcs","SNL","&default"],false,["app","each","-track-array","flashMessages","sub","if","let","lowercase","hds/toast","eq","capitalize","t","or","consul/token/notifications","consul/intention/notifications","consul/role/notifications","consul/policy/notifications","hds/side-nav","hds/side-nav/header","hds/side-nav/header/home-link","href-to","hash","hds/dropdown","debug/navigation","env","concat","consul/token/selector","ref","hds/side-nav/list","consul/hcp/home","consul/datacenter/selector","consul/partition/selector","action","mut","consul/nspace/selector","can","array","is-href","consul/acl/selector","consul/peer/selector","hds/text/display","yield"]]',moduleName:"consul-ui/components/hashicorp-consul/index.hbs",isStrictMode:!1})
+let f=(i=(0,r.inject)("flashMessages"),o=(0,r.inject)("env"),a=class extends l.default{constructor(){super(...arguments),c(this,"flashMessages",u,this),c(this,"env",s,this)}get consulVersion(){const e=["","oss"].includes(this.env.var("CONSUL_BINARY_TYPE"))?"":"+ent"
+return`${this.env.var("CONSUL_VERSION")}${e}`}},u=d(a.prototype,"flashMessages",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),s=d(a.prototype,"env",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),a)
+e.default=f,(0,t.setComponentTemplate)(p,f)})),define("consul-ui/components/hds/accordion/index",["exports","@hashicorp/design-system-components/components/hds/accordion/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/accordion/item/button",["exports","@hashicorp/design-system-components/components/hds/accordion/item/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/accordion/item/index",["exports","@hashicorp/design-system-components/components/hds/accordion/item/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/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/app-footer/copyright",["exports","@hashicorp/design-system-components/components/hds/app-footer/copyright"],(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/app-footer/index",["exports","@hashicorp/design-system-components/components/hds/app-footer/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/app-footer/item",["exports","@hashicorp/design-system-components/components/hds/app-footer/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/app-footer/legal-links",["exports","@hashicorp/design-system-components/components/hds/app-footer/legal-links"],(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/app-footer/link",["exports","@hashicorp/design-system-components/components/hds/app-footer/link"],(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/app-footer/status-link",["exports","@hashicorp/design-system-components/components/hds/app-footer/status-link"],(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/app-frame/index",["exports","@hashicorp/design-system-components/components/hds/app-frame/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/app-frame/parts/footer",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/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/app-frame/parts/header",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/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/app-frame/parts/main",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/main"],(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/app-frame/parts/modals",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/modals"],(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/app-frame/parts/sidebar",["exports","@hashicorp/design-system-components/components/hds/app-frame/parts/sidebar"],(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/application-state/body",["exports","@hashicorp/design-system-components/components/hds/application-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/application-state/footer",["exports","@hashicorp/design-system-components/components/hds/application-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/application-state/header",["exports","@hashicorp/design-system-components/components/hds/application-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/application-state/index",["exports","@hashicorp/design-system-components/components/hds/application-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/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/copy/button/index",["exports","@hashicorp/design-system-components/components/hds/copy/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/copy/snippet/index",["exports","@hashicorp/design-system-components/components/hds/copy/snippet/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/disclosure-primitive/index",["exports","@hashicorp/design-system-components/components/hds/disclosure-primitive/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/footer",["exports","@hashicorp/design-system-components/components/hds/dropdown/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/dropdown/header",["exports","@hashicorp/design-system-components/components/hds/dropdown/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/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/checkbox",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/checkbox"],(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/checkmark",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/checkmark"],(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/radio",["exports","@hashicorp/design-system-components/components/hds/dropdown/list-item/radio"],(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/chevron",["exports","@hashicorp/design-system-components/components/hds/dropdown/toggle/chevron"],(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/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/footer",["exports","@hashicorp/design-system-components/components/hds/flyout/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/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/file-input/base",["exports","@hashicorp/design-system-components/components/hds/form/file-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/file-input/field",["exports","@hashicorp/design-system-components/components/hds/form/file-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/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/masked-input/base",["exports","@hashicorp/design-system-components/components/hds/form/masked-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/masked-input/field",["exports","@hashicorp/design-system-components/components/hds/form/masked-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/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/form/visibility-toggle/index",["exports","@hashicorp/design-system-components/components/hds/form/visibility-toggle/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/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/menu-primitive/index",["exports","@hashicorp/design-system-components/components/hds/menu-primitive/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/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/page-header/actions",["exports","@hashicorp/design-system-components/components/hds/page-header/actions"],(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/page-header/badges",["exports","@hashicorp/design-system-components/components/hds/page-header/badges"],(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/page-header/description",["exports","@hashicorp/design-system-components/components/hds/page-header/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/page-header/index",["exports","@hashicorp/design-system-components/components/hds/page-header/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/page-header/subtitle",["exports","@hashicorp/design-system-components/components/hds/page-header/subtitle"],(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/page-header/title",["exports","@hashicorp/design-system-components/components/hds/page-header/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/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/reveal/index",["exports","@hashicorp/design-system-components/components/hds/reveal/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/reveal/toggle/button",["exports","@hashicorp/design-system-components/components/hds/reveal/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/segmented-group/index",["exports","@hashicorp/design-system-components/components/hds/segmented-group/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/separator/index",["exports","@hashicorp/design-system-components/components/hds/separator/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/side-nav/base",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/side-nav/header/home-link",["exports","@hashicorp/design-system-components/components/hds/side-nav/header/home-link"],(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/side-nav/header/icon-button",["exports","@hashicorp/design-system-components/components/hds/side-nav/header/icon-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/side-nav/header/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/side-nav/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/side-nav/list/back-link",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/back-link"],(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/side-nav/list/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/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/side-nav/list/item",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/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/side-nav/list/link",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/link"],(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/side-nav/list/title",["exports","@hashicorp/design-system-components/components/hds/side-nav/list/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/side-nav/portal/index",["exports","@hashicorp/design-system-components/components/hds/side-nav/portal/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/side-nav/portal/target",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/hds/side-nav/toggle-button",["exports","@hashicorp/design-system-components/components/hds/side-nav/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/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/text/body",["exports","@hashicorp/design-system-components/components/hds/text/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/text/code",["exports","@hashicorp/design-system-components/components/hds/text/code"],(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/text/display",["exports","@hashicorp/design-system-components/components/hds/text/display"],(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/text/index",["exports","@hashicorp/design-system-components/components/hds/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/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/tooltip-button/index",["exports","@hashicorp/design-system-components/components/hds/tooltip-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/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:"OpUoOs2J",block:'[[[1,"\\n"],[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
@@ -1340,14 +1343,14 @@ this.set("height",Math.max(0,r)),this.updateItems(),this.updateScrollPosition()}
 if(t.target.checked&&e!==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
+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:"AUkkhvKM",block:'[[[1,"\\n"],[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
+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:"JOnhu+Ze",block:'[[[1,"\\n"],[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
@@ -1368,10 +1371,13 @@ 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:"aLK3TSIx",block:'[[[1,"\\n"],[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/nav-selector/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@glimmer/tracking"],(function(e,t,n,l,r,i){var o,a
+e.default=r})),define("consul-ui/components/nav-selector/generic",["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:"J8OHquCr",block:'[[[1,"\\n"],[18,1,null]],["&default"],false,["yield"]]',moduleName:"consul-ui/components/nav-selector/generic.hbs",isStrictMode:!1})
+var i=(0,t.setComponentTemplate)(r,(0,l.default)())
+e.default=i})),define("consul-ui/components/nav-selector/index",["exports","@ember/component","@ember/template-factory","@glimmer/component","@ember/object","@glimmer/tracking"],(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:"gV2Cd+sK",block:'[[[1,"\\n"],[44,[[30,1]],[[[1,"  "],[8,[30,2,["Item"]],[[24,0,"consul-side-nav__selector"]],null,[["default"],[[[[1,"\\n    "],[8,[39,1],[[24,0,"hds-side-nav__dropdown"],[17,3]],[["@listPosition","@width","@isInline"],["bottom-left","15.5rem",true]],[["default"],[[[[1,"\\n      "],[8,[30,4,["ToggleButton"]],[[24,0,"consul-side-nav__selector-toggle"],[16,"disabled",[28,[37,2],[[30,5],true],null]]],[["@icon","@text"],[[30,6],[28,[37,3],[[30,7],[30,8]],null]]],null],[1,"\\n      "],[8,[30,4,["Header"]],null,[["@hasDivider"],[true]],[["default"],[[[[1,"\\n"],[41,[30,9],[[[1,"          "],[10,0],[14,0,"consul-side-nav__selector-description"],[12],[1,"\\n            "],[8,[39,5],null,[["@size","@color"],["100","faint"]],[["default"],[[[[1,[30,9]]],[]]]]],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[1,"        "],[8,[39,6],[[16,"placeholder",[30,10]],[16,"aria-label",[30,10]],[4,[38,7],["input",[30,0,["onSearchInput"]]],null]],[["@type","@value"],["search",[30,0,["search"]]]],null],[1,"\\n      "]],[]]]]],[1,"\\n"],[41,[28,[37,2],[[30,0,["filteredItems","length"]],0],null],[[[1,"        "],[8,[30,4,["Description"]],null,[["@text"],["No results"]],null],[1,"\\n"]],[]],[[[42,[28,[37,9],[[28,[37,9],[[30,0,["filteredItems"]]],null]],null],null,[[[1,"          "],[18,14,[[30,4],[30,11]]],[1,"\\n"]],[11]],null]],[]]],[41,[30,12],[[[1,"        "],[8,[30,4,["Footer"]],null,[["@hasDivider"],[true]],[["default"],[[[[1,"\\n          "],[8,[39,11],null,[["@href","@isHrefExternal","@text","@iconPosition","@icon","@color"],[[30,12],false,[30,13],"trailing","arrow-right","secondary"]],null],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"    "]],[4]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[2]]]],["@list","SNL","&attrs","DD","@disabled","@icon","@item","@key","@description","@placeholder","item","@footerLink","@footerLinkText","&default"],false,["let","hds/dropdown","eq","get","if","hds/text/body","hds/form/text-input/base","on","each","-track-array","yield","hds/link/standalone"]]',moduleName:"consul-ui/components/nav-selector/index.hbs",isStrictMode:!1})
+const s=(0,n.createTemplateFactory)({id:"JCYQiQJP",block:'[[[1,"\\n"],[44,[[30,1]],[[[1,"  "],[8,[30,2,["Item"]],[[24,0,"consul-side-nav__selector"]],null,[["default"],[[[[1,"\\n    "],[8,[39,1],[[24,0,"hds-side-nav__dropdown"],[17,3]],[["@listPosition","@width","@isInline"],["bottom-left","15.5rem",true]],[["default"],[[[[1,"\\n      "],[8,[30,4,["ToggleButton"]],[[24,0,"consul-side-nav__selector-toggle"],[16,"disabled",[28,[37,2],[[30,5],true],null]]],[["@icon","@text"],[[30,6],[28,[37,3],[[30,7],[30,8]],null]]],null],[1,"\\n      "],[8,[30,4,["Header"]],null,[["@hasDivider"],[true]],[["default"],[[[[1,"\\n        "],[18,14,[[28,[37,5],null,[["Data"],[[50,"nav-selector/generic",0,null,null]]]]]],[1,"\\n"],[41,[30,9],[[[1,"          "],[10,0],[14,0,"consul-side-nav__selector-description"],[12],[1,"\\n            "],[8,[39,8],null,[["@size","@color"],["100","faint"]],[["default"],[[[[1,[30,9]]],[]]]]],[1,"\\n          "],[13],[1,"\\n"]],[]],null],[1,"        "],[8,[39,9],[[16,"placeholder",[30,10]],[16,"aria-label",[30,10]],[4,[38,10],["input",[30,0,["onSearchInput"]]],null]],[["@type","@value"],["search",[30,0,["search"]]]],null],[1,"\\n      "]],[]]]]],[1,"\\n"],[41,[28,[37,2],[[30,0,["filteredItems","length"]],0],null],[[[1,"        "],[8,[30,4,["Description"]],null,[["@text"],["No results"]],null],[1,"\\n"]],[]],[[[42,[28,[37,12],[[28,[37,12],[[30,0,["filteredItems"]]],null]],null],null,[[[1,"          "],[18,14,[[28,[37,5],null,[["Dropdown","item"],[[30,4],[30,11]]]]]],[1,"\\n"]],[11]],null]],[]]],[41,[30,12],[[[1,"        "],[8,[30,4,["Footer"]],null,[["@hasDivider"],[true]],[["default"],[[[[1,"\\n          "],[8,[39,13],null,[["@href","@isHrefExternal","@text","@iconPosition","@icon","@color"],[[30,12],false,[30,13],"trailing","arrow-right","secondary"]],null],[1,"\\n        "]],[]]]]],[1,"\\n"]],[]],null],[1,"    "]],[4]]]]],[1,"\\n  "]],[]]]]],[1,"\\n"]],[2]]]],["@list","SNL","&attrs","DD","@disabled","@icon","@item","@key","@description","@placeholder","item","@footerLink","@footerLinkText","&default"],false,["let","hds/dropdown","eq","get","yield","hash","component","if","hds/text/body","hds/form/text-input/base","on","each","-track-array","hds/link/standalone"]]',moduleName:"consul-ui/components/nav-selector/index.hbs",isStrictMode:!1})
 let c=(o=class extends l.default{constructor(){var e,t,n,l
 super(...arguments),e=this,t="search",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})}get filteredItems(){const e=this.search.toLowerCase()
 return e?this.args.items.filter((t=>t[this.args.key].toLowerCase().includes(e))):this.args.items}onSearchInput(e){this.search=e.target.value}},a=u(o.prototype,"search",[i.tracked],{configurable:!0,enumerable:!0,writable:!0,initializer:function(){return""}}),u(o.prototype,"onSearchInput",[r.action],Object.getOwnPropertyDescriptor(o.prototype,"onSearchInput"),o.prototype),o)
@@ -1495,8 +1501,8 @@ return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumera
 const s=(0,n.createTemplateFactory)({id:"SC5oIKM/",block:'[[[1,"\\n"],[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
+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:"v8Ti52Dh",block:'[[[1,"\\n"],[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
@@ -1572,7 +1578,8 @@ var o=(0,t.setComponentTemplate)(i,t.default.extend({chart:(0,l.inject)("state")
 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
+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:"czGhnB35",block:'[[[1,"\\n"],[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
@@ -1581,8 +1588,7 @@ return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumera
 const f=(0,n.createTemplateFactory)({id:"GN7VhFzM",block:'[[[1,"\\n"],[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
+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:"+i13n0mt",block:'[[[1,"\\n"],[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})
@@ -1752,15 +1758,15 @@ 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
+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
+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()
@@ -1840,20 +1846,20 @@ const l=(0,n.default)()})),define("consul-ui/forms/kv",["exports","consul-ui/val
 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
+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,"abs",{enumerable:!0,get:function(){return t.abs}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/acos",["exports","ember-math-helpers/helpers/acos"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"acos",{enumerable:!0,get:function(){return t.acos}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/acosh",["exports","ember-math-helpers/helpers/acosh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"acosh",{enumerable:!0,get:function(){return t.acosh}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/add",["exports","ember-math-helpers/helpers/add"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"add",{enumerable:!0,get:function(){return t.add}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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
+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,"abs",{enumerable:!0,get:function(){return t.abs}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/acos",["exports","ember-math-helpers/helpers/acos"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"acos",{enumerable:!0,get:function(){return t.acos}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/acosh",["exports","ember-math-helpers/helpers/acosh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"acosh",{enumerable:!0,get:function(){return t.acosh}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/add",["exports","ember-math-helpers/helpers/add"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"add",{enumerable:!0,get:function(){return t.add}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"and",{enumerable:!0,get:function(){return t.and}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"append",{enumerable:!0,get:function(){return t.append}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayConcat",{enumerable:!0,get:function(){return t.arrayConcat}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayEvery",{enumerable:!0,get:function(){return t.arrayEvery}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayFilter",{enumerable:!0,get:function(){return t.arrayFilter}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayFindIndex",{enumerable:!0,get:function(){return t.arrayFindIndex}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayFind",{enumerable:!0,get:function(){return t.arrayFind}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIncludes",{enumerable:!0,get:function(){return t.arrayIncludes}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIndexOf",{enumerable:!0,get:function(){return t.arrayIndexOf}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIsArray",{enumerable:!0,get:function(){return t.arrayIsArray}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIsFirstElement",{enumerable:!0,get:function(){return t.arrayIsFirstElement}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIsLastElement",{enumerable:!0,get:function(){return t.arrayIsLastElement}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayJoin",{enumerable:!0,get:function(){return t.arrayJoin}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayLastIndexOf",{enumerable:!0,get:function(){return t.arrayLastIndexOf}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayMap",{enumerable:!0,get:function(){return t.arrayMap}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayReduce",{enumerable:!0,get:function(){return t.arrayReduce}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayReverse",{enumerable:!0,get:function(){return t.arrayReverse}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySlice",{enumerable:!0,get:function(){return t.arraySlice}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySome",{enumerable:!0,get:function(){return t.arraySome}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySort",{enumerable:!0,get:function(){return t.arraySort}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySplice",{enumerable:!0,get:function(){return t.arraySplice}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/asin",["exports","ember-math-helpers/helpers/asin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"asin",{enumerable:!0,get:function(){return t.asin}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/asinh",["exports","ember-math-helpers/helpers/asinh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"asinh",{enumerable:!0,get:function(){return t.asinh}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-define("consul-ui/helpers/assign",["exports","ember-assign-helper/helpers/assign"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"assign",{enumerable:!0,get:function(){return t.assign}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/atan",["exports","ember-math-helpers/helpers/atan"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"atan",{enumerable:!0,get:function(){return t.atan}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/atan2",["exports","ember-math-helpers/helpers/atan2"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"atan2",{enumerable:!0,get:function(){return t.atan2}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/atanh",["exports","ember-math-helpers/helpers/atanh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"atanh",{enumerable:!0,get:function(){return t.atanh}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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
+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,"append",{enumerable:!0,get:function(){return t.append}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayConcat",{enumerable:!0,get:function(){return t.arrayConcat}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayEvery",{enumerable:!0,get:function(){return t.arrayEvery}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayFilter",{enumerable:!0,get:function(){return t.arrayFilter}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayFindIndex",{enumerable:!0,get:function(){return t.arrayFindIndex}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayFind",{enumerable:!0,get:function(){return t.arrayFind}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIncludes",{enumerable:!0,get:function(){return t.arrayIncludes}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIndexOf",{enumerable:!0,get:function(){return t.arrayIndexOf}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIsArray",{enumerable:!0,get:function(){return t.arrayIsArray}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIsFirstElement",{enumerable:!0,get:function(){return t.arrayIsFirstElement}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayIsLastElement",{enumerable:!0,get:function(){return t.arrayIsLastElement}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayJoin",{enumerable:!0,get:function(){return t.arrayJoin}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayLastIndexOf",{enumerable:!0,get:function(){return t.arrayLastIndexOf}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayMap",{enumerable:!0,get:function(){return t.arrayMap}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayReduce",{enumerable:!0,get:function(){return t.arrayReduce}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arrayReverse",{enumerable:!0,get:function(){return t.arrayReverse}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySlice",{enumerable:!0,get:function(){return t.arraySlice}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySome",{enumerable:!0,get:function(){return t.arraySome}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySort",{enumerable:!0,get:function(){return t.arraySort}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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,"arraySplice",{enumerable:!0,get:function(){return t.arraySplice}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
+define("consul-ui/helpers/asin",["exports","ember-math-helpers/helpers/asin"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"asin",{enumerable:!0,get:function(){return t.asin}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/asinh",["exports","ember-math-helpers/helpers/asinh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"asinh",{enumerable:!0,get:function(){return t.asinh}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/assign",["exports","ember-assign-helper/helpers/assign"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"assign",{enumerable:!0,get:function(){return t.assign}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/atan",["exports","ember-math-helpers/helpers/atan"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"atan",{enumerable:!0,get:function(){return t.atan}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/atan2",["exports","ember-math-helpers/helpers/atan2"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"atan2",{enumerable:!0,get:function(){return t.atan2}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/atanh",["exports","ember-math-helpers/helpers/atanh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"atanh",{enumerable:!0,get:function(){return t.atanh}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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
@@ -1867,10 +1873,10 @@ 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,"compute",{enumerable:!0,get:function(){return t.compute}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/contains",["exports","ember-composable-helpers/helpers/contains"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"contains",{enumerable:!0,get:function(){return t.contains}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/cos",["exports","ember-math-helpers/helpers/cos"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"cos",{enumerable:!0,get:function(){return t.cos}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),define("consul-ui/helpers/cosh",["exports","ember-math-helpers/helpers/cosh"],(function(e,t){Object.defineProperty(e,"__esModule",{value:!0}),Object.defineProperty(e,"cosh",{enumerable:!0,get:function(){return t.cosh}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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
+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,"dec",{enumerable:!0,get:function(){return t.dec}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})}))
-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
+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,"dec",{enumerable:!0,get:function(){return t.dec}}),Object.defineProperty(e,"default",{enumerable:!0,get:function(){return t.default}})})),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
@@ -1917,8 +1923,8 @@ 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
+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.hrefTo=e.default=void 0
 const p=(0,o.default)(a.routes),f=function(e,t){let n=arguments.length>2&&void 0!==arguments[2]?arguments[2]:{}
@@ -1946,11 +1952,11 @@ 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
+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.default=void 0,e.last=n
 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
+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/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
@@ -1960,14 +1966,14 @@ e.default=l})),define("consul-ui/helpers/min",["exports","ember-math-helpers/hel
 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-eq"],(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
+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
+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")
@@ -2030,7 +2036,8 @@ 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")
+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.default=void 0,e.serviceExternalSource=l
@@ -2039,8 +2046,7 @@ e.default=r})),define("consul-ui/helpers/service/health-percentage",["exports","
 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
+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.default=void 0,e.slugify=n
@@ -2070,8 +2076,8 @@ 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.default=void 0,e.stringHtmlSafe=l
 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
+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}))
@@ -2096,11 +2102,11 @@ 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
+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
+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
@@ -2163,12 +2169,12 @@ e.default=l})),define("consul-ui/initializers/initialize-torii-session",["export
 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
+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/instance-initializers/container",["exports","@ember/debug","require","deepmerge"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.services=e.default=void 0
+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/instance-initializers/container",["exports","@ember/debug","require","deepmerge"],(function(e,t,n,l){Object.defineProperty(e,"__esModule",{value:!0}),e.services=e.default=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
@@ -2253,7 +2259,7 @@ e.default=class{static create(){return new this(...arguments)}constructor(e,t,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
+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<4){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||{}
@@ -2320,8 +2326,8 @@ function U(e,t,n,l){n&&Object.defineProperty(e,t,{enumerable:n.enumerable,config
 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 K=(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"),v=(0,t.attr)("number"),g=(0,t.attr)("number"),O=(0,t.attr)(),P=(0,t.attr)(),w=(0,r.computed)("MaxTokenTTL"),x=class extends t.default{constructor(){super(...arguments),U(this,"uid",j,this),U(this,"Name",_,this),U(this,"Datacenter",S,this),U(this,"Namespace",k,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(x.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=B(x.prototype,"Name",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=B(x.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=B(x.prototype,"Namespace",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=B(x.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=B(x.prototype,"Description",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=B(x.prototype,"DisplayName",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=B(x.prototype,"TokenLocality",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=B(x.prototype,"Type",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=B(x.prototype,"NamespaceRules",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=B(x.prototype,"MethodName",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=B(x.prototype,"Config",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=B(x.prototype,"MaxTokenTTL",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=B(x.prototype,"CreateIndex",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=B(x.prototype,"ModifyIndex",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=B(x.prototype,"Datacenters",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=B(x.prototype,"meta",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B(x.prototype,"TokenTTL",[w],Object.getOwnPropertyDescriptor(x.prototype,"TokenTTL"),x.prototype),x)
-e.default=K})),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,v,g,O,P,w,x,j,_,S
+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"),v=(0,t.attr)("number"),g=(0,t.attr)("number"),O=(0,t.attr)(),P=(0,t.attr)(),w=(0,r.computed)("MaxTokenTTL"),x=class extends t.default{constructor(){super(...arguments),U(this,"uid",j,this),U(this,"Name",_,this),U(this,"Datacenter",S,this),U(this,"Namespace",k,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(x.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=B(x.prototype,"Name",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=B(x.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=B(x.prototype,"Namespace",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=B(x.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=B(x.prototype,"Description",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=B(x.prototype,"DisplayName",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=B(x.prototype,"TokenLocality",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=B(x.prototype,"Type",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=B(x.prototype,"NamespaceRules",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=B(x.prototype,"MethodName",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=B(x.prototype,"Config",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=B(x.prototype,"MaxTokenTTL",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=B(x.prototype,"CreateIndex",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=B(x.prototype,"ModifyIndex",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=B(x.prototype,"Datacenters",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=B(x.prototype,"meta",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B(x.prototype,"TokenTTL",[w],Object.getOwnPropertyDescriptor(x.prototype,"TokenTTL"),x.prototype),x)
+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,v,g,O,P,w,x,j,_,S
 function k(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"
@@ -2373,35 +2379,35 @@ return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumera
 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,v,g,O,P,w,x,j,_,S,k,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,K,q,H,Y,G,V,W,Z,Q,J,X,ee,te,ne
+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,v,g,O,P,w,x,j,_,S,k,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"),v=(0,t.attr)("string",{defaultValue:()=>"consul"}),g=(0,r.nullValue)(void 0),O=(0,t.attr)("string"),P=(0,t.attr)("string"),w=(0,t.attr)("boolean",{defaultValue:()=>!0}),x=(0,t.attr)("number"),j=(0,t.attr)("date"),_=(0,t.attr)("date"),S=(0,t.attr)("number"),k=(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",K,this),le(this,"Precedence",q,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}),K=re(D.prototype,"DestinationPartition",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=re(D.prototype,"Precedence",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=re(D.prototype,"SourceType",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=re(D.prototype,"Action",[g,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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=re(D.prototype,"SyncTime",[x],{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",[S],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),X=re(D.prototype,"ModifyIndex",[k],{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)
+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"),v=(0,t.attr)("string",{defaultValue:()=>"consul"}),g=(0,r.nullValue)(void 0),O=(0,t.attr)("string"),P=(0,t.attr)("string"),w=(0,t.attr)("boolean",{defaultValue:()=>!0}),x=(0,t.attr)("number"),j=(0,t.attr)("date"),_=(0,t.attr)("date"),S=(0,t.attr)("number"),k=(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",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=re(D.prototype,"Action",[g,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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),W=re(D.prototype,"SyncTime",[x],{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",[S],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),X=re(D.prototype,"ModifyIndex",[k],{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,v,g,O,P,w,x,j,_,S,k,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"),v=(0,t.attr)("string"),g=(0,t.attr)({defaultValue:()=>[]}),O=(0,n.computed)("isFolder"),P=(0,n.computed)("Key"),w=class extends t.default{constructor(){super(...arguments),R(this,"uid",x,this),R(this,"Key",j,this),R(this,"SyncTime",_,this),R(this,"meta",S,this),R(this,"Datacenter",k,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||"")}},x=I(w.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=I(w.prototype,"Key",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=I(w.prototype,"SyncTime",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=I(w.prototype,"meta",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=I(w.prototype,"Datacenter",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=I(w.prototype,"Namespace",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=I(w.prototype,"Partition",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=I(w.prototype,"LockIndex",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=I(w.prototype,"Flags",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=I(w.prototype,"Value",[m,h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=I(w.prototype,"CreateIndex",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=I(w.prototype,"ModifyIndex",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=I(w.prototype,"Session",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=I(w.prototype,"Resources",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I(w.prototype,"Kind",[O],Object.getOwnPropertyDescriptor(w.prototype,"Kind"),w.prototype),I(w.prototype,"isFolder",[P],Object.getOwnPropertyDescriptor(w.prototype,"isFolder"),w.prototype),w)
-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,v
+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,v
 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 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),g(this,"uri",d,this),g(this,"Valid",p,this),g(this,"SyncTime",f,this),g(this,"meta",m,this),g(this,"Datacenter",h,this),g(this,"Namespace",b,this),g(this,"Partition",y,this),g(this,"License",v,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}),v=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,v,g,O,P,w,x,j,_,S,k,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,K,q,H,Y,G,V
+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,v,g,O,P,w,x,j,_,S,k,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,q,K,H,Y,G,V
 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 Z(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 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"),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)(),v=(0,t.attr)({defaultValue:()=>[]}),g=(0,t.hasMany)("service-instance"),O=(0,r.fragmentArray)("health-check"),P=(0,l.filter)("Services",(e=>"connect-proxy"!==e.Service.Kind)),w=(0,l.filter)("Services",(e=>"connect-proxy"===e.Service.Kind)),x=(0,l.filter)("Checks",(e=>""===e.ServiceID)),j=(0,n.computed)("ChecksCritical","ChecksPassing","ChecksWarning"),_=(0,n.computed)("NodeChecks.[]"),S=(0,n.computed)("NodeChecks.[]"),k=(0,n.computed)("NodeChecks.[]"),N=(0,n.computed)("Meta"),C=class extends t.default{constructor(){super(...arguments),W(this,"uid",z,this),W(this,"ID",M,this),W(this,"Datacenter",D,this),W(this,"PeerName",T,this),W(this,"Partition",E,this),W(this,"Address",L,this),W(this,"Node",A,this),W(this,"SyncTime",R,this),W(this,"CreateIndex",I,this),W(this,"ModifyIndex",$,this),W(this,"meta",F,this),W(this,"Meta",U,this),W(this,"TaggedAddresses",B,this),W(this,"Resources",K,this),W(this,"Services",q,this),W(this,"Checks",H,this),W(this,"MeshServiceInstances",Y,this),W(this,"ProxyServiceInstances",G,this),W(this,"NodeChecks",V,this)}get Status(){switch(!0){case 0!==this.ChecksCritical:return"critical"
+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"),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)(),v=(0,t.attr)({defaultValue:()=>[]}),g=(0,t.hasMany)("service-instance"),O=(0,r.fragmentArray)("health-check"),P=(0,l.filter)("Services",(e=>"connect-proxy"!==e.Service.Kind)),w=(0,l.filter)("Services",(e=>"connect-proxy"===e.Service.Kind)),x=(0,l.filter)("Checks",(e=>""===e.ServiceID)),j=(0,n.computed)("ChecksCritical","ChecksPassing","ChecksWarning"),_=(0,n.computed)("NodeChecks.[]"),S=(0,n.computed)("NodeChecks.[]"),k=(0,n.computed)("NodeChecks.[]"),N=(0,n.computed)("Meta"),C=class extends t.default{constructor(){super(...arguments),W(this,"uid",z,this),W(this,"ID",M,this),W(this,"Datacenter",D,this),W(this,"PeerName",T,this),W(this,"Partition",E,this),W(this,"Address",L,this),W(this,"Node",A,this),W(this,"SyncTime",R,this),W(this,"CreateIndex",I,this),W(this,"ModifyIndex",$,this),W(this,"meta",F,this),W(this,"Meta",U,this),W(this,"TaggedAddresses",B,this),W(this,"Resources",q,this),W(this,"Services",K,this),W(this,"Checks",H,this),W(this,"MeshServiceInstances",Y,this),W(this,"ProxyServiceInstances",G,this),W(this,"NodeChecks",V,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}get Version(){var e,t
-return null!==(e=null===(t=this.Meta)||void 0===t?void 0:t["consul-version"])&&void 0!==e?e:""}},z=Z(C.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=Z(C.prototype,"ID",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=Z(C.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=Z(C.prototype,"PeerName",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=Z(C.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=Z(C.prototype,"Address",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=Z(C.prototype,"Node",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=Z(C.prototype,"SyncTime",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=Z(C.prototype,"CreateIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=Z(C.prototype,"ModifyIndex",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=Z(C.prototype,"meta",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=Z(C.prototype,"Meta",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=Z(C.prototype,"TaggedAddresses",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=Z(C.prototype,"Resources",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=Z(C.prototype,"Services",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=Z(C.prototype,"Checks",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=Z(C.prototype,"MeshServiceInstances",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=Z(C.prototype,"ProxyServiceInstances",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=Z(C.prototype,"NodeChecks",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z(C.prototype,"Status",[j],Object.getOwnPropertyDescriptor(C.prototype,"Status"),C.prototype),Z(C.prototype,"ChecksCritical",[_],Object.getOwnPropertyDescriptor(C.prototype,"ChecksCritical"),C.prototype),Z(C.prototype,"ChecksPassing",[S],Object.getOwnPropertyDescriptor(C.prototype,"ChecksPassing"),C.prototype),Z(C.prototype,"ChecksWarning",[k],Object.getOwnPropertyDescriptor(C.prototype,"ChecksWarning"),C.prototype),Z(C.prototype,"Version",[N],Object.getOwnPropertyDescriptor(C.prototype,"Version"),C.prototype),C)
+return null!==(e=null===(t=this.Meta)||void 0===t?void 0:t["consul-version"])&&void 0!==e?e:""}},z=Z(C.prototype,"uid",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=Z(C.prototype,"ID",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=Z(C.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=Z(C.prototype,"PeerName",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=Z(C.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=Z(C.prototype,"Address",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=Z(C.prototype,"Node",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=Z(C.prototype,"SyncTime",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=Z(C.prototype,"CreateIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=Z(C.prototype,"ModifyIndex",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),F=Z(C.prototype,"meta",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U=Z(C.prototype,"Meta",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),B=Z(C.prototype,"TaggedAddresses",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=Z(C.prototype,"Resources",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=Z(C.prototype,"Services",[g],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),H=Z(C.prototype,"Checks",[O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Y=Z(C.prototype,"MeshServiceInstances",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),G=Z(C.prototype,"ProxyServiceInstances",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=Z(C.prototype,"NodeChecks",[x],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z(C.prototype,"Status",[j],Object.getOwnPropertyDescriptor(C.prototype,"Status"),C.prototype),Z(C.prototype,"ChecksCritical",[_],Object.getOwnPropertyDescriptor(C.prototype,"ChecksCritical"),C.prototype),Z(C.prototype,"ChecksPassing",[S],Object.getOwnPropertyDescriptor(C.prototype,"ChecksPassing"),C.prototype),Z(C.prototype,"ChecksWarning",[k],Object.getOwnPropertyDescriptor(C.prototype,"ChecksWarning"),C.prototype),Z(C.prototype,"Version",[N],Object.getOwnPropertyDescriptor(C.prototype,"Version"),C.prototype),C)
 e.default=Q})),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,v,g,O,P,w
 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 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=e.NSPACE_KEY=void 0
@@ -2451,7 +2457,7 @@ return Object.keys(l).forEach((function(e){i[e]=l[e]})),i.enumerable=!!i.enumera
 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"),v=class extends t.default{constructor(){super(...arguments),L(this,"uid",g,this),L(this,"ID",O,this),L(this,"Datacenter",P,this),L(this,"Namespace",w,this),L(this,"Partition",x,this),L(this,"Name",j,this),L(this,"Description",_,this),L(this,"Policies",S,this),L(this,"ServiceIdentities",k,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)}},g=A(v.prototype,"uid",[n],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),O=A(v.prototype,"ID",[l],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),P=A(v.prototype,"Datacenter",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),w=A(v.prototype,"Namespace",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),x=A(v.prototype,"Partition",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),j=A(v.prototype,"Name",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=A(v.prototype,"Description",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=A(v.prototype,"Policies",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=A(v.prototype,"ServiceIdentities",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=A(v.prototype,"NodeIdentities",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=A(v.prototype,"SyncTime",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=A(v.prototype,"CreateIndex",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=A(v.prototype,"ModifyIndex",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=A(v.prototype,"CreateTime",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=A(v.prototype,"Datacenters",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=A(v.prototype,"Hash",[y],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),v)
-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,v,g,O,P,w,x,j,_,S,k,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,K,q,H,Y,G,V,W,Z,Q,J,X,ee,te,ne,le
+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,v,g,O,P,w,x,j,_,S,k,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.SLUG_KEY=e.PRIMARY_KEY=e.Collection=void 0
 e.PRIMARY_KEY="uid"
@@ -2459,14 +2465,14 @@ 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"),v=(0,r.or)("Service.{ID,Service}"),g=(0,r.or)("Service.Address","Node.Service"),O=(0,t.attr)("string"),P=(0,r.alias)("Service.Tags"),w=(0,r.alias)("Service.Meta"),x=(0,r.alias)("Service.Namespace"),j=(0,r.alias)("Service.Partition"),_=(0,r.filter)("Checks.@each.Kind",((e,t,n)=>"service"===e.Kind)),S=(0,r.filter)("Checks.@each.Kind",((e,t,n)=>"node"===e.Kind)),k=(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",K,this),re(this,"Checks",q,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
+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"),v=(0,r.or)("Service.{ID,Service}"),g=(0,r.or)("Service.Address","Node.Service"),O=(0,t.attr)("string"),P=(0,r.alias)("Service.Tags"),w=(0,r.alias)("Service.Meta"),x=(0,r.alias)("Service.Namespace"),j=(0,r.alias)("Service.Partition"),_=(0,r.filter)("Checks.@each.Kind",((e,t,n)=>"service"===e.Kind)),S=(0,r.filter)("Checks.@each.Kind",((e,t,n)=>"node"===e.Kind)),k=(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}),K=ie(I.prototype,"Service",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=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",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=ie(I.prototype,"Address",[g],{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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee=ie(I.prototype,"Namespace",[x],{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",[S],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ie(I.prototype,"ExternalSources",[k],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,v,g,O,P,w,x,j,_,S,k,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,K,q,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,ve
+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",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),Z=ie(I.prototype,"Address",[g],{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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ee=ie(I.prototype,"Namespace",[x],{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",[S],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ie(I.prototype,"ExternalSources",[k],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,v,g,O,P,w,x,j,_,S,k,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,ve
 function ge(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.SLUG_KEY=e.PRIMARY_KEY=e.Collection=void 0
 e.PRIMARY_KEY="uid"
@@ -2474,7 +2480,7 @@ e.SLUG_KEY="Name,PeerName"
 const Pe=(a=Oe((o=class{constructor(e){ge(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 we=(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"),v=(0,t.attr)("number"),g=(0,t.attr)("number"),O=(0,t.attr)("boolean"),P=(0,t.attr)("boolean"),w=(0,t.attr)({defaultValue:()=>[]}),x=(0,t.attr)("number"),j=(0,t.attr)("number"),_=(0,t.attr)("number"),S=(0,i.nullValue)([]),k=(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"),K=(0,n.computed)("isZeroCountButPeered","peerIsFailing","MeshStatus"),q=(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),ge(this,"uid",V,this),ge(this,"Name",W,this),ge(this,"Datacenter",Z,this),ge(this,"Namespace",Q,this),ge(this,"Partition",J,this),ge(this,"Kind",X,this),ge(this,"PeerName",ee,this),ge(this,"ChecksPassing",te,this),ge(this,"ChecksCritical",ne,this),ge(this,"ChecksWarning",le,this),ge(this,"InstanceCount",re,this),ge(this,"ConnectedWithGateway",ie,this),ge(this,"ConnectedWithProxy",oe,this),ge(this,"Resources",ae,this),ge(this,"SyncTime",ue,this),ge(this,"CreateIndex",se,this),ge(this,"ModifyIndex",ce,this),ge(this,"Tags",de,this),ge(this,"Nodes",pe,this),ge(this,"Proxy",fe,this),ge(this,"GatewayConfig",me,this),ge(this,"ExternalSources",he,this),ge(this,"Meta",be,this),ge(this,"meta",ye,this),ge(this,"peer",ve,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"
+let we=(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"),v=(0,t.attr)("number"),g=(0,t.attr)("number"),O=(0,t.attr)("boolean"),P=(0,t.attr)("boolean"),w=(0,t.attr)({defaultValue:()=>[]}),x=(0,t.attr)("number"),j=(0,t.attr)("number"),_=(0,t.attr)("number"),S=(0,i.nullValue)([]),k=(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),ge(this,"uid",V,this),ge(this,"Name",W,this),ge(this,"Datacenter",Z,this),ge(this,"Namespace",Q,this),ge(this,"Partition",J,this),ge(this,"Kind",X,this),ge(this,"PeerName",ee,this),ge(this,"ChecksPassing",te,this),ge(this,"ChecksCritical",ne,this),ge(this,"ChecksWarning",le,this),ge(this,"InstanceCount",re,this),ge(this,"ConnectedWithGateway",ie,this),ge(this,"ConnectedWithProxy",oe,this),ge(this,"Resources",ae,this),ge(this,"SyncTime",ue,this),ge(this,"CreateIndex",se,this),ge(this,"ModifyIndex",ce,this),ge(this,"Tags",de,this),ge(this,"Nodes",pe,this),ge(this,"Proxy",fe,this),ge(this,"GatewayConfig",me,this),ge(this,"ExternalSources",he,this),ge(this,"Meta",be,this),ge(this,"meta",ye,this),ge(this,"peer",ve,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"
@@ -2482,7 +2488,7 @@ default:return"empty"}}get healthTooltipText(){const{MeshStatus:e,isZeroCountBut
 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",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),re=Oe(G.prototype,"InstanceCount",[g],{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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ue=Oe(G.prototype,"SyncTime",[x],{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",[S,k],{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}),ve=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",[K],Object.getOwnPropertyDescriptor(G.prototype,"healthTooltipText"),G.prototype),Oe(G.prototype,"MeshChecksPassing",[q],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)
+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",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),re=Oe(G.prototype,"InstanceCount",[g],{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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),ue=Oe(G.prototype,"SyncTime",[x],{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",[S,k],{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}),ve=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=we})),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,v,g,O,P,w,x,j,_,S,k,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
@@ -2490,12 +2496,12 @@ 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)([]),v=(0,t.attr)({defaultValue:()=>[]}),g=(0,l.nullValue)([]),O=(0,t.attr)({defaultValue:()=>[]}),P=(0,t.attr)({defaultValue:()=>[]}),w=(0,n.computed)("NodeChecks","ServiceChecks"),x=class extends t.default{constructor(){super(...arguments),F(this,"uid",j,this),F(this,"ID",_,this),F(this,"Name",S,this),F(this,"Datacenter",k,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(x.prototype,"uid",[r],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),_=U(x.prototype,"ID",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),S=U(x.prototype,"Name",[o],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),k=U(x.prototype,"Datacenter",[a],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),N=U(x.prototype,"Namespace",[u],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),C=U(x.prototype,"Partition",[s],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),z=U(x.prototype,"Node",[c],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),M=U(x.prototype,"Behavior",[d],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),D=U(x.prototype,"TTL",[p],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),T=U(x.prototype,"LockDelay",[f],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),E=U(x.prototype,"SyncTime",[m],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),L=U(x.prototype,"CreateIndex",[h],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),A=U(x.prototype,"ModifyIndex",[b],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),R=U(x.prototype,"NodeChecks",[y,v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),I=U(x.prototype,"ServiceChecks",[g,O],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),$=U(x.prototype,"Resources",[P],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),U(x.prototype,"checks",[w],Object.getOwnPropertyDescriptor(x.prototype,"checks"),x.prototype),x)
-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,v,g,O,P,w,x,j,_,S,k,N,C,z,M,D,T,E,L,A,R,I,$,F,U,B,K,q,H,Y,G,V,W,Z
+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,v,g,O,P,w,x,j,_,S,k,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:()=>[]}),v=(0,t.attr)({defaultValue:()=>[]}),g=(0,t.attr)("date"),O=(0,t.attr)("string"),P=(0,t.attr)("number"),w=(0,t.attr)("number"),x=(0,t.attr)("string"),j=(0,t.attr)("string",{defaultValue:()=>""}),_=(0,t.attr)("string"),S=(0,n.computed)("Policies.[]"),k=(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",K,this),Q(this,"CreateTime",q,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}),K=J(N.prototype,"NodeIdentities",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),q=J(N.prototype,"CreateTime",[g],{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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=J(N.prototype,"Type",[x],{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",[S],Object.getOwnPropertyDescriptor(N.prototype,"isGlobalManagement"),N.prototype),J(N.prototype,"hasSecretID",[k],Object.getOwnPropertyDescriptor(N.prototype,"hasSecretID"),N.prototype),N)
+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:()=>[]}),v=(0,t.attr)({defaultValue:()=>[]}),g=(0,t.attr)("date"),O=(0,t.attr)("string"),P=(0,t.attr)("number"),w=(0,t.attr)("number"),x=(0,t.attr)("string"),j=(0,t.attr)("string",{defaultValue:()=>""}),_=(0,t.attr)("string"),S=(0,n.computed)("Policies.[]"),k=(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",[v],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),K=J(N.prototype,"CreateTime",[g],{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",[w],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),V=J(N.prototype,"Type",[x],{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",[S],Object.getOwnPropertyDescriptor(N.prototype,"isGlobalManagement"),N.prototype),J(N.prototype,"hasSecretID",[k],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,v,g,O,P,w,x,j,_,S,k,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
@@ -2558,15 +2564,15 @@ const r=function(e){for(var t=1;t<arguments.length;t++){var n=null!=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}({timeout:6e3,extendedTimeout:300},n)
 r.dom=e.outerHTML,e.remove(),this.notify.clearMessages(),"function"==typeof r.after?Promise.resolve().then((e=>r.after())).catch((e=>{if("TransitionAborted"!==e.name)throw e})).then((e=>{this.notify.add(r)})):this.notify.add(r),(0,l.registerDestructor)(this,s)}},d=i.prototype,p="notify",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/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","@ember/destroyable"],(function(e,t,n,l,r){var i,o,a
+e.default=c})),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","@ember/destroyable"],(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}function s(e){var t
 e&&(null===(t=e.doc)||void 0===t||t.removeEventListener("click",e.listen))}Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0
 let c=(i=(0,l.inject)("dom"),o=class extends t.default{constructor(e,t){var n,l,i,o
 super(e,t),n=this,l="dom",o=this,(i=a)&&Object.defineProperty(n,l,{enumerable:i.enumerable,configurable:i.configurable,writable:i.writable,value:i.initializer?i.initializer.call(o):void 0}),this.doc=this.dom.document(),(0,r.registerDestructor)(this,s)}async modify(e,t,n){s.call(this),this.params=t,this.options=n,this.element=e,await new Promise((e=>setTimeout(e,0)))
 try{this.doc.addEventListener(t[0],this.listen)}catch(l){}}listen(e){if(this.element&&this.dom.isOutside(this.element,e.target)){("function"==typeof this.params[1]?this.params[1]:e=>{}).apply(this.element,[e])}}},a=u(o.prototype,"dom",[i],{configurable:!0,enumerable:!0,writable:!0,initializer:null}),u(o.prototype,"listen",[n.action],Object.getOwnPropertyDescriptor(o.prototype,"listen"),o.prototype),o)
-e.default=c})),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
+e.default=c})),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=""
@@ -2819,14 +2825,14 @@ return(0,l.hash)(function(e){for(var t=1;t<arguments.length;t++){var n=null!=arg
 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}({dc:o,partition:u,nspace:a,create:s},n.status({item:s?l.Promise.resolve(n.create({Datacenter:o,Namespace:a,Partition:u})):n.findBySlug({partition:u,ns:a,dc:o,id:e.id})})))}})
 e.default=o})),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
+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
+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)),[])}
@@ -2962,7 +2968,8 @@ if(void 0!==n){var l=n.call(e,t||"default")
 if("object"!=typeof l)return l
 throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string")
 return"symbol"==typeof t?t:String(t)}(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=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e
+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=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e
 var n=e[Symbol.toPrimitive]
 if(void 0!==n){var l=n.call(e,t||"default")
 if("object"!=typeof l)return l
@@ -2984,8 +2991,7 @@ 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=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e
+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=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e
 var n=e[Symbol.toPrimitive]
 if(void 0!==n){var l=n.call(e,t||"default")
 if("object"!=typeof l)return l
@@ -3181,7 +3187,8 @@ const n=this._listeners.add(l,{close:t=>{const l=t.target,r=l.getCurrentEvent(),
 void 0!==r&&void 0!==i&&t.errors&&"401"!==t.errors[0].status&&y.set(e,{currentEvent:r,cursor:i}),g.has(l)||v.delete(e),n()}})
 v.set(e,l)}return(!g.has(l)||l.readyState>1||r)&&l.open(),g.set(l,t),l}close(e,t){e&&(g.remove(e,t),g.has(e)||(e.close(),2===e.readyState&&v.delete(e.configuration.uri)))}closed(){return[...v.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
+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=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e
 var n=e[Symbol.toPrimitive]
@@ -3202,8 +3209,7 @@ 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",w=[d],x={configurable:!0,enumerable:!0,writable:!0,initializer:null},_={},Object.keys(x).forEach((function(e){_[e]=x[e]})),_.enumerable=!!_.enumerable,_.configurable=!!_.configurable,("value"in _||_.initializer)&&(_.writable=!0),_=w.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,w,x,j,_
-e.default=g}))
-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=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e
+e.default=g})),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=function(e){var t=function(e,t){if("object"!=typeof e||null===e)return e
 var n=e[Symbol.toPrimitive]
 if(void 0!==n){var l=n.call(e,t||"default")
 if("object"!=typeof l)return l
@@ -3444,7 +3450,8 @@ 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,v,g,O,P
+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,v,g,O,P
 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 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=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),w(this,"router",b,this),w(this,"container",y,this),w(this,"env",v,this),w(this,"form",g,this),w(this,"settings",O,this),w(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
@@ -3465,8 +3472,7 @@ return this.store.logout(this.getModelName(),i)}close(){this.manager.close(b)}fi
 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
+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 v=(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
@@ -3711,7 +3717,8 @@ case void 0===e.dc:e.dc=t}return e}),{})}async get(){return this.env.var("CONSUL
 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
+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(":")
@@ -3723,8 +3730,7 @@ 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=>[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
@@ -3909,12 +3915,12 @@ e.default=n})),define("consul-ui/templates/dc/acls/auth-methods/show/nspace-rule
 var n=(0,t.createTemplateFactory)({id:"B9VyTw0K",block:'[[[1,"\\n"],[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:"u49Giiy6",block:'[[[1,"\\n"],[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
+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:"HeHpiPG6",block:'[[[1,"\\n"],[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:"ZeBYu7Wq",block:'[[[1,"\\n"],[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,5],[[28,[37,8],[[28,[37,17],[[30,7]],null],"policy-management"],null],[28,[37,8],[[28,[37,17],[[30,7]],null],"read-only"],null]],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,"Built-in policy"]],[]]]]],[1,"\\n      "],[8,[30,9,["Description"]],null,null,[["default"],[[[[1,"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.\\n      "]],[]]]]],[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
+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:"fHN/RQtj",block:'[[[1,"\\n"],[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:"xSvLYGJe",block:'[[[1,"\\n"],[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})
@@ -3970,17 +3976,17 @@ e.default=n})),define("consul-ui/templates/dc/peers/show",["exports","@ember/tem
 var n=(0,t.createTemplateFactory)({id:"AvoaCEAO",block:'[[[1,"\\n"],[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:"3k5sOecZ",block:'[[[1,"\\n"],[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
+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:"Z0gVGZWd",block:'[[[1,"\\n"],[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:"WW9UdfAm",block:'[[[1,"\\n"],[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:"Ioh7AUof",block:'[[[1,"\\n"],[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","@nspace","@isPeerDetail"],[[30,9,["items"]],[30,6],[30,7],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:"IJMk41B8",block:'[[[1,"\\n"],[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:"ag2giQ2I",block:'[[[1,"\\n"],[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:"9rUU3uSO",block:'[[[1,"\\n"],[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})
+var n=(0,t.createTemplateFactory)({id:"k/tlhz7S",block:'[[[1,"\\n"],[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","@nspace"],[[30,9,["items"]],[30,6],[30,7]]],[["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:"UwadJzgF",block:'[[[1,"\\n"],[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","consul-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
@@ -4031,12 +4037,12 @@ e.default=n})),define("consul-ui/templates/loading",["exports","@ember/template-
 var n=(0,t.createTemplateFactory)({id:"5kbK/dah",block:'[[[1,"\\n"]],[],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:"qt+16XBx",block:'[[[1,"\\n"],[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
+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:"Lxy3wDlI",block:'[[[1,"\\n"],[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:"GXqC0vCH",block:'[[[1,"\\n"],[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
+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
@@ -4189,7 +4195,8 @@ 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(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)
@@ -4201,8 +4208,7 @@ if("object"!=typeof l)return l
 throw new TypeError("@@toPrimitive must return a primitive value.")}return("string"===t?String:Number)(e)}(e,"string")
 return"symbol"==typeof t?t:String(t)}(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{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){return(arguments.length>1&&void 0!==arguments[1]?arguments[1]:e).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.createLoader=void 0,e.default=function(e,t){n(e,t,(function(){e.getValue().trim().length&&e.performLint()}))}
 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
@@ -4384,13 +4390,13 @@ e.default=function(){let e=arguments.length>0&&void 0!==arguments[0]?arguments[0
 const r=new(arguments.length>2&&void 0!==arguments[2]?arguments[2]:n.default),i=e.shift().map((e=>(""===e.ServiceName&&r.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((r.get(t.Node)||[]).includes(t.CheckID))return e
 r.set(t.Node,t.CheckID)}return e.push(t),e}),[]))),[]))
 return l&&i.filter((e=>(0,t.get)(e,"Exposable"))).forEach((e=>{(0,t.set)(e,"Exposed",l)})),i}})),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
+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(".")
+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
@@ -4462,4 +4468,4 @@ 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+85171f50"})
+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+f7fad31c"})
diff --git a/agent/uiserver/dist/index.html b/agent/uiserver/dist/index.html
index 438fc074ed301..5f9cc4798c2d2 100644
--- a/agent/uiserver/dist/index.html
+++ b/agent/uiserver/dist/index.html
@@ -13,15 +13,15 @@
     <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%2B85171f50%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%2285171f50e0%22%2C%22CONSUL_VERSION%22%3A%221.18.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%2Bf7fad31c%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%22f7fad31c43%22%2C%22CONSUL_VERSION%22%3A%221.17.1-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" />
 
-  <!-- CONSUL_VERSION: 1.18.0-dev
+  <!-- CONSUL_VERSION: 1.17.1-dev
  -->
   <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-96fa74d5e60a3d6a951f980aebc0044d.css">
-<link rel="stylesheet" href="{{.ContentPath}}assets/chunk.143.db9b393ab5086aec385b.css"/>
+<link rel="stylesheet" href="{{.ContentPath}}assets/chunk.143.30749b40e28f0c692295.css"/>
   <link integrity="" rel="stylesheet" href="{{.ContentPath}}assets/consul-ui-ebf15e0a88f8aa4b2e353442d718d20d.css">
   
 
@@ -89,12 +89,12 @@ <h2>JavaScript Required</h2>
   <script src="{{.ContentPath}}assets/init-b7460a439b88b483c51ff7f67c5a5a24.js"></script>
   <script src="{{.ContentPath}}assets/vendor-892a8787e7c054f43bebe02b1e5bc878.js"></script>
 <script src="{{.ContentPath}}assets/chunk.924.719761ac5e77d019056f.js"></script>
-<script src="{{.ContentPath}}assets/chunk.143.db9b393ab5086aec385b.js"></script>
+<script src="{{.ContentPath}}assets/chunk.143.30749b40e28f0c692295.js"></script>
   
   <script src="{{.ContentPath}}assets/metrics-providers/consul-01a9b050be20fe471510e862e86d5d73.js"></script>
   <script src="{{.ContentPath}}assets/metrics-providers/prometheus-b790531c6c9836e44ba75fe16468fa27.js"></script>
   {{ range .ExtraScripts }} <script src="{{.}}"></script> {{ end }}
-  <script src="{{.ContentPath}}assets/consul-ui-88f8ddeb1f6a751c68c9f1de8978befa.js"></script>
+  <script src="{{.ContentPath}}assets/consul-ui-698b9ad7e3ebf8146d4d081130554ca9.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="jira-color-24__paint0_linear_4403_89" x1="11.412" x2="6.872" y1="5.455" y2="9.94" gradientUnits="userSpaceOnUse"><stop offset=".176" stop-color="#0052CC"/><stop offset="1" stop-color="#2684FF"/></linearGradient><linearGradient id="jira-color-24__paint1_linear_4403_89" x1="12.6" x2="17.131" y1="18.498" y2="14.022" gradientUnits="userSpaceOnUse"><stop offset=".176" stop-color="#0052CC"/><stop offset="1" stop-color="#2684FF"/></linearGradient><linearGradient id="jira-color-16__paint0_linear_4403_94" x1="7.58" x2="4.279" y1="3.24" y2="6.443" gradientUnits="userSpaceOnUse"><stop offset=".176" stop-color="#0052CC"/><stop offset="1" stop-color="#2684FF"/></linearGradient><linearGradient id="jira-color-16__paint1_linear_4403_94" x1="8.428" x2="11.722" y1="12.726" y2="9.53" gradientUnits="userSpaceOnUse"><stop offset=".176" stop-color="#0052CC"/><stop offset="1" stop-color="#2684FF"/></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-loading-static-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-static-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-running-static-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-static-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-cdk-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M24 11.41c0 3.006-2.03 4.11-3.24 4.5l-.259-.835c1.204-.389 2.64-1.34 2.64-3.665 0-2.94-2.38-3.675-3.403-3.855a.437.437 0 01-.351-.5c-.087-1.313-.705-2.296-1.652-2.577-.78-.232-1.61.075-2.122.782a.43.43 0 01-.41.173.435.435 0 01-.341-.287c-.353-1.02-.864-1.875-1.52-2.546-.806-.823-3.018-2.59-6.132-1.247-1.802.778-3.214 3.019-3.214 5.102 0 .235.014.467.04.694a.437.437 0 01-.32.476C2.649 7.902.86 8.758.86 11.373c0 .086.002.17.006.253.08 1.681 1.297 3.128 2.957 3.516l-.192.854C1.596 15.52.106 13.74.008 11.668A5.507 5.507 0 010 11.373c0-2.994 1.985-4.1 3.15-4.491a6.398 6.398 0 01-.013-.427c0-2.448 1.606-4.989 3.737-5.909C9.371-.53 12.018.004 13.951 1.982c.6.613 1.091 1.358 1.467 2.218.715-.61 1.66-.83 2.559-.563 1.234.368 2.06 1.526 2.244 3.125C21.431 7.051 24 8.061 24 11.41zM19.283 21.5l-3.007 1.383.01-4.294 2.997-1.354V21.5zm-7.713-.04l-2.996 1.416v-4.272l2.996-1.373v4.229zm-3.428-3.618l-2.83-1.279 2.831-1.318 2.814 1.306-2.815 1.29zm-3.447-.6l3.019 1.364v4.277L4.695 21.49v-4.249zm7.292-8.982l2.808 1.275L12 10.822 9.186 9.534l2.801-1.274zm1.058 8.3l2.8-1.316 2.82 1.311-2.809 1.27-2.81-1.265zm-.615.681l2.995 1.348-.008 4.286-2.987-1.415V17.24zm2.985-2.76l-2.985 1.403v-4.299l2.985-1.374v4.27zm-6.843.001l-.008-4.272 3.006 1.376v4.287l-2.998-1.39zm11.316 1.691l.004-.01-3.617-1.684V9.532a.44.44 0 00-.197-.368c-.019-.012-.043-.012-.063-.02l.004-.011-3.857-1.753a.422.422 0 00-.35 0L7.957 9.133l.005.01c-.021.01-.044.009-.063.022a.44.44 0 00-.196.368l.01 4.95-3.626 1.688.004.01c-.02.009-.042.009-.06.021a.44.44 0 00-.195.367v5.205c0 .172.098.328.252.399l3.879 1.788.005-.012c.056.025.112.051.172.051a.411.411 0 00.18-.041L12 22.222l3.665 1.737.006-.012a.42.42 0 00.175.053c.06 0 .12-.013.177-.04l3.868-1.778a.438.438 0 00.253-.399v-5.222a.44.44 0 00-.196-.367c-.018-.012-.04-.012-.06-.02z" clip-rule="evenodd"/></symbol><symbol id="flight-aws-cdk-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M14.91 12.673l-2.655 1.423V10.76l2.655-1.422v3.335zm-3.19-2.778l-2.659-1.42 2.661-1.477 2.66 1.471-2.662 1.426zm-4.254 2.788L4.81 14.105V10.76l2.657-1.428v3.35zm-6.4-3.342l2.677 1.421v3.28l-2.676-1.634V9.34zM7.99 1.077l2.615 1.402L8 3.734 5.392 2.49 7.99 1.077zm3.198 5.054L8.533 7.606V4.601l2.655-1.279v2.81zM7.466 7.595L4.81 6.13V3.334l2.657 1.268v2.993zm-3.192 2.3L1.6 8.475l2.676-1.478 2.66 1.467-2.662 1.431zm6.914 4.203l-2.655-1.416V9.343l2.655 1.418v3.337zm4.527-6.052l-.004-.002-3.456-1.913V2.504A.495.495 0 0012 2.077c-.014-.008-.03-.006-.044-.012l.006-.01L8.252.065a.564.564 0 00-.532.001l-3.712 2.02.001.002c-.003.002-.008.001-.011.003a.496.496 0 00-.255.427v3.612L.267 8.051l-.002.001-.002.001A.497.497 0 000 8.484v4.195c0 .169.09.327.242.419l3.743 2.287.004-.005c.009.005.01.014.02.019a.57.57 0 00.532.002L8 13.548l3.453 1.84v.002l.005.002v-.001a.566.566 0 00.528 0l3.722-1.994a.495.495 0 00.27-.434V8.476c0-.177-.101-.34-.263-.43z" clip-rule="evenodd"/></symbol><symbol id="flight-aws-cdk-color-24" viewBox="0 0 24 24"><path fill="#000" fill-rule="evenodd" d="M24 11.41c0 3.006-2.03 4.11-3.24 4.5l-.259-.835c1.204-.389 2.64-1.34 2.64-3.665 0-2.94-2.38-3.675-3.403-3.855a.437.437 0 01-.351-.5c-.087-1.313-.705-2.296-1.652-2.577-.78-.232-1.61.075-2.122.782a.43.43 0 01-.41.173.435.435 0 01-.341-.287c-.353-1.02-.864-1.875-1.52-2.546-.806-.823-3.018-2.59-6.132-1.247-1.802.778-3.214 3.019-3.214 5.102 0 .235.014.467.04.694a.437.437 0 01-.32.476C2.649 7.902.86 8.758.86 11.373c0 .086.002.17.006.253.08 1.681 1.297 3.128 2.957 3.516l-.192.854C1.596 15.52.106 13.74.008 11.668A5.507 5.507 0 010 11.373c0-2.994 1.985-4.1 3.15-4.491a6.398 6.398 0 01-.013-.427c0-2.448 1.606-4.989 3.737-5.909C9.371-.53 12.018.004 13.951 1.982c.6.613 1.091 1.358 1.467 2.218.715-.61 1.66-.83 2.559-.563 1.234.368 2.06 1.526 2.244 3.125C21.431 7.051 24 8.061 24 11.41zM19.283 21.5l-3.007 1.383.01-4.294 2.997-1.354V21.5zm-7.713-.04l-2.996 1.416v-4.272l2.996-1.373v4.229zm-3.428-3.618l-2.83-1.279 2.831-1.318 2.814 1.306-2.815 1.29zm-3.447-.6l3.019 1.364v4.277L4.695 21.49v-4.249zm7.292-8.982l2.808 1.275L12 10.822 9.186 9.534l2.801-1.274zm1.058 8.3l2.8-1.316 2.82 1.311-2.809 1.27-2.81-1.265zm-.615.681l2.995 1.348-.008 4.286-2.987-1.415V17.24zm2.985-2.76l-2.985 1.403v-4.299l2.985-1.374v4.27zm-6.843.001l-.008-4.272 3.006 1.376v4.287l-2.998-1.39zm11.316 1.691l.004-.01-3.617-1.684V9.532a.44.44 0 00-.197-.368c-.019-.012-.043-.012-.063-.02l.004-.011-3.857-1.753a.422.422 0 00-.35 0L7.957 9.133l.005.01c-.021.01-.044.009-.063.022a.44.44 0 00-.196.368l.01 4.95-3.626 1.688.004.01c-.02.009-.042.009-.06.021a.44.44 0 00-.195.367v5.205c0 .172.098.328.252.399l3.879 1.788.005-.012c.056.025.112.051.172.051a.411.411 0 00.18-.041L12 22.222l3.665 1.737.006-.012a.42.42 0 00.175.053c.06 0 .12-.013.177-.04l3.868-1.778a.438.438 0 00.253-.399v-5.222a.44.44 0 00-.196-.367c-.018-.012-.04-.012-.06-.02z" clip-rule="evenodd"/></symbol><symbol id="flight-aws-cdk-color-16" viewBox="0 0 16 16"><path fill="#000" fill-rule="evenodd" d="M14.91 12.673l-2.655 1.423V10.76l2.655-1.422v3.335zm-3.19-2.778l-2.659-1.42 2.661-1.477 2.66 1.471-2.662 1.426zm-4.254 2.788L4.81 14.105V10.76l2.657-1.428v3.35zm-6.4-3.342l2.677 1.421v3.28l-2.676-1.634V9.34zM7.99 1.077l2.615 1.402L8 3.734 5.392 2.49 7.99 1.077zm3.198 5.054L8.533 7.606V4.601l2.655-1.279v2.81zM7.466 7.595L4.81 6.13V3.334l2.657 1.268v2.993zm-3.192 2.3L1.6 8.475l2.676-1.478 2.66 1.467-2.662 1.431zm6.914 4.203l-2.655-1.416V9.343l2.655 1.418v3.337zm4.527-6.052l-.004-.002-3.456-1.913V2.504A.495.495 0 0012 2.077c-.014-.008-.03-.006-.044-.012l.006-.01L8.252.065a.564.564 0 00-.532.001l-3.712 2.02.001.002c-.003.002-.008.001-.011.003a.496.496 0 00-.255.427v3.612L.267 8.051l-.002.001-.002.001A.497.497 0 000 8.484v4.195c0 .169.09.327.242.419l3.743 2.287.004-.005c.009.005.01.014.02.019a.57.57 0 00.532.002L8 13.548l3.453 1.84v.002l.005.002v-.001a.566.566 0 00.528 0l3.722-1.994a.495.495 0 00.27-.434V8.476c0-.177-.101-.34-.263-.43z" clip-rule="evenodd"/></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-elastic-observability-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M15.75 22h5.625V7.143c0-2.81-1.959-5.098-4.392-5.128L15.75 2v20zm-1.875 0V7H8.25v4.375H2.625v6.248C2.625 20.04 4.371 22 6.524 22h7.351z" clip-rule="evenodd"/></symbol><symbol id="flight-elastic-observability-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.625 15h3.938V4.6c0-1.968-1.372-3.569-3.075-3.59L10.625 1v14zm-1.313 0V4.5H5.376v3.063H1.437v4.373C1.438 13.628 2.66 15 4.168 15h5.146z" clip-rule="evenodd"/></symbol><symbol id="flight-elastic-observability-color-24" viewBox="0 0 24 24"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#F04E98" d="M8.25 22H6.524c-2.153 0-3.899-1.96-3.899-4.377v-6.248H8.25V22z"/><path fill="#343741" d="M8.25 22h5.625V7H8.25v15z"/><path fill="#07C" d="M21.375 22H15.75V2l1.233.015c2.433.03 4.392 2.317 4.392 5.128V22z"/></g></symbol><symbol id="flight-elastic-observability-color-16" viewBox="0 0 16 16"><g fill-rule="evenodd" clip-rule="evenodd"><path fill="#F04E98" d="M5.375 15H4.167c-1.507 0-2.73-1.372-2.73-3.064V7.563h3.938V15z"/><path fill="#343741" d="M5.375 15h3.938V4.5H5.374V15z"/><path fill="#07C" d="M14.563 15h-3.938V1l.863.01c1.703.021 3.075 1.622 3.075 3.59V15z"/></g></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-google-docs-24" viewBox="0 0 24 24"><path fill="#0C67D6" d="M14.266 2l4.984 5h-4.984V2z"/><path fill-rule="evenodd" d="M6.11 22h11.78c.748 0 1.36-.614 1.36-1.364V7l-4.984-5H6.109c-.747 0-1.359.614-1.359 1.364v17.272c0 .75.612 1.364 1.36 1.364zm1.812-11.136h8.156V9.727H7.922v1.137zm0 1.59h8.156v1.137H7.922v-1.136zm0 2.728h5.89v1.136h-5.89v-1.136z" clip-rule="evenodd"/></symbol><symbol id="flight-google-docs-16" viewBox="0 0 16 16"><path fill="#0C67D6" d="M9.563 1L13 4.5H9.562V1z"/><path fill-rule="evenodd" d="M3.938 15h8.124c.516 0 .938-.43.938-.954V4.5L9.562 1H3.939A.949.949 0 003 1.955v12.09c0 .525.422.955.938.955zm1.25-7.795h5.625v-.796H5.186v.796zm0 1.113h5.625v.796H5.186v-.796zm0 1.91H9.25v.795H5.187v-.796z" clip-rule="evenodd"/></symbol><symbol id="flight-google-docs-color-24" viewBox="0 0 24 24"><path fill="#3086F6" d="M17.89 22H6.11c-.748 0-1.36-.614-1.36-1.364V3.364C4.75 2.614 5.362 2 6.11 2h8.156l4.984 5v13.636c0 .75-.612 1.364-1.36 1.364z"/><path fill="#0C67D6" d="M14.25 2l5 5h-5V2z"/><path fill="#FDFFFF" d="M15.688 10.864H7.811V9.727h7.875v1.137zm0 1.59H7.811v1.137h7.875v-1.136zM13.5 15.183H7.812v1.136H13.5v-1.136z"/></symbol><symbol id="flight-google-docs-color-16" viewBox="0 0 16 16"><path fill="#3086F6" d="M12.063 15H3.937A.949.949 0 013 14.046V1.955C3 1.43 3.422 1 3.938 1h5.624L13 4.5v9.546a.949.949 0 01-.938.954z"/><path fill="#0C67D6" d="M9.563 1L13 4.5H9.562V1z"/><path fill="#FDFFFF" d="M10.813 7.205H5.186v-.796h5.625v.796zm0 1.113H5.186v.796h5.625v-.796zm-1.563 1.91H5.187v.795H9.25v-.796z"/></symbol><symbol id="flight-google-drive-24" viewBox="0 0 24 24"><g><path d="M3.512 18.427l.882 1.535c.183.323.447.576.756.761l3.15-5.492H2c0 .357.092.715.275 1.038l1.237 2.158zM12 8.77L8.85 3.276c-.31.185-.573.438-.756.761l-5.82 10.154c-.179.316-.274.674-.274 1.039h6.3L12 8.769zM18.85 20.723c.31-.184.573-.438.756-.761l.366-.635 1.753-3.058c.183-.323.275-.68.275-1.038h-6.3l1.34 2.654 1.81 2.838z"/><path d="M12 8.77l3.15-5.493A2.003 2.003 0 0014.12 3H9.88c-.366 0-.72.104-1.03.277L12 8.769zM15.7 15.23H8.3l-3.15 5.493c.31.185.664.277 1.031.277h11.638a2.12 2.12 0 001.03-.277l-3.15-5.492z"/><path d="M18.816 9.115l-2.91-5.077a2.089 2.089 0 00-.756-.761L12 8.769l3.7 6.462h6.288c0-.358-.091-.716-.274-1.039l-2.898-5.077z"/></g></symbol><symbol id="flight-google-drive-16" viewBox="0 0 16 16"><g><path d="M2.058 12.285l.618 1.023c.128.215.313.384.529.507l2.205-3.661H1c0 .238.064.477.192.692l.866 1.439zM8 5.846L5.795 2.185c-.217.123-.401.292-.53.507l-4.073 6.77a1.35 1.35 0 00-.192.692h4.41L8 5.846zM12.795 13.815c.216-.123.4-.292.53-.507l.256-.423 1.227-2.039a1.35 1.35 0 00.192-.692h-4.41l.938 1.77 1.267 1.891z"/><path d="M8 5.846l2.205-3.661A1.456 1.456 0 009.483 2H6.517c-.257 0-.506.07-.722.185L8 5.846zM10.59 10.154H5.41l-2.205 3.661c.217.123.465.185.722.185h8.146c.257 0 .505-.07.722-.185l-2.205-3.661z"/><path d="M12.77 6.077l-2.036-3.385a1.428 1.428 0 00-.529-.507L8 5.846l2.59 4.308h4.402a1.35 1.35 0 00-.193-.692l-2.028-3.385z"/></g></symbol><symbol id="flight-google-drive-color-24" viewBox="0 0 24 24"><path fill="#0066DA" d="M3.512 18.427l.882 1.535c.183.323.447.576.756.761l3.15-5.492H2c0 .357.092.715.275 1.038l1.237 2.158z"/><path fill="#00AC47" d="M12 8.77L8.85 3.276c-.31.184-.573.438-.756.761l-5.82 10.154c-.179.316-.274.674-.274 1.039h6.3L12 8.769z"/><path fill="#EA4335" d="M18.85 20.723c.31-.185.573-.438.756-.761l.366-.635 1.753-3.058c.183-.323.275-.68.275-1.038h-6.3l1.34 2.654 1.81 2.838z"/><path fill="#00832D" d="M12 8.77l3.15-5.493A2.003 2.003 0 0014.119 3H9.881c-.367 0-.722.104-1.031.277L12 8.769z"/><path fill="#2684FC" d="M15.7 15.23H8.3l-3.15 5.493c.31.185.665.277 1.031.277H17.82a2.12 2.12 0 001.031-.277l-3.15-5.492z"/><path fill="#FFBA00" d="M18.816 9.115l-2.91-5.077a2.089 2.089 0 00-.756-.761L12 8.769l3.7 6.462h6.288c0-.358-.091-.716-.274-1.039l-2.898-5.077z"/></symbol><symbol id="flight-google-drive-color-16" viewBox="0 0 16 16"><path fill="#0066DA" d="M2.058 12.285l.618 1.023c.128.215.313.384.529.507l2.205-3.661H1c0 .238.064.477.192.692l.866 1.439z"/><path fill="#00AC47" d="M8 5.846L5.795 2.185c-.217.123-.401.292-.53.507l-4.073 6.77a1.35 1.35 0 00-.192.692h4.41L8 5.846z"/><path fill="#EA4335" d="M12.795 13.815c.216-.123.4-.292.53-.507l.256-.423 1.227-2.039a1.35 1.35 0 00.192-.692h-4.41l.938 1.769 1.267 1.892z"/><path fill="#00832D" d="M8 5.846l2.205-3.661A1.456 1.456 0 009.483 2H6.517c-.257 0-.506.07-.722.185L8 5.846z"/><path fill="#2684FC" d="M10.59 10.154H5.41l-2.205 3.661c.217.123.465.185.722.185h8.146c.257 0 .505-.07.722-.185l-2.205-3.661z"/><path fill="#FFBA00" d="M12.77 6.077l-2.036-3.385a1.427 1.427 0 00-.529-.507L8 5.846l2.59 4.308h4.402a1.35 1.35 0 00-.193-.693l-2.028-3.384z"/></symbol><symbol id="flight-google-forms-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M6.11 22h11.78c.748 0 1.36-.614 1.36-1.364V7l-4.984-5H6.109c-.747 0-1.359.614-1.359 1.364v17.272c0 .75.612 1.364 1.36 1.364zm2.945-11.704a.624.624 0 11-1.248.001.624.624 0 011.248-.002zm7.023.568h-5.89V9.727h5.89v1.137zm0 1.59h-5.89v1.137h5.89v-1.136zm0 2.728h-5.89v1.136h5.89v-1.136zm-7.646-1.534A.624.624 0 108.43 12.4a.624.624 0 00.002 1.248zm.623 2.102a.624.624 0 11-1.248.002.624.624 0 011.248-.002z" clip-rule="evenodd"/></symbol><symbol id="flight-google-forms-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M12.063 15H3.937A.949.949 0 013 14.046V1.955C3 1.43 3.422 1 3.938 1h5.624L13 4.5v9.546a.949.949 0 01-.938.954zM6.75 7.205h4.063v-.796H6.75v.796zm0 1.113h4.063v.796H6.75v-.796zm0 1.91h4.063v.795H6.75v-.796zm-.781-3.421a.434.434 0 01-.43.437.434.434 0 01-.43-.437c0-.242.193-.438.43-.438s.43.196.43.438zm-.43 2.346c.237 0 .43-.195.43-.437a.434.434 0 00-.43-.438.434.434 0 00-.43.438c0 .242.193.437.43.437zm.43 1.472a.434.434 0 01-.43.438.434.434 0 01-.43-.438c0-.242.193-.438.43-.438s.43.196.43.438z" clip-rule="evenodd"/></symbol><symbol id="flight-google-forms-color-24" viewBox="0 0 24 24"><path fill="#7248B9" d="M17.89 22H6.11c-.748 0-1.36-.614-1.36-1.364V3.364C4.75 2.614 5.362 2 6.11 2h8.156l4.984 5v13.636c0 .75-.612 1.364-1.36 1.364z"/><path fill="#56368A" d="M14.266 2l4.984 5h-4.984V2z"/><g fill="#FDFFFF"><path d="M16.078 10.864h-5.89V9.727h5.89v1.137zm0 1.59h-5.89v1.137h5.89v-1.136zm0 2.728h-5.89v1.136h5.89v-1.136zM9.055 10.295a.624.624 0 11-1.248.002.624.624 0 011.248-.002zM9.055 13.023a.624.624 0 11-1.248.002.624.624 0 011.248-.002zM9.055 15.75a.624.624 0 11-1.248.002.624.624 0 011.248-.002z"/></g></symbol><symbol id="flight-google-forms-color-16" viewBox="0 0 16 16"><path fill="#7248B9" d="M12.063 15H3.937A.949.949 0 013 14.046V1.955C3 1.43 3.422 1 3.938 1h5.624L13 4.5v9.546a.949.949 0 01-.938.954z"/><path fill="#56368A" d="M9.563 1L13 4.5H9.562V1z"/><g fill="#FDFFFF"><path d="M10.813 7.204H6.75V6.41h4.063v.795zm0 1.114H6.75v.796h4.063v-.796zm0 1.91H6.75v.795h4.063v-.796zM5.969 6.807a.434.434 0 01-.43.437.434.434 0 01-.43-.437c0-.242.193-.438.43-.438s.43.196.43.438zM5.969 8.716a.434.434 0 01-.43.437.434.434 0 01-.43-.437c0-.242.193-.438.43-.438s.43.196.43.438zM5.969 10.625a.434.434 0 01-.43.437.434.434 0 01-.43-.437c0-.242.193-.438.43-.438s.43.196.43.438z"/></g></symbol><symbol id="flight-google-sheets-24" viewBox="0 0 24 24"><g><path d="M11.434 15.182H8.602V13.59h2.832v1.59zM11.434 12.455H8.602v-1.591h2.832v1.59zM15.398 15.182h-2.832V13.59h2.832v1.59zM15.398 12.455h-2.832v-1.591h2.832v1.59z"/><path fill-rule="evenodd" d="M19.25 20.636V7l-4.984-5H6.109c-.75 0-1.359.61-1.359 1.364v17.272c0 .754.608 1.364 1.36 1.364h11.78c.752 0 1.36-.61 1.36-1.364zM7.469 9.727v6.591h9.062v-6.59H7.47z" clip-rule="evenodd"/></g></symbol><symbol id="flight-google-sheets-16" viewBox="0 0 16 16"><g><path d="M7.61 10.227H5.655V9.114H7.61v1.113zM7.61 8.318H5.655V7.205H7.61v1.113zM10.344 10.227H8.39V9.114h1.953v1.113zM10.344 8.318H8.39V7.205h1.953v1.113z"/><path fill-rule="evenodd" d="M13 14.046V4.5L9.562 1H3.939A.946.946 0 003 1.955v12.09c0 .528.42.955.938.955h8.124a.946.946 0 00.938-.954zM4.875 6.409v4.614h6.25V6.409h-6.25z" clip-rule="evenodd"/></g></symbol><symbol id="flight-google-sheets-color-24" viewBox="0 0 24 24"><path fill="#188038" d="M14.266 2l4.984 5h-4.984V2z"/><path fill="#34A853" d="M14.266 7V2H6.109c-.75 0-1.359.61-1.359 1.364v17.272c0 .754.608 1.364 1.36 1.364h11.78c.752 0 1.36-.61 1.36-1.364V7h-4.984z"/><path fill="#FDFFFF" d="M7.469 9.727v6.591h9.062v-6.59H7.47zm3.965 5.455H8.602V13.59h2.832v1.59zm0-2.727H8.602v-1.591h2.832v1.59zm3.964 2.727h-2.832V13.59h2.832v1.59zm0-2.727h-2.832v-1.591h2.832v1.59z"/></symbol><symbol id="flight-google-sheets-color-16" viewBox="0 0 16 16"><path fill="#188038" d="M9.5 1L13 4.5H9.5V1z"/><path fill="#34A853" d="M9.5 4.5V1H3.937A.946.946 0 003 1.955v12.09c0 .528.42.955.938.955h8.124a.946.946 0 00.938-.954V4.5H9.5z"/><path fill="#FDFFFF" d="M5 6v5h6V6H5zm2.625 4.138H5.75V8.93h1.875v1.207zm0-2.069H5.75V6.862h1.875V8.07zm2.625 2.069H8.375V8.93h1.875v1.207zm0-2.069H8.375V6.862h1.875V8.07z"/></symbol><symbol id="flight-google-slides-24" viewBox="0 0 24 24"><g><path d="M15.398 10.864H8.602v3.863h6.796v-3.863z"/><path fill-rule="evenodd" d="M6.11 22h11.78c.748 0 1.36-.614 1.36-1.364V7l-4.984-5H6.109c-.747 0-1.359.614-1.359 1.364v17.272c0 .75.612 1.364 1.36 1.364zM16.53 9.727H7.47v6.137h9.062V9.727z" clip-rule="evenodd"/></g></symbol><symbol id="flight-google-slides-16" viewBox="0 0 16 16"><g><path d="M10.344 7.315H5.656v2.753h4.688V7.315z"/><path fill-rule="evenodd" d="M3.938 15.25h8.124c.516 0 .938-.437.938-.972V4.562L9.563 1H3.937C3.422 1 3 1.437 3 1.972v12.306c0 .535.422.972.938.972zm7.187-8.744h-6.25v4.372h6.25V6.506z" clip-rule="evenodd"/></g></symbol><symbol id="flight-google-slides-color-24" viewBox="0 0 24 24"><path fill="#FBBC04" d="M17.89 22H6.11c-.748 0-1.36-.614-1.36-1.364V3.364C4.75 2.614 5.362 2 6.11 2h8.156l4.984 5v13.636c0 .75-.612 1.364-1.36 1.364z"/><path fill="#F29900" d="M14.266 2l4.984 5h-4.984V2z"/><path fill="#FDFFFF" fill-rule="evenodd" d="M16.531 9.727H7.47v6.137h9.062V9.727zm-1.133 1.137H8.602v3.863h6.796v-3.863z" clip-rule="evenodd"/></symbol><symbol id="flight-google-slides-color-16" viewBox="0 0 16 16"><path fill="#FBBC04" d="M12.063 15H3.937A.949.949 0 013 14.046V1.955C3 1.43 3.422 1 3.938 1h5.624L13 4.5v9.546a.949.949 0 01-.938.954z"/><path fill="#F29900" d="M9.563 1L13 4.5H9.562V1z"/><path fill="#fff" fill-rule="evenodd" d="M11.125 6.41h-6.25v4.295h6.25V6.409zm-.781.795H5.656v2.704h4.688V7.205z" clip-rule="evenodd"/></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-jfrog-24" viewBox="0 0 24 24"><path d="M10.991 14.818l-.95.274c.082.249.15.694.15 1.293v2.946h1.065v-3.117c.199-.248.414-.368.645-.368.117 0 .208.026.307.086l.29-1.019a.766.766 0 00-.398-.095.89.89 0 00-.348.07c-.198.102-.447.334-.603.555a1.24 1.24 0 00-.158-.625zM7.32 13.364h-.115v5.958h1.107v-2.637H9.71V15.7H8.312v-1.37h1.745l.066-.521a17.172 17.172 0 01-2.803-.445zm-2.589 6.753l.513.618c.497-.205 1.118-.667 1.283-1.405.057-.239.075-.393.075-1.172v-4.786H5.48v4.914c0 .643-.024.882-.106 1.105-.108.248-.365.54-.645.728l.001-.002zm10.066-3.02c0 1.044-.197 1.49-.653 1.49a.572.572 0 01-.32-.098.601.601 0 01-.217-.263c-.083-.222-.132-.6-.132-1.113 0-.437.04-.745.107-.984.082-.274.29-.446.546-.446.19 0 .355.086.454.232.15.205.215.59.215 1.181zm.653 1.711c.349-.427.506-.95.506-1.703 0-.712-.14-1.199-.463-1.61-.348-.445-.795-.66-1.373-.66-1.092 0-1.82.916-1.82 2.304 0 1.387.72 2.277 1.82 2.277.62.008 1.024-.23 1.33-.608zm3.029-2.466c0 .404-.233.625-.645.625-.373 0-.622-.178-.622-.625 0-.41.233-.65.629-.65.397 0 .637.24.637.65zm1.877-.941l-.439-.728c-.248.24-.545.377-.835.377-.133 0-.207-.017-.496-.093a2.386 2.386 0 00-.728-.113c-1.035 0-1.704.582-1.704 1.49 0 .65.282 1.062.869 1.224-.24.06-.497.189-.612.334a.627.627 0 00-.125.403c0 .137.033.257.083.36.054.094.135.169.232.213.19.078.495.13.968.138.247 0 .396.008.446.008.29.017.438.07.554.128.108.07.19.223.19.395 0 .17-.099.341-.256.445-.14.102-.372.146-.67.146-.488 0-.76-.19-.76-.54 0-.155.016-.189.049-.283h-.976a.925.925 0 00-.091.445c0 .3.108.557.331.78.364.367.96.47 1.53.47.628 0 1.24-.154 1.596-.564.223-.257.322-.54.322-.909 0-.393-.107-.693-.347-.94-.281-.283-.603-.386-1.224-.395l-.57-.008c-.108 0-.175-.043-.175-.103 0-.12.15-.223.423-.36.082.008.107.008.157.008.86 0 1.488-.547 1.488-1.31a1.12 1.12 0 00-.24-.719c.133.017.174.026.273.026.282 0 .505-.093.737-.325zM7.038 8.184c-1.323.334-2.224.993-2.224 1.747 0 .47.347.898.918 1.232a1.715 1.715 0 01-.265-.898c.007-.78.595-1.507 1.571-2.08zM21 11.137c0-.497-.298-.95-.794-1.326.041.155.075.308.075.462 0 1.413-1.911 2.628-4.624 3.133.306.034.62.052.951.052C19.03 13.45 21 12.414 21 11.138zm-1.563-.77c0-.522-.43-1.001-1.166-1.396.172.215.264.446.264.686 0 1.258-2.58 2.277-5.773 2.277-3.184 0-5.773-1.019-5.773-2.277 0-.163.04-.317.123-.463-.512.351-.802.753-.802 1.182 0 1.36 2.937 2.465 6.56 2.465 3.623 0 6.567-1.121 6.567-2.474zm-2.862-.067c-1.34.89-5.46 1.232-7.23.085-1.389-.899-.909-2.329-4.888-5.462-.52-.411.1-.848.489-.565.388.283.033.352.819 1.164 1.587 1.645 1.57.163 1.819.729.53 1.172 1.688 2.353 1.688 2.353 1.166.788 2.092.959 3.813-.248 1.091-.762.644 1.216 3.317-.214.975-.522.934-.17 1.926-1.601.413-.59 1.2.454.306.6-.355.06-.96.462-1.215 1.095-.372.95-.216 1.652-.844 2.064zM9.147 7.885c-.33-.154-.678-.737-.81-.967.372-.377.223-1.001.008-1.344-.207-.342-.463-.249-.735-.565-.282-.318.106-1.138.462-.505 1.332 2.372 2.208 1.386 3.293 1.241 1.042-.137 1.968.454 2.25-1.215.049-.274.305-.334.33.11.024.455.19 1.55.761 1.687.57.146 1.034-.137 1.166-.29.132-.156.206-.138.265.256.058.385.206.925 1.009.326 1.646-1.216 1.174-1.687 1.82-2.003.363-.18.942.402.107.838-1.19.625-1.315 1.395-2.067 1.883-1.267.822-.878.035-2.912-.265-.786-.111-1.035.788-1.646.53-1.398-.598-2.384-.479-3.301.283zm4.41-4.391c.049.36.107.35.231.377.124.034.281-.171.281-.36.008-.197-.082-.317-.264-.308-.191.008-.257.102-.249.291zm6.12.642c.15.145.545.051.637-.06.24-.274.247-.437.123-.625-.123-.18-.38-.154-.637.043-.256.196-.207.564-.124.642zm-.108 1.815c-.124.17-.132.3-.041.394.099.102.298.187.439.077.14-.12.14-.292.024-.437-.124-.155-.29-.155-.422-.034zM7.014 3.81c.19.06.28.248.438.034.083-.103.09-.248-.017-.404-.066-.093-.38-.163-.512-.024-.133.137-.008.36.09.394h.001zm-3.88-.12c.347.222.57.556.835.256.09-.102.198-.282.008-.641-.14-.266-.594-.368-.751-.266-.165.093-.364.48-.091.65h-.001zm3.201 1.704c.108.12.298.11.414.042.108-.068.09-.248-.017-.402-.066-.095-.265-.146-.397 0-.132.145-.073.273 0 .36z"/></symbol><symbol id="flight-jfrog-16" viewBox="0 0 16 16"><path d="M7.271 10.036l-.686.197c.06.18.108.501.108.934v2.128h.77v-2.251c.143-.18.299-.266.465-.266a.4.4 0 01.222.061l.21-.735a.554.554 0 00-.288-.068.643.643 0 00-.25.05 1.403 1.403 0 00-.437.4.895.895 0 00-.114-.45zM4.62 8.985h-.083v4.303h.8v-1.905h1.01v-.71h-1.01v-.99h1.26l.048-.377a12.405 12.405 0 01-2.025-.321zm-1.87 4.878l.37.446c.36-.149.808-.482.927-1.015.042-.173.054-.284.054-.847V8.992h-.81v3.549c0 .464-.016.637-.076.798a1.37 1.37 0 01-.466.526l.001-.002zm7.27-2.182c0 .754-.143 1.076-.471 1.076a.413.413 0 01-.232-.07.435.435 0 01-.157-.19c-.06-.16-.095-.434-.095-.804 0-.316.03-.538.077-.711.06-.198.21-.322.395-.322.137 0 .256.062.328.167.108.149.155.426.155.854zm.472 1.236c.251-.309.365-.687.365-1.23 0-.514-.101-.866-.334-1.163a1.182 1.182 0 00-.992-.476c-.789 0-1.314.661-1.314 1.663s.52 1.645 1.314 1.645c.448.006.74-.166.96-.439zm2.187-1.78c0 .29-.168.45-.466.45-.27 0-.448-.128-.448-.45 0-.298.167-.47.454-.47.287 0 .46.173.46.47zm1.356-.681l-.317-.525c-.179.174-.394.272-.603.272-.096 0-.15-.013-.359-.068a1.728 1.728 0 00-.525-.081c-.748 0-1.23.42-1.23 1.076 0 .47.202.767.627.884-.174.043-.359.136-.443.241a.454.454 0 00-.09.292c0 .098.024.185.06.26.04.067.098.121.168.153.137.056.358.093.699.1.179 0 .286.005.322.005.21.013.317.05.4.093.078.05.138.161.138.285a.396.396 0 01-.185.321c-.102.074-.27.106-.484.106-.352 0-.55-.136-.55-.39 0-.112.012-.136.036-.204h-.705a.668.668 0 00-.066.321c0 .217.078.402.24.563.262.266.693.34 1.105.34.454 0 .896-.111 1.152-.408a.934.934 0 00.233-.656c0-.284-.077-.5-.25-.68-.204-.203-.437-.278-.884-.284l-.413-.005c-.077 0-.125-.032-.125-.075 0-.086.107-.162.304-.26a.95.95 0 00.114.005c.621 0 1.075-.395 1.075-.945 0-.21-.06-.371-.173-.52.096.013.125.019.197.019.203 0 .364-.067.532-.235zM4.416 5.244c-.955.241-1.606.717-1.606 1.262 0 .34.25.648.663.89a1.238 1.238 0 01-.191-.65c.005-.562.43-1.087 1.134-1.502zM14.5 7.377c0-.359-.215-.686-.574-.958.03.112.054.222.054.334 0 1.02-1.38 1.898-3.339 2.263.221.024.448.037.687.037 1.75-.006 3.172-.754 3.172-1.676zm-1.129-.556c0-.378-.31-.723-.842-1.008a.786.786 0 01.191.495c0 .908-1.863 1.644-4.17 1.644-2.3 0-4.17-.735-4.17-1.644 0-.118.03-.229.09-.334-.37.253-.58.543-.58.853 0 .983 2.122 1.78 4.738 1.78 2.617 0 4.743-.81 4.743-1.786zm-2.067-.049c-.967.643-3.943.89-5.221.062-1.004-.65-.657-1.682-3.53-3.945-.376-.297.072-.612.352-.408.28.204.024.254.592.84 1.146 1.188 1.134.118 1.314.527.382.846 1.218 1.7 1.218 1.7.843.569 1.512.692 2.754-.18.789-.55.466.878 2.396-.154.704-.377.675-.123 1.392-1.157.297-.426.866.328.22.433-.256.044-.693.334-.877.792-.27.686-.156 1.193-.61 1.49zM5.94 5.028c-.239-.111-.49-.532-.585-.698.268-.273.16-.723.005-.971-.149-.247-.334-.18-.53-.408-.205-.23.076-.822.333-.365.962 1.713 1.595 1.002 2.378.897.753-.1 1.422.327 1.625-.878.035-.198.22-.241.239.08.017.328.137 1.119.55 1.218.411.105.746-.1.842-.21.095-.112.149-.1.19.185.043.279.15.668.73.235 1.188-.878.848-1.218 1.313-1.446.263-.13.681.29.079.605-.86.452-.95 1.008-1.494 1.36-.914.594-.634.025-2.103-.191-.567-.08-.747.569-1.189.383-1.01-.433-1.721-.346-2.383.204zm3.184-3.171c.036.26.077.253.167.272.09.024.203-.124.203-.26.006-.142-.06-.229-.19-.222-.138.005-.186.074-.18.21zm4.42.463c.108.105.394.037.46-.043.174-.198.18-.315.09-.452-.09-.13-.275-.11-.46.032-.185.142-.15.407-.09.463zm-.078 1.311c-.089.124-.095.217-.03.284.072.075.216.136.318.057.1-.087.1-.211.018-.316-.09-.112-.21-.112-.306-.025zM4.4 2.085c.137.043.203.18.316.025.06-.075.065-.18-.012-.292-.048-.067-.275-.118-.37-.018-.096.1-.005.26.065.285H4.4zm-2.803-.087c.251.161.412.402.604.185.065-.073.143-.203.005-.463-.1-.192-.428-.266-.542-.192-.12.068-.263.347-.065.47h-.002zm2.313 1.23c.077.087.215.08.298.032.078-.05.066-.18-.012-.29-.047-.07-.19-.106-.287 0-.095.104-.052.196 0 .259z"/></symbol><symbol id="flight-jfrog-color-24" viewBox="0 0 24 24"><path fill="#40BE46" d="M10.995 14.813l-.947.275c.086.25.15.696.15 1.29v2.938h1.058v-3.11c.197-.25.41-.37.647-.37.118 0 .205.026.308.086l.292-1.014a.761.761 0 00-.395-.095.876.876 0 00-.348.07c-.197.102-.45.334-.6.558a1.507 1.507 0 00-.165-.628zm-3.674-1.452h-.116v5.955h1.106v-2.638h1.397v-.98H8.311v-1.366h1.745l.067-.52a18.045 18.045 0 01-2.802-.451zm-2.59 6.745l.513.62c.497-.207 1.12-.671 1.28-1.402.054-.24.078-.395.078-1.168v-4.781H5.48v4.91c0 .644-.024.885-.11 1.1-.103.24-.356.532-.64.721zm10.068-3.016c0 1.04-.197 1.486-.655 1.486a.58.58 0 01-.537-.36c-.086-.224-.134-.602-.134-1.108 0-.439.04-.748.11-.98.087-.275.293-.447.545-.447a.55.55 0 01.458.232c.142.198.213.585.213 1.177zm.648 1.71c.347-.43.505-.945.505-1.701 0-.714-.143-1.195-.466-1.607-.347-.447-.797-.662-1.374-.662-1.09 0-1.816.92-1.816 2.303 0 1.384.719 2.277 1.816 2.277.624 0 1.027-.232 1.335-.61zm3.031-2.466c0 .404-.229.627-.647.627-.371 0-.624-.18-.624-.627 0-.412.229-.653.632-.653.402 0 .64.24.64.653zm1.871-.937l-.442-.73c-.244.24-.545.378-.837.378-.134 0-.205-.018-.497-.094a2.39 2.39 0 00-.727-.112c-1.034 0-1.704.584-1.704 1.487 0 .653.284 1.057.868 1.22-.237.06-.498.189-.616.335a.61.61 0 00-.127.404c0 .137.032.258.08.36a.515.515 0 00.229.215c.19.078.497.13.97.138.245 0 .396.008.45.008.293.017.443.069.553.13.11.068.19.223.19.395a.564.564 0 01-.253.447c-.142.102-.371.145-.67.145-.49 0-.759-.188-.759-.54 0-.156.016-.19.047-.285h-.978c-.04.086-.095.207-.095.448 0 .3.11.558.332.781.363.37.955.473 1.531.473.632 0 1.24-.155 1.595-.567.22-.258.323-.541.323-.91 0-.396-.11-.697-.347-.937-.284-.284-.607-.387-1.224-.396l-.568-.008c-.11 0-.174-.043-.174-.104 0-.12.15-.223.419-.36a1.2 1.2 0 00.158.009c.86 0 1.492-.55 1.492-1.307a1.12 1.12 0 00-.237-.722c.134.018.174.026.276.026.292 0 .513-.095.742-.327zM7.042 8.19c-1.324.335-2.223.99-2.223 1.743 0 .466.345.894.92 1.232a1.725 1.725 0 01-.266-.898c0-.784.586-1.504 1.569-2.077zM21 11.133c0-.494-.294-.952-.795-1.328.045.15.07.304.07.461 0 1.415-1.91 2.625-4.62 3.127.306.036.625.055.952.055 2.426 0 4.393-1.036 4.393-2.315zm-1.561-.77c0-.519-.43-1-1.163-1.396.172.214.265.443.265.681 0 1.254-2.584 2.271-5.77 2.271-3.188 0-5.772-1.017-5.772-2.27a.99.99 0 01.122-.466c-.512.35-.804.753-.804 1.18 0 1.358 2.937 2.459 6.56 2.459 3.625 0 6.562-1.101 6.562-2.46v.001zm-2.866-.06c-1.337.893-5.456 1.23-7.23.084-1.39-.898-.913-2.323-4.89-5.46-.52-.41.097-.846.486-.567.39.279.033.353.819 1.166 1.586 1.641 1.57.166 1.821.724.527 1.173 1.69 2.355 1.69 2.355 1.164.784 2.093.955 3.81-.246 1.09-.763.644 1.211 3.315-.211.974-.519.933-.175 1.923-1.602.411-.592 1.197.455.306.601-.356.058-.958.461-1.216 1.098-.365.941-.207 1.638-.834 2.057zM9.15 7.888c-.33-.15-.676-.732-.81-.965.369-.374.22-1 .01-1.344-.208-.343-.46-.246-.738-.561-.277-.316.104-1.139.46-.506 1.332 2.369 2.206 1.383 3.294 1.242 1.044-.136 1.967.453 2.25-1.213.046-.272.302-.338.329.113.026.45.19 1.547.763 1.689.575.141 1.03-.14 1.165-.295.134-.155.204-.133.264.253.058.387.204.92 1.01.326 1.648-1.216 1.176-1.687 1.817-2 .365-.177.94.402.109.837-1.19.621-1.315 1.393-2.066 1.883-1.263.825-.877.033-2.909-.266-.782-.115-1.034.787-1.644.526-1.409-.601-2.392-.486-3.304.28zm4.403-4.391c.046.355.104.346.227.38.123.032.28-.168.285-.362.005-.195-.08-.317-.266-.31-.185.007-.252.104-.246.292zm6.122.647c.148.15.543.048.635-.058.237-.274.245-.44.123-.623s-.38-.15-.636.042c-.254.19-.206.554-.122.64v-.001zm-.11 1.809c-.128.174-.131.298-.041.394.096.103.296.192.44.073.142-.117.142-.288.02-.44-.122-.15-.288-.15-.42-.027zM7.014 3.815c.194.062.279.248.442.035.08-.105.088-.243-.018-.4-.068-.098-.382-.165-.516-.026-.133.14-.012.358.092.391zm-3.882-.12c.347.22.574.553.836.256.087-.099.197-.286.008-.645-.139-.262-.595-.37-.756-.269-.16.1-.357.488-.088.659zm3.205 1.701c.11.119.298.11.41.045.112-.065.089-.244-.018-.4-.068-.098-.268-.144-.401-.004-.134.139-.068.276.01.36z"/></symbol><symbol id="flight-jfrog-color-16" viewBox="0 0 16 16"><path fill="#40BE46" d="M7.274 10.032l-.684.198c.063.18.108.503.108.931v2.123h.765v-2.247c.142-.18.296-.267.467-.267.085 0 .148.019.223.062l.21-.732a.55.55 0 00-.285-.068.632.632 0 00-.251.05 1.36 1.36 0 00-.433.403 1.088 1.088 0 00-.12-.453zM4.621 8.983h-.084v4.3h.799v-1.905h1.009v-.707h-1.01v-.987h1.26l.05-.376a13.032 13.032 0 01-2.024-.325zM2.75 13.854l.37.448c.36-.15.81-.485.924-1.012.04-.174.057-.286.057-.844V8.993h-.81v3.546c0 .465-.016.64-.08.794a1.333 1.333 0 01-.461.521zm7.272-2.178c0 .751-.143 1.074-.473 1.074a.42.42 0 01-.388-.26c-.063-.162-.097-.435-.097-.801 0-.317.028-.54.08-.708.062-.198.21-.322.393-.322.137 0 .256.061.33.167.103.143.155.422.155.85zm.467 1.235c.251-.31.365-.683.365-1.229 0-.515-.103-.862-.336-1.16a1.183 1.183 0 00-.993-.478c-.786 0-1.31.664-1.31 1.663 0 1 .518 1.645 1.31 1.645.451 0 .742-.168.964-.44zm2.19-1.781c0 .292-.166.453-.468.453-.268 0-.45-.13-.45-.453 0-.298.165-.472.456-.472.29 0 .462.174.462.472zm1.35-.677l-.318-.527a.881.881 0 01-.604.273c-.098 0-.149-.012-.36-.068a1.727 1.727 0 00-.524-.08c-.748 0-1.232.421-1.232 1.073 0 .472.205.763.627.881-.17.044-.36.137-.444.242a.441.441 0 00-.092.292c0 .1.023.186.057.26.04.07.097.125.166.155.136.057.36.094.7.1.178 0 .286.006.326.006.211.012.32.05.399.094.08.049.137.16.137.285a.408.408 0 01-.183.323c-.102.074-.268.105-.484.105-.354 0-.547-.137-.547-.391 0-.112.011-.137.033-.205h-.706c-.029.062-.069.15-.069.323 0 .217.08.403.24.565.262.266.69.341 1.106.341.456 0 .895-.112 1.152-.41a.948.948 0 00.233-.657c0-.286-.08-.503-.25-.677-.206-.205-.44-.28-.884-.285l-.411-.007c-.08 0-.125-.03-.125-.074 0-.087.108-.161.302-.26.057.006.08.006.114.006.622 0 1.078-.397 1.078-.944a.81.81 0 00-.172-.521c.097.012.126.019.2.019.21 0 .37-.069.536-.236zM4.42 5.248c-.956.241-1.605.714-1.605 1.258 0 .337.25.646.665.89a1.246 1.246 0 01-.193-.648c0-.566.424-1.087 1.133-1.5zM14.5 7.373c0-.356-.213-.687-.574-.958.032.108.05.22.05.333 0 1.021-1.38 1.896-3.336 2.258.221.026.451.04.687.04 1.752 0 3.173-.749 3.173-1.672zm-1.127-.555c0-.375-.311-.722-.84-1.009.124.155.191.32.191.492 0 .906-1.866 1.64-4.168 1.64-2.301 0-4.168-.734-4.168-1.64 0-.115.03-.227.088-.335-.37.253-.58.543-.58.852 0 .98 2.12 1.775 4.738 1.775 2.617 0 4.739-.795 4.739-1.775zm-2.07-.044c-.966.645-3.94.889-5.222.061-1.004-.649-.66-1.677-3.531-3.944-.376-.296.07-.61.35-.409.282.201.024.255.592.842 1.145 1.186 1.134.12 1.315.523.38.848 1.22 1.701 1.22 1.701.841.566 1.512.69 2.752-.178.787-.55.465.875 2.394-.152.704-.375.675-.126 1.39-1.157.296-.428.864.329.22.434-.257.042-.691.333-.878.793-.263.68-.15 1.183-.602 1.486zM5.942 5.03c-.239-.109-.488-.529-.586-.697.267-.27.159-.722.008-.97-.15-.249-.333-.178-.533-.406-.2-.228.075-.822.332-.365.962 1.71 1.593.999 2.38.897.753-.098 1.42.327 1.624-.876.034-.197.219-.244.237.081.02.325.138 1.118.552 1.22.415.102.744-.1.841-.213.097-.112.148-.096.19.183.043.28.148.665.73.235 1.19-.878.85-1.218 1.313-1.444.263-.128.678.29.078.604-.859.449-.95 1.006-1.492 1.36-.912.596-.633.024-2.1-.192-.565-.083-.747.568-1.188.38-1.018-.434-1.727-.351-2.386.203zm3.18-3.172c.033.257.075.25.164.275.089.023.201-.121.205-.261.004-.14-.058-.23-.192-.224-.134.005-.182.075-.177.21zm4.421.468c.107.108.392.035.459-.042.17-.198.176-.317.088-.45-.088-.132-.274-.108-.458.03s-.15.4-.089.462zm-.08 1.306c-.092.126-.094.216-.03.285.07.074.215.139.318.053.104-.085.104-.209.016-.318-.089-.109-.209-.109-.304-.02zM4.4 2.09c.14.044.2.179.319.025.058-.076.064-.176-.013-.29-.05-.07-.276-.118-.373-.018-.096.101-.008.259.067.283zm-2.804-.087c.25.159.415.4.603.185.064-.072.143-.207.006-.466-.1-.19-.429-.267-.545-.194-.116.072-.258.352-.064.475zm2.315 1.229c.08.085.215.078.296.032.08-.047.064-.176-.013-.29-.049-.07-.193-.103-.29-.002-.096.1-.049.2.007.26z"/></symbol><symbol id="flight-jira-24" viewBox="0 0 24 24"><path d="M22.252 11.392L11.985 1 1.748 11.362c-.33.334-.33.881 0 1.246l6.424 6.502L11.985 23l10.267-10.392a.87.87 0 000-1.216zm-10.267 3.86L8.773 12l3.212-3.251L15.197 12l-3.212 3.251z"/></symbol><symbol id="flight-jira-16" viewBox="0 0 16 16"><path d="M15.323 7.558L7.99 0 .677 7.536c-.236.243-.236.64 0 .906l4.589 4.73L7.989 16l7.334-7.558a.64.64 0 000-.884zM7.99 10.365L5.695 8l2.294-2.365L10.284 8l-2.295 2.365z"/></symbol><symbol id="flight-jira-color-24" viewBox="0 0 24 24"><path fill="#2684FF" d="M22.252 11.392l-9.366-9.48L11.985 1 4.96 8.11l-3.212 3.252c-.33.334-.33.881 0 1.246l6.424 6.502L11.985 23l7.025-7.11.12-.122 3.122-3.16a.87.87 0 000-1.216zm-10.267 3.86L8.773 12l3.212-3.251L15.197 12l-3.212 3.251z"/><path fill="url(#jira-color-24__paint0_linear_4403_89)" d="M11.985 8.749c-2.101-2.127-2.101-5.592-.03-7.719L4.93 8.14 8.743 12l3.242-3.251z"/><path fill="url(#jira-color-24__paint1_linear_4403_89)" d="M15.197 12l-3.212 3.251c2.102 2.127 2.102 5.592 0 7.749l7.055-7.14L15.197 12z"/></symbol><symbol id="flight-jira-color-16" viewBox="0 0 16 16"><path fill="#2684FF" d="M15.323 7.558L8.633.663 7.989 0 2.971 5.171.677 7.536c-.236.243-.236.64 0 .906l4.589 4.73L7.989 16l5.018-5.171.086-.089 2.23-2.298a.64.64 0 000-.884zM7.99 10.365L5.695 8l2.294-2.365L10.284 8l-2.295 2.365z"/><path fill="url(#jira-color-16__paint0_linear_4403_94)" d="M7.99 5.635C6.487 4.088 6.487 1.57 7.967.022L2.95 5.193 5.673 8 7.99 5.635z"/><path fill="url(#jira-color-16__paint1_linear_4403_94)" d="M10.284 8l-2.295 2.365C9.49 11.912 9.49 14.43 7.99 16l5.04-5.193L10.284 8z"/></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.518-.925-1.518-.926 0-1.068.723-1.068 1.47v2.833H6.676V6.499h1.707v.782h.024c.348-.594.996-.95 1.684-.925 1.802 0 2.135 1.186 2.135 2.728l-.001 3.14zM4.67 5.715a1.037 1.037 0 01-1.032-1.03c0-.567.466-1.033 1.032-1.033.566 0 1.031.466 1.032 1.032 0 .566-.466 1.032-1.032 1.032zm.889 6.51h-1.78V6.499h1.78v5.726zM13.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.518-.925-1.518-.926 0-1.068.723-1.068 1.47v2.833H6.676V6.499h1.707v.782h.024c.348-.594.996-.95 1.684-.925 1.802 0 2.135 1.186 2.135 2.728l-.001 3.14zM4.67 5.715a1.037 1.037 0 01-1.032-1.03c0-.567.466-1.033 1.032-1.033.566 0 1.031.466 1.032 1.032 0 .566-.466 1.032-1.032 1.032zm.889 6.51h-1.78V6.499h1.78v5.726zM13.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.495L20 10.853l-2.657-1.531-2.242 1.426 2.694 1.747z"/><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.971 2.508 2.206z"/><path fill="#000" d="M13.954 15.36l2.735-2.044-2.707-1.858-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.965L8.947 17.3z"/><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.85l-2.213-1.79.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.065l.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.412c-.06-.12-.186-.234-.398-.321h-.001c-.442-.19-.634-.204-.881-.364-.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.286-.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-.085.842-.217.23-.13.424-.29.647-.363.458-.143.784-.431.886-.704a.463.463 0 00-.012-.386z"/><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.763.763 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.637-.174 1.14-.613 1.764-.515.612-1.24 1.604-1.584 2.637-.162.487-.24.984-.168 1.454-.023.02-.044.041-.064.062-.151.162-.263.358-.388.49-.116.116-.282.16-.464.225-.183.065-.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.198.31.286.547.335.473.099 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-.147 1.318-.18.408-.033.918.145 1.503.113a.803.803 0 00.068.182l.001.002c.227.454.65.662 1.1.627.45-.036.928-.302 1.315-.762l-.07-.06.07.06c.37-.448.982-.633 1.388-.878.203-.123.368-.276.38-.499.013-.222-.118-.472-.418-.805z"/><path fill="#F8BF11" d="M13.571 12.828c-.007.137-.107.24-.29.35-.368.221-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-.987.103-.388.251-.786.271-1.109.02-.415.044-.776.114-1.056.07-.279.179-.468.373-.574l.027-.014c.022.359.2.725.514.804.343.09.838-.204 1.047-.445l.122-.005c.184-.004.337.006.495.144.121.103.179.296.229.513.05.217.09.453.239.62v.001c.287.319.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.133.056.053.126.12.211.188.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.25-1.558.715-.46.465-.814 1.123-1.018 1.89l.061.037v.004c.47.298.805.598 1.012.877.219.297.316.585.223.834a.513.513 0 01-.27.284l-.041.015c.074.097.146.197.213.3.944.628 2.042.396 2.867-.173.08-.277.153-.536.163-.697.021-.416.042-.792.124-1.12.082-.33.242-.63.544-.795.017-.01.034-.015.051-.023a.756.756 0 01.022-.095c-.242-.622-.591-1.139-1.01-1.5-.42-.36-.897-.55-1.382-.553zm2.37 2.154l-.002.005v-.001l.001-.004z"/><path fill="#fff" d="M9.278 3.833a1.05 1.05 0 01-.215.656 4.119 4.119 0 00-.218-.09c-.049-.019-.087-.031-.127-.045.029-.035.085-.075.107-.127a.67.67 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.433.433 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-.329.554.554 0 01.346-.122h.006c.125 0 .232.036.342.116a.78.78 0 01.257.324 1.042 1.042 0 01.098.445zM7.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.157.157 0 00-.119-.045c-.042.004-.077.024-.11.065a.372.372 0 00-.07.155.626.626 0 00-.013.206v.008a.634.634 0 00.048.192.367.367 0 00.116.157l-.102.079-.078.057a.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.382.003.06.003.116-.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-new-relic-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M11.5 5.847l5.384 3.076v6.154l-5.383 3.077V22l8.75-5V7L11.5 2 2.75 7l-.001 3.847 5.383 3.077v6.154L11.501 22V12L6.116 8.924l5.385-3.076z" clip-rule="evenodd"/></symbol><symbol id="flight-new-relic-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M8 3.693l3.692 2.153v4.308L8 12.308V15l6-3.5v-7L8 1 2 4.5v2.693l3.691 2.154v4.307L8.001 15V8L4.307 5.846 8 3.693z" clip-rule="evenodd"/></symbol><symbol id="flight-new-relic-color-24" viewBox="0 0 24 24"><path fill="#00AC69" d="M16.884 8.923v6.154l-5.383 3.077V22l8.75-5V7l-3.367 1.923z"/><path fill="#1CE783" d="M11.5 5.847l5.384 3.076L20.25 7 11.5 2 2.75 7l3.366 1.923 5.385-3.076z"/><path fill="#1D252C" d="M8.133 13.924v6.154L11.501 22V12L2.75 7v3.847l5.383 3.077z"/></symbol><symbol id="flight-new-relic-color-16" viewBox="0 0 16 16"><path fill="#00AC69" d="M11.692 5.846v4.308L8 12.308V15l6-3.5v-7l-2.308 1.346z"/><path fill="#1CE783" d="M8 3.693l3.692 2.153L14 4.5 8 1 2 4.5l2.308 1.346L8 3.693z"/><path fill="#1D252C" d="M5.691 9.347v4.307L8.001 15V8L2 4.5v2.693l3.691 2.154z"/></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.697-.79.701h-.014v1.647l-.008 7.798h.157s1.705-2.625 2.625-3.374c1.077-.879 3.69-1.966 3.69-1.966v-4.744l.013-.005c-.005-.01-.005-.024-.01-.033 0-.005 0-.01-.004-.014z"/><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.697-.79.701h-.014v1.647l-.008 7.798h.157s1.705-2.625 2.625-3.374c1.077-.879 3.69-1.966 3.69-1.966v-4.744l.013-.005c-.005-.01-.005-.024-.01-.033 0-.005 0-.01-.004-.014z"/><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-twitter-x-24" viewBox="0 0 24 24"><path d="M13.712 10.622L20.413 3h-1.587l-5.819 6.618L8.36 3H3l7.027 10.007L3 21h1.588l6.144-6.989L15.64 21H21l-7.288-10.378zM5.16 4.17H7.6l11.226 15.713h-2.439L5.16 4.17z"/></symbol><symbol id="flight-twitter-x-16" viewBox="0 0 16 16"><path d="M9.142 7.081L13.609 2H12.55L8.671 6.412 5.573 2H2l4.685 6.672L2 14h1.059l4.096-4.66L10.427 14H14L9.142 7.081zM3.44 2.78h1.626l7.485 10.476h-1.626L3.44 2.78z"/></symbol><symbol id="flight-twitter-x-color-24" viewBox="0 0 24 24"><path fill="#000" d="M13.712 10.622L20.413 3h-1.587l-5.819 6.618L8.36 3H3l7.027 10.007L3 21h1.588l6.144-6.989L15.64 21H21l-7.288-10.378zM5.16 4.17H7.6l11.226 15.713h-2.439L5.16 4.17z"/></symbol><symbol id="flight-twitter-x-color-16" viewBox="0 0 16 16"><path fill="#000" d="M9.142 7.081L13.609 2H12.55L8.671 6.412 5.573 2H2l4.685 6.672L2 14h1.059l4.096-4.66L10.427 14H14L9.142 7.081zM3.44 2.78h1.626l7.485 10.476h-1.626L3.44 2.78z"/></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-venafi-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M15.966 3.216L16.042 3H23c-2.253 6.096-5.467 11.67-9.592 16.558L12 21.223l-1.408-1.665C6.467 14.671 3.253 9.096 1 3h6.809l.076.216c.162.465.532 1.527.752 2.02H4.545c1.533 4.15 3.72 7.944 6.527 11.274l.961 1.135.961-1.135c2.808-3.33 4.995-7.124 6.527-11.274h-4.307c.22-.493.59-1.555.752-2.02zM12 11.82a21.658 21.658 0 002.916-5.135h2.26a26.103 26.103 0 01-4.513 7.786L12 15.26l-.663-.787a26.003 26.003 0 01-4.514-7.786h2.261A21.654 21.654 0 0012 11.822z" clip-rule="evenodd"/></symbol><symbol id="flight-venafi-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M10.524 2.137A9.69 9.69 0 0110.572 2H15c-1.434 3.88-3.479 7.427-6.104 10.537L8 13.597l-.896-1.06C4.479 9.427 2.434 5.88 1 2h4.333l.048.137c.103.296.339.972.479 1.286H3.256a23.942 23.942 0 004.154 7.174l.611.722.612-.722a23.941 23.941 0 004.153-7.174h-2.74c.14-.314.375-.99.478-1.286zM8 7.614a13.78 13.78 0 001.855-3.268h1.44A16.613 16.613 0 018.421 9.3L8 9.801l-.422-.5a16.548 16.548 0 01-2.872-4.955h1.439A13.781 13.781 0 008 7.614z" clip-rule="evenodd"/></symbol><symbol id="flight-venafi-color-24" viewBox="0 0 24 24"><path fill="#FF6333" fill-rule="evenodd" d="M15.966 3.216L16.042 3H23c-2.253 6.096-5.467 11.67-9.592 16.558L12 21.223l-1.408-1.665C6.467 14.671 3.253 9.096 1 3h6.809l.076.216c.162.465.532 1.527.752 2.02H4.545c1.533 4.15 3.72 7.944 6.527 11.274l.961 1.135.961-1.135c2.808-3.33 4.995-7.124 6.527-11.274h-4.307c.22-.493.59-1.555.752-2.02zM12 11.82a21.658 21.658 0 002.916-5.135h2.26a26.103 26.103 0 01-4.513 7.786L12 15.26l-.663-.787a26.003 26.003 0 01-4.514-7.786h2.261A21.654 21.654 0 0012 11.822z" clip-rule="evenodd"/></symbol><symbol id="flight-venafi-color-16" viewBox="0 0 16 16"><path fill="#FF6333" fill-rule="evenodd" d="M10.524 2.137A9.69 9.69 0 0110.572 2H15c-1.434 3.88-3.479 7.427-6.104 10.537L8 13.597l-.896-1.06C4.479 9.427 2.434 5.88 1 2h4.333l.048.137c.103.296.339.972.479 1.286H3.256a23.942 23.942 0 004.154 7.174l.611.722.612-.722a23.941 23.941 0 004.153-7.174h-2.74c.14-.314.375-.99.478-1.286zM8 7.614a13.78 13.78 0 001.855-3.268h1.44A16.613 16.613 0 018.421 9.3L8 9.801l-.422-.5a16.548 16.548 0 01-2.872-4.955h1.439A13.781 13.781 0 008 7.614z" clip-rule="evenodd"/></symbol><symbol id="flight-vercel-24" viewBox="0 0 24 24"><path d="M12 3.75l9.25 15.417H2.75L12 3.75z"/></symbol><symbol id="flight-vercel-16" viewBox="0 0 16 16"><path d="M8 2l6.5 10.833h-13L8 2z"/></symbol><symbol id="flight-vercel-color-24" viewBox="0 0 24 24"><path fill="#000" d="M12 3.75l9.25 15.417H2.75L12 3.75z"/></symbol><symbol id="flight-vercel-color-16" viewBox="0 0 16 16"><path fill="#000" d="M8 2l6.5 10.833h-13L8 2z"/></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-vault-secrets-24" viewBox="0 0 24 24"><g><path d="M11.315 15.507v2.49h1.367V12.68H18v-1.367h-2.494c-.58 0-1.17.037-1.747.11l-.537.067.43-.333c.46-.357.9-.744 1.314-1.157l1.764-1.763-.967-.967-1.764 1.763c-.41.414-.8.854-1.157 1.314l-.334.43.067-.537c.074-.577.11-1.163.11-1.747V6h-1.367v5.317H6v1.366h2.494c.58 0 1.17-.036 1.747-.11l.537-.066-.43.333c-.46.357-.904.743-1.314 1.157L7.27 15.76l.967.967 1.764-1.764c.41-.41.8-.853 1.157-1.313l.334-.427-.067.537a13.89 13.89 0 00-.11 1.747z"/><path d="M14.009 14.01v.967l1.75 1.75.967-.967-1.75-1.75h-.967zM7.27 8.24l1.75 1.75h.968v-.967l-1.75-1.75-.968.967z"/><path fill-rule="evenodd" d="M4 1.25A2.75 2.75 0 001.25 4v16A2.75 2.75 0 004 22.75h16A2.75 2.75 0 0022.75 20V4A2.75 2.75 0 0020 1.25H4zM2.75 4c0-.69.56-1.25 1.25-1.25h16c.69 0 1.25.56 1.25 1.25v16c0 .69-.56 1.25-1.25 1.25H4c-.69 0-1.25-.56-1.25-1.25V4z" clip-rule="evenodd"/></g></symbol><symbol id="flight-vault-secrets-16" viewBox="0 0 16 16"><g><path d="M7.543 10.338v1.66h.912V8.453H12v-.91h-1.663c-.386 0-.78.024-1.164.073l-.358.044.286-.222c.307-.238.6-.496.876-.771l1.176-1.176-.645-.644-1.175 1.175a9.613 9.613 0 00-.772.876l-.222.286.044-.357c.05-.385.074-.776.074-1.165V4h-.912v3.544H4v.912h1.663c.386 0 .78-.025 1.164-.074l.358-.044-.286.222a9.019 9.019 0 00-.876.771l-1.176 1.176.645.644 1.175-1.175c.274-.274.534-.57.772-.876l.222-.284-.044.357a9.254 9.254 0 00-.074 1.165z"/><path d="M9.34 9.34v.644l1.166 1.167.645-.644L9.984 9.34h-.645zM4.847 5.493L6.014 6.66h.645v-.644L5.492 4.849l-.645.644z"/><path fill-rule="evenodd" d="M2.5.25A2.25 2.25 0 00.25 2.5v11a2.25 2.25 0 002.25 2.25h11a2.25 2.25 0 002.25-2.25v-11A2.25 2.25 0 0013.5.25h-11zM1.75 2.5a.75.75 0 01.75-.75h11a.75.75 0 01.75.75v11a.75.75 0 01-.75.75h-11a.75.75 0 01-.75-.75v-11z" clip-rule="evenodd"/></g></symbol><symbol id="flight-vault-secrets-color-24" viewBox="0 0 24 24"><path fill="#000" d="M11.315 18v-2.493c0-.584.037-1.17.11-1.747l.066-.537-.333.427c-.357.46-.747.903-1.157 1.313l-1.764 1.764-.967-.967 1.764-1.763c.41-.414.854-.8 1.314-1.157l.43-.333-.537.066a13.92 13.92 0 01-1.747.11H6v-1.366h5.318V6h1.367v2.493c0 .584-.037 1.17-.11 1.747l-.066.537.333-.43c.357-.46.747-.9 1.157-1.314l1.764-1.763.967.967L14.966 10c-.414.413-.854.8-1.314 1.157l-.43.333.537-.067c.577-.073 1.167-.11 1.747-.11H18v1.367h-5.318v5.317h-1.367V18zm2.694-3.023v-.967h.967l1.75 1.75-.967.967-1.75-1.75zM9.02 9.99L7.27 8.24l.966-.967 1.75 1.75v.967h-.966z"/><path fill="#FFD814" fill-rule="evenodd" d="M1.25 4A2.75 2.75 0 014 1.25h16A2.75 2.75 0 0122.75 4v16A2.75 2.75 0 0120 22.75H4A2.75 2.75 0 011.25 20V4zM4 2.75c-.69 0-1.25.56-1.25 1.25v16c0 .69.56 1.25 1.25 1.25h16c.69 0 1.25-.56 1.25-1.25V4c0-.69-.56-1.25-1.25-1.25H4z" clip-rule="evenodd"/></symbol><symbol id="flight-vault-secrets-color-16" viewBox="0 0 16 16"><path fill="#000" d="M7.543 12v-1.662c0-.39.025-.78.074-1.165l.044-.357-.222.284a9.324 9.324 0 01-.772.876L5.492 11.15l-.645-.644L6.023 9.33c.273-.275.569-.533.876-.771l.286-.222-.358.044a9.288 9.288 0 01-1.164.074H4v-.912h3.545V4h.912v1.662c0 .39-.025.78-.074 1.165l-.044.357.222-.286c.238-.307.498-.6.772-.876l1.175-1.175.645.644-1.176 1.176a9.29 9.29 0 01-.876.77l-.286.223.358-.044a9.287 9.287 0 011.164-.074H12v.911H8.455v3.545h-.912V12zM9.34 9.984V9.34h.645l1.167 1.167-.645.644L9.34 9.984zM6.014 6.66L4.847 5.493l.645-.644 1.167 1.167v.644h-.645z"/><path fill="#FFD814" fill-rule="evenodd" d="M.25 2.5A2.25 2.25 0 012.5.25h11a2.25 2.25 0 012.25 2.25v11a2.25 2.25 0 01-2.25 2.25h-11A2.25 2.25 0 01.25 13.5v-11zm2.25-.75a.75.75 0 00-.75.75v11c0 .414.336.75.75.75h11a.75.75 0 00.75-.75v-11a.75.75 0 00-.75-.75h-11z" clip-rule="evenodd"/></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-ampersand-24" viewBox="0 0 24 24"><path fill-rule="evenodd" d="M5.644 2.379c.902-.78 2.062-1.129 3.142-1.129 2.187 0 4.637 1.592 4.637 4.705 0 1.489-.72 2.528-1.568 3.353-.41.399-.866.765-1.294 1.107l-.021.018c-.225.18-.442.354-.65.53 2.083 1.971 4.464 4.025 6.392 5.64.518-1.012 1.008-2.39 1.412-4.353a.75.75 0 111.47.303c-.462 2.238-1.045 3.833-1.703 5.03a206.912 206.912 0 002.435 1.977l.068.054.001.001a.75.75 0 11-.93 1.176l.407-.515-.407.515-.02-.015-.053-.042a98.701 98.701 0 01-.979-.787 209.49 209.49 0 01-1.347-1.1c-.689.888-1.4 1.457-2.033 1.949-1.42 1.102-2.739 1.67-3.955 1.87-1.218.2-2.285.02-3.185-.3-1.3-.463-3.713-2.212-3.713-5.283 0-1.814.822-3.16 1.782-4.204.476-.518.995-.972 1.47-1.375a107.324 107.324 0 01.66-.557c-.139-.119-.285-.241-.438-.369l-.123-.102c-.432-.36-.901-.757-1.33-1.187-.843-.847-1.646-1.939-1.646-3.334 0-1.58.6-2.78 1.52-3.576zm3.141 7.554c.273-.235.549-.456.812-.667l.005-.004c.446-.357.852-.683 1.207-1.028.694-.676 1.114-1.352 1.114-2.279 0-2.13-1.615-3.205-3.137-3.205-.776 0-1.57.253-2.16.763-.572.495-1.001 1.272-1.001 2.442 0 .787.449 1.511 1.21 2.275.374.376.794.733 1.227 1.094l.127.106c.199.166.4.334.596.503zm-.013 2.038c-.173.15-.353.301-.531.451l-.269.226c-.467.396-.926.8-1.336 1.246-.81.882-1.386 1.882-1.386 3.189 0 2.21 1.766 3.532 2.716 3.87a4.811 4.811 0 002.44.233c.926-.152 2.018-.597 3.277-1.575.616-.478 1.22-.967 1.798-1.723l-.14-.118c-1.967-1.646-4.423-3.764-6.569-5.8z" clip-rule="evenodd"/></symbol><symbol id="flight-ampersand-16" viewBox="0 0 16 16"><path fill-rule="evenodd" d="M3.221 1.084C3.925.504 4.82.25 5.643.25c1.658 0 3.6 1.162 3.6 3.519 0 1.14-.582 1.924-1.222 2.52-.308.286-.65.547-.961.785l-.019.015-.256.197a107.383 107.383 0 004.292 3.61c.328-.664.64-1.55.904-2.773a.75.75 0 111.466.317c-.318 1.475-.717 2.566-1.172 3.406a145.642 145.642 0 001.477 1.146l.15.113.038.03.011.008a.75.75 0 01-.903 1.198l.39-.518-.39.518-.054-.04a72.087 72.087 0 01-.719-.552c-.239-.185-.525-.408-.848-.662-.485.563-.977.938-1.409 1.258-2.162 1.603-3.99 1.606-5.402 1.127-.53-.18-1.228-.588-1.802-1.22-.584-.643-1.064-1.546-1.064-2.694 0-1.358.647-2.356 1.371-3.108.359-.372.748-.697 1.098-.98a76.708 76.708 0 01.257-.207l-.094-.075-.09-.071a14.316 14.316 0 01-.989-.844c-.626-.6-1.278-1.423-1.278-2.504 0-1.181.472-2.088 1.196-2.685zm2.422 5.192c.163-.131.325-.255.48-.373l.007-.006c.328-.251.618-.473.87-.707.49-.455.743-.87.743-1.421 0-1.314-1.038-2.019-2.1-2.019-.537 0-1.076.168-1.467.49-.37.306-.651.784-.651 1.529 0 .445.267.894.816 1.421a12.911 12.911 0 00.98.828c.106.084.214.17.322.258zm-.016 1.986l-.271.219-.194.156c-.341.276-.67.552-.96.854-.574.596-.952 1.24-.952 2.067 0 .7.286 1.259.674 1.685.399.439.88.708 1.174.809.946.32 2.26.397 4.027-.912.392-.29.766-.579 1.125-.985-1.393-1.114-3.105-2.525-4.623-3.893z" clip-rule="evenodd"/></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-clipboard-x-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.5zm7.53 7.22a.75.75 0 00-1.06 0L12 12.94 9.03 9.97a.75.75 0 00-1.06 1.06L10.94 14l-2.97 2.97a.75.75 0 101.06 1.06L12 15.06l2.97 2.97a.75.75 0 101.06-1.06L13.06 14l2.97-2.97a.75.75 0 000-1.06z" clip-rule="evenodd"/></symbol><symbol id="flight-clipboard-x-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-5zm-.548 4.548a.775.775 0 011.096-1.096L8 7.904l1.952-1.952a.775.775 0 011.096 1.096L9.096 9l1.952 1.952a.775.775 0 11-1.096 1.096L8 10.096l-1.952 1.952a.775.775 0 11-1.096-1.096L6.904 9 4.952 7.048z" clip-rule="evenodd"/></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-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.131-8.132a1.25 1.25 0 000-1.768l-8.131-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 001.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.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"/></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.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></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-.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"/></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.005 14.005 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.804 2.804 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 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.173 21.173 0 01-9.222-3.274c-2.765-1.79-4.607-3.62-6.406-6.393a21.082 21.082 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.697 13.697 0 005.957 2.117.711.711 0 00.707-.421c.04-.09.06-.187.06-.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.202 2.202 0 01-.497 2.327l-.003.003-.51.509a10.903 10.903 0 003.314 3.306l.514-.514a2.21 2.21 0 012.327-.496c.609.226 1.24.384 1.884.468l.007.001a2.209 2.209 0 011.9 2.239 152.65 152.65 0 000 2.16 2.202 2.202 0 01-1.502 2.099c-.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 10-.166 1.49 8.873 8.873 0 017.838 7.828.75.75 0 001.49-.167A10.372 10.372 0 0014.833.005zM14.894 4.29a.75.75 0 00-.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.011a21.082 21.082 0 003.28 9.248c1.8 2.773 3.642 4.604 6.407 6.393a21.175 21.175 0 009.221 3.274l.014.002a2.815 2.815 0 002.829-1.671c.157-.359.237-.746.235-1.137v-.105c-.002-.539-.011-2.508 0-2.96a2.804 2.804 0 00-2.418-2.849h-.007a12.51 12.51 0 01-2.732-.68 2.815 2.815 0 00-2.964.632l-.9.899a15.725 15.725 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.313 1.313 0 011.384-.293h.001c.987.368 2.012.623 3.057.761a1.312 1.312 0 011.125 1.326c-.012.479-.003 2.48-.001 3.007v.101a1.302 1.302 0 01-.424.968 1.311 1.311 0 01-1 .34 19.675 19.675 0 01-8.56-3.041c-2.59-1.676-4.28-3.357-5.963-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.196 15.196 0 006.618 2.35h.014a2.21 2.21 0 002.221-1.311c.124-.282.187-.586.185-.893v-.075c-.002-.383-.008-1.77 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-.001a.709.709 0 01.746-.158h.002c.713.266 1.454.45 2.209.55a.709.709 0 01.606.715 148.65 148.65 0 000 2.134v.07a.702.702 0 01-.481.671.711.711 0 01-.286.036 13.697 13.697 0 01-5.957-2.117c-1.805-1.169-2.979-2.336-4.153-4.145a13.631 13.631 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.394 2.394 0 011.892 1.892.75.75 0 001.472-.288 3.895 3.895 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 10-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.058-.193 2.333 2.333 0 000-3.3l-1.737-1.737L21.37 8.78a.75.75 0 00-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.591-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.031-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.568L9.62 12.767A1 1 0 018 11.983v-1.545c-.76-.043-1.484.003-2.254.218-.994.279-2.118.857-3.507 1.99a.993.993 0 01-1.128.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.067.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-robot-24" viewBox="0 0 24 24"><g><path d="M9.25 13.5a.75.75 0 000 1.5h5.5a.75.75 0 000-1.5h-5.5zM15.5 7a1.5 1.5 0 100 3 1.5 1.5 0 000-3zM8.5 7a1.5 1.5 0 100 3 1.5 1.5 0 000-3z"/><path fill-rule="evenodd" d="M6.756 3.25a1.375 1.375 0 012.738 0h5.012a1.375 1.375 0 012.738 0h.256A2.75 2.75 0 0120.25 6v2.256a1.375 1.375 0 010 2.738V16a2.75 2.75 0 01-2.75 2.75h-11A2.75 2.75 0 013.75 16v-5.006a1.375 1.375 0 010-2.738V6A2.75 2.75 0 016.5 3.25h.256zM6.5 4.75c-.69 0-1.25.56-1.25 1.25v10c0 .69.56 1.25 1.25 1.25h11c.69 0 1.25-.56 1.25-1.25V6c0-.69-.56-1.25-1.25-1.25h-11z" clip-rule="evenodd"/><path d="M6 21.25a.75.75 0 01.75-.75h10.5a.75.75 0 010 1.5H6.75a.75.75 0 01-.75-.75z"/></g></symbol><symbol id="flight-robot-16" viewBox="0 0 16 16"><g><path d="M6.25 8.5a.75.75 0 000 1.5h3.5a.75.75 0 000-1.5h-3.5zM10.125 5a1.125 1.125 0 100 2.25 1.125 1.125 0 000-2.25zM5.875 5a1.125 1.125 0 100 2.25 1.125 1.125 0 000-2.25z"/><path fill-rule="evenodd" d="M4.525 2a1.25 1.25 0 012.45 0h2.05a1.25 1.25 0 012.45 0h.275A2.25 2.25 0 0114 4.25v1.275a1.25 1.25 0 010 2.45V10.5a2.25 2.25 0 01-2.25 2.25h-7.5A2.25 2.25 0 012 10.5V7.975a1.25 1.25 0 010-2.45V4.25A2.25 2.25 0 014.25 2h.275zM4.25 3.5a.75.75 0 00-.75.75v6.25c0 .414.336.75.75.75h7.5a.75.75 0 00.75-.75V4.25a.75.75 0 00-.75-.75h-7.5z" clip-rule="evenodd"/><path d="M3.5 14.25a.75.75 0 01.75-.75h7.5a.75.75 0 010 1.5h-7.5a.75.75 0 01-.75-.75z"/></g></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.693-.978 2.993-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 00.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.523 6.274a1.25 1.25 0 01-.716.226H1.5v3h2.307c.256 0 .506.079.716.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-.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></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 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></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 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></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 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></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>
diff --git a/agent/xds/clusters_test.go b/agent/xds/clusters_test.go
index b5105bb698b1a..fb92ea5804b6f 100644
--- a/agent/xds/clusters_test.go
+++ b/agent/xds/clusters_test.go
@@ -6,10 +6,13 @@ package xds
 import (
 	"bytes"
 	"path/filepath"
+	"sort"
 	"testing"
 	"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"
@@ -19,6 +22,12 @@ import (
 
 	"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"
 )
 
 type mockCfgFetcher struct {
@@ -29,6 +38,13 @@ 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
 }
@@ -37,6 +53,1117 @@ func durationPtr(d time.Duration) *time.Duration {
 	return &d
 }
 
+func makeClusterDiscoChainTests(enterprise bool) []clusterTestCase {
+	return []clusterTestCase{
+		{
+			name: "custom-upstream-default-chain",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", enterprise, func(ns *structs.NodeService) {
+					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
+						customAppClusterJSON(t, customClusterJSONOptions{
+							Name: "myservice",
+						})
+				}, 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,
+		},
+	}
+}
+
+func TestClustersFromSnapshot(t *testing.T) {
+	// TODO: we should move all of these to TestAllResourcesFromSnapshot
+	// eventually to test all of the xDS types at once with the same input,
+	// just as it would be triggered by our xDS server.
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	tests := []clusterTestCase{
+		{
+			name: "connect-proxy-with-tls-outgoing-min-version-auto",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										TLSMinVersion: types.TLSVersionAuto,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-tls-outgoing-min-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										TLSMinVersion: types.TLSv1_3,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-tls-outgoing-max-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										TLSMaxVersion: types.TLSv1_2,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-tls-outgoing-cipher-suites",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										CipherSuites: []types.TLSCipherSuite{
+											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+										},
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["envoy_local_cluster_json"] =
+						customAppClusterJSON(t, customClusterJSONOptions{
+							Name: "mylocal",
+						})
+				}, nil)
+			},
+			// TODO(proxystate): requires custom cluster work
+			alsoRunTestForV2: false,
+		},
+		{
+			name: "custom-upstream",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
+						customAppClusterJSON(t, customClusterJSONOptions{
+							Name: "myservice",
+						})
+				}, nil)
+			},
+			// TODO(proxystate): requires custom cluster work
+			alsoRunTestForV2: false,
+		},
+		{
+			name:               "custom-upstream-ignores-tls",
+			overrideGoldenName: "custom-upstream", // should be the same
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
+						customAppClusterJSON(t, customClusterJSONOptions{
+							Name: "myservice",
+							// Attempt to override the TLS context should be ignored
+							TLSContext: `"allowRenegotiation": false`,
+						})
+				}, 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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["local_connect_timeout_ms"] = 1234
+					ns.Proxy.Upstreams[0].Config["connect_timeout_ms"] = 2345
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "custom-passive-healthcheck",
+			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(80),
+						"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-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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["max_inbound_connections"] = 3456
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "custom-limits-max-connections-only",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					for i := range ns.Proxy.Upstreams {
+						// We check if Config is nil because the prepared_query upstream is
+						// initialized without a Config map. Use Upstreams[i] syntax to
+						// modify the actual ConfigSnapshot instead of copying the Upstream
+						// in the range.
+						if ns.Proxy.Upstreams[i].Config == nil {
+							ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
+						}
+
+						ns.Proxy.Upstreams[i].Config["limits"] = map[string]interface{}{
+							"max_connections": 500,
+						}
+					}
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "custom-limits-set-to-zero",
+			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].Config == nil {
+							ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
+						}
+
+						ns.Proxy.Upstreams[i].Config["limits"] = map[string]interface{}{
+							"max_connections":         0,
+							"max_pending_requests":    0,
+							"max_concurrent_requests": 0,
+						}
+					}
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "custom-limits",
+			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].Config == nil {
+							ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
+						}
+
+						ns.Proxy.Upstreams[i].Config["limits"] = map[string]interface{}{
+							"max_connections":         500,
+							"max_pending_requests":    600,
+							"max_concurrent_requests": 700,
+						}
+					}
+				}, 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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Address = ""
+					ns.Port = 0
+					ns.Proxy.LocalServiceAddress = ""
+					ns.Proxy.LocalServicePort = 0
+					ns.Proxy.LocalServiceSocketPath = "/tmp/downstream_proxy.sock"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "expose-paths-new-cluster-http2",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotExposeConfig(t, func(ns *structs.NodeService) {
+					ns.Proxy.Expose.Paths[1] = structs.ExposePath{
+						LocalPathPort: 9090,
+						Path:          "/grpc.health.v1.Health/Check",
+						ListenerPort:  21501,
+						Protocol:      "http2",
+					}
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name:             "expose-checks",
+			create:           proxycfg.TestConfigSnapshotExposeChecks,
+			alsoRunTestForV2: true,
+		},
+		{
+			name:             "expose-paths-grpc-new-cluster-http1",
+			create:           proxycfg.TestConfigSnapshotGRPCExposeHTTP1,
+			alsoRunTestForV2: true,
+		},
+		{
+			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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", func(ns *structs.NodeService) {
+					ns.Proxy.Config["envoy_gateway_remote_tcp_enable_keepalive"] = true
+					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_time"] = 120
+					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_interval"] = 60
+					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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										TLSMinVersion: types.TLSv1_3,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			// TODO(proxystate): ingress gateway will come at a later time
+			alsoRunTestForV2: false,
+		},
+		{
+			name: "ingress-gateway-with-tls-outgoing-max-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										TLSMaxVersion: types.TLSv1_2,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			// TODO(proxystate): ingress gateway will come at a later time
+			alsoRunTestForV2: false,
+		},
+		{
+			name: "ingress-gateway-with-tls-outgoing-cipher-suites",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										CipherSuites: []types.TLSCipherSuite{
+											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+										},
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			// TODO(proxystate): ingress gateway will come at a later time
+			alsoRunTestForV2: false,
+		},
+		{
+			name: "ingress-gateway-no-services",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"simple", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"simple", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						entry.Defaults = &structs.IngressServiceConfig{
+							MaxConnections:        2048,
+							MaxPendingRequests:    512,
+							MaxConcurrentRequests: 4096,
+						}
+					}, nil)
+			},
+			// TODO(proxystate): ingress gateway will come at a later time
+			alsoRunTestForV2: false,
+		},
+		{
+			name: "ingress-with-overwrite-defaults-service-max-connections",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"simple", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						entry.Defaults = &structs.IngressServiceConfig{
+							MaxConnections:     2048,
+							MaxPendingRequests: 512,
+						}
+						entry.Listeners[0].Services[0].MaxConnections = 4096
+						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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"simple", nil,
+					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),
+						}
+					}, nil)
+			},
+			// TODO(proxystate): ingress gateway will come at a later time
+			alsoRunTestForV2: false,
+		},
+		{
+			name: "ingress-with-defaults-passive-health-check",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"simple", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						enforcingConsecutive5xx := uint32(80)
+						entry.Defaults = &structs.IngressServiceConfig{
+							MaxConnections:        2048,
+							MaxPendingRequests:    512,
+							MaxConcurrentRequests: 4096,
+							PassiveHealthCheck: &structs.PassiveHealthCheck{
+								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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"simple", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						defaultEnforcingConsecutive5xx := uint32(80)
+						entry.Defaults = &structs.IngressServiceConfig{
+							MaxConnections:     2048,
+							MaxPendingRequests: 512,
+							PassiveHealthCheck: &structs.PassiveHealthCheck{
+								Interval:                5000000000,
+								EnforcingConsecutive5xx: &defaultEnforcingConsecutive5xx,
+								MaxEjectionPercent:      uint32ptr(80),
+							},
+						}
+						enforcingConsecutive5xx := uint32(50)
+						entry.Listeners[0].Services[0].MaxConnections = 4096
+						entry.Listeners[0].Services[0].MaxPendingRequests = 2048
+						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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, func(ns *structs.NodeService) {
+					if ns.Proxy.Config == nil {
+						ns.Proxy.Config = map[string]interface{}{}
+					}
+					ns.Proxy.Config["envoy_gateway_remote_tcp_enable_keepalive"] = true
+					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_time"] = 133
+					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_interval"] = 27
+					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-dial-instances-directly",
+			create:           proxycfg.TestConfigSnapshotTransparentProxyDialDirectly,
+			alsoRunTestForV2: true,
+		},
+	}
+
+	tests = append(tests, makeClusterDiscoChainTests(false)...)
+
+	latestEnvoyVersion := xdscommon.EnvoyVersions[0]
+	for _, envoyVersion := range xdscommon.EnvoyVersions {
+		sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion)
+		require.NoError(t, err)
+		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)
+
+					// We need to replace the TLS certs with deterministic ones to make golden
+					// files workable. Note we don't update these otherwise they'd change
+					// golder files for every test case and so not be any use!
+					testcommon.SetupTLSRootsAndLeaf(t, snap)
+
+					// Need server just for logger dependency
+					g := NewResourceGenerator(testutil.Logger(t), nil, false)
+					g.ProxyFeatures = sf
+
+					clusters, err := g.clustersFromSnapshot(snap)
+					require.NoError(t, err)
+
+					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-xdsv1", func(t *testing.T) {
+						gotJSON := protoToJSON(t, r)
+
+						gName := tt.name
+						if tt.overrideGoldenName != "" {
+							gName = tt.overrideGoldenName
+						}
+
+						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)
+						})
+					}
+				})
+			}
+		})
+	}
+}
+
 type customClusterJSONOptions struct {
 	Name       string
 	TLSContext string
diff --git a/agent/xds/endpoints_test.go b/agent/xds/endpoints_test.go
index 4a4cff89d0506..9daf5b31f55b3 100644
--- a/agent/xds/endpoints_test.go
+++ b/agent/xds/endpoints_test.go
@@ -4,15 +4,23 @@
 package xds
 
 import (
+	"path/filepath"
+	"sort"
 	"testing"
 
 	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"
 )
 
@@ -229,3 +237,450 @@ func Test_makeLoadAssignment(t *testing.T) {
 		})
 	}
 }
+
+type endpointTestCase struct {
+	name               string
+	create             func(t testinf.T) *proxycfg.ConfigSnapshot
+	overrideGoldenName string
+	alsoRunTestForV2   bool
+}
+
+func makeEndpointDiscoChainTests(enterprise bool) []endpointTestCase {
+	return []endpointTestCase{
+		{
+			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-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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", enterprise, func(ns *structs.NodeService) {
+					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
+						customAppClusterJSON(t, customClusterJSONOptions{
+							Name: "myservice",
+						})
+				}, 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,
+		},
+	}
+}
+
+func TestEndpointsFromSnapshot(t *testing.T) {
+	// TODO: we should move all of these to TestAllResourcesFromSnapshot
+	// eventually to test all of the xDS types at once with the same input,
+	// just as it would be triggered by our xDS server.
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	tests := []endpointTestCase{
+		{
+			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-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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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,
+		},
+	}
+
+	tests = append(tests, makeEndpointDiscoChainTests(false)...)
+
+	latestEnvoyVersion := xdscommon.EnvoyVersions[0]
+	for _, envoyVersion := range xdscommon.EnvoyVersions {
+		sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion)
+		require.NoError(t, err)
+		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)
+
+					// We need to replace the TLS certs with deterministic ones to make golden
+					// files workable. Note we don't update these otherwise they'd change
+					// golden files for every test case and so not be any use!
+					testcommon.SetupTLSRootsAndLeaf(t, snap)
+
+					// Need server just for logger dependency
+					g := NewResourceGenerator(testutil.Logger(t), nil, false)
+					g.ProxyFeatures = sf
+
+					endpoints, err := g.endpointsFromSnapshot(snap)
+					require.NoError(t, err)
+
+					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-xdsv1", func(t *testing.T) {
+						gotJSON := protoToJSON(t, r)
+
+						gName := tt.name
+						if tt.overrideGoldenName != "" {
+							gName = tt.overrideGoldenName
+						}
+
+						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/listeners_test.go b/agent/xds/listeners_test.go
index cec681a9adeb9..1a91ee77b74d1 100644
--- a/agent/xds/listeners_test.go
+++ b/agent/xds/listeners_test.go
@@ -5,18 +5,1426 @@ package xds
 
 import (
 	"bytes"
+	"path/filepath"
+	"sort"
 	"testing"
 	"text/template"
 
-	testinf "github.com/mitchellh/go-testing-interface"
 	"github.com/stretchr/testify/assert"
+	"google.golang.org/protobuf/proto"
+
+	envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
+	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/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/sdk/testutil"
+	"github.com/hashicorp/consul/types"
 )
 
+type listenerTestCase struct {
+	name   string
+	create func(t testinf.T) *proxycfg.ConfigSnapshot
+	// Setup is called before the test starts. It is passed the snapshot from
+	// TestConfigSnapshot and is allowed to modify it in any way to setup the
+	// test input.
+	overrideGoldenName string
+	generatorSetup     func(*ResourceGenerator)
+	alsoRunTestForV2   bool
+}
+
+func makeListenerDiscoChainTests(enterprise bool) []listenerTestCase {
+	return []listenerTestCase{
+		{
+			name: "custom-upstream-ignored-with-disco-chain",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", enterprise, 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])
+
+						ns.Proxy.Upstreams[i].Config["envoy_listener_json"] =
+							customListenerJSON(t, customListenerJSONOptions{
+								Name: uid.EnvoyID() + ":custom-upstream",
+							})
+					}
+				}, nil)
+			},
+		},
+		{
+			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-tcp-chain",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-http-chain",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil,
+					&structs.ProxyConfigEntry{
+						Kind:     structs.ProxyDefaults,
+						Name:     structs.ProxyConfigGlobal,
+						Protocol: "http",
+						Config: map[string]interface{}{
+							"protocol": "http",
+						},
+					},
+				)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-http2-chain",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil,
+					&structs.ProxyConfigEntry{
+						Kind:     structs.ProxyDefaults,
+						Name:     structs.ProxyConfigGlobal,
+						Protocol: "http2",
+						Config: map[string]interface{}{
+							"protocol": "http2",
+						},
+					},
+				)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-grpc-chain",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil,
+					&structs.ProxyConfigEntry{
+						Kind:     structs.ProxyDefaults,
+						Name:     structs.ProxyConfigGlobal,
+						Protocol: "grpc",
+						Config: map[string]interface{}{
+							"protocol": "grpc",
+						},
+					},
+				)
+			},
+			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-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-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",
+													},
+												},
+											},
+										},
+									},
+								},
+							},
+						},
+					},
+				)
+			},
+		},
+	}
+}
+
+func TestListenersFromSnapshot(t *testing.T) {
+	// TODO: we should move all of these to TestAllResourcesFromSnapshot
+	// eventually to test all of the xDS types at once with the same input,
+	// just as it would be triggered by our xDS server.
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	tests := []listenerTestCase{
+		{
+			name: "connect-proxy-with-tls-outgoing-min-version-auto",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Outgoing: &structs.MeshDirectionalTLSConfig{
+										TLSMinVersion: types.TLSVersionAuto,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-tls-incoming-min-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Incoming: &structs.MeshDirectionalTLSConfig{
+										TLSMinVersion: types.TLSv1_3,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-tls-incoming-max-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Incoming: &structs.MeshDirectionalTLSConfig{
+										TLSMaxVersion: types.TLSv1_2,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "connect-proxy-with-tls-incoming-cipher-suites",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Incoming: &structs.MeshDirectionalTLSConfig{
+										CipherSuites: []types.TLSCipherSuite{
+											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+										},
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "grpc-public-listener",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "grpc"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "listener-bind-address",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["bind_address"] = "127.0.0.2"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "listener-bind-port",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["bind_port"] = 8888
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "listener-bind-address-port",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["bind_address"] = "127.0.0.2"
+					ns.Proxy.Config["bind_port"] = 8888
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "listener-unix-domain-socket",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Upstreams[0].LocalBindAddress = ""
+					ns.Proxy.Upstreams[0].LocalBindPort = 0
+					ns.Proxy.Upstreams[0].LocalBindSocketPath = "/tmp/service-mesh/client-1/grpc-employee-server"
+					ns.Proxy.Upstreams[0].LocalBindSocketMode = "0640"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "listener-max-inbound-connections",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["max_inbound_connections"] = 222
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "http2-public-listener",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "http2"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "listener-balance-inbound-connections",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["balance_inbound_connections"] = "exact_balance"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "listener-balance-outbound-connections-bind-port",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Upstreams[0].Config["balance_outbound_connections"] = "exact_balance"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "http-public-listener",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "http"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "http-public-listener-no-xfcc",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t,
+					func(ns *structs.NodeService) {
+						ns.Proxy.Config["protocol"] = "http"
+					},
+					[]proxycfg.UpdateEvent{
+						{
+							CorrelationID: "mesh",
+							Result: &structs.ConfigEntryResponse{
+								Entry: &structs.MeshConfigEntry{
+									HTTP: &structs.MeshHTTPConfig{
+										SanitizeXForwardedClientCert: true,
+									},
+								},
+							},
+						},
+					})
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "http-listener-with-timeouts",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "http"
+					ns.Proxy.Config["local_connect_timeout_ms"] = 1234
+					ns.Proxy.Config["local_request_timeout_ms"] = 2345
+					ns.Proxy.Config["local_idle_timeout_ms"] = 3456
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "http-upstream",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Upstreams[0].Config["protocol"] = "http"
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "custom-public-listener",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["envoy_public_listener_json"] =
+						customListenerJSON(t, customListenerJSONOptions{
+							Name: "custom-public-listen",
+						})
+				}, nil)
+			},
+		},
+		{
+			name: "custom-public-listener-http",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "http"
+					ns.Proxy.Config["envoy_public_listener_json"] =
+						customHTTPListenerJSON(t, customHTTPListenerJSONOptions{
+							Name: "custom-public-listen",
+						})
+				}, nil)
+			},
+		},
+		{
+			name: "custom-public-listener-http-2",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "http"
+					ns.Proxy.Config["envoy_public_listener_json"] =
+						customHTTPListenerJSON(t, customHTTPListenerJSONOptions{
+							Name:                      "custom-public-listen",
+							HTTPConnectionManagerName: httpConnectionManagerNewName,
+						})
+				}, nil)
+			},
+		},
+		{
+			name: "custom-public-listener-http-missing",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "http"
+					ns.Proxy.Config["envoy_public_listener_json"] =
+						customListenerJSON(t, customListenerJSONOptions{
+							Name: "custom-public-listen",
+						})
+				}, nil)
+			},
+		},
+		{
+			name:               "custom-public-listener-ignores-tls",
+			overrideGoldenName: "custom-public-listener", // should be the same
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["envoy_public_listener_json"] =
+						customListenerJSON(t, customListenerJSONOptions{
+							Name: "custom-public-listen",
+							// Attempt to override the TLS context should be ignored
+							TLSContext: `"allowRenegotiation": false`,
+						})
+				}, nil)
+			},
+		},
+		{
+			name: "custom-upstream",
+			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])
+
+						ns.Proxy.Upstreams[i].Config["envoy_listener_json"] =
+							customListenerJSON(t, customListenerJSONOptions{
+								Name: uid.EnvoyID() + ":custom-upstream",
+							})
+					}
+				}, 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 {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					for _, v := range ns.Proxy.Upstreams {
+						// Prepared queries do not get centrally configured upstream defaults merged into them.
+						if v.DestinationType == structs.UpstreamDestTypePreparedQuery {
+							continue
+						}
+						// Represent upstream config as if it came from centrally configured upstream defaults.
+						// The name/namespace must not make it onto the cluster name attached to the outbound listener.
+						v.CentrallyConfigured = true
+						v.DestinationNamespace = structs.WildcardSpecifier
+						v.DestinationName = structs.WildcardSpecifier
+					}
+				}, nil)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "expose-paths-local-app-paths",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotExposeConfig(t, nil)
+			},
+		},
+		{
+			name: "expose-paths-new-cluster-http2",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotExposeConfig(t, func(ns *structs.NodeService) {
+					ns.Proxy.Expose.Paths[1] = structs.ExposePath{
+						LocalPathPort: 9090,
+						Path:          "/grpc.health.v1.Health/Check",
+						ListenerPort:  21501,
+						Protocol:      "http2",
+					}
+				})
+			},
+		},
+		{
+			// 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",
+			create: proxycfg.TestConfigSnapshotExposeChecks,
+			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-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 {
+				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", nil, nil)
+			},
+		},
+		{
+			name: "mesh-gateway-using-federation-states",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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 {
+				return proxycfg.TestConfigSnapshotMeshGateway(t, "no-services", nil, nil)
+			},
+		},
+		{
+			name: "mesh-gateway-tagged-addresses",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", func(ns *structs.NodeService) {
+					ns.Proxy.Config = map[string]interface{}{
+						"envoy_mesh_gateway_no_default_bind":       true,
+						"envoy_mesh_gateway_bind_tagged_addresses": true,
+					}
+				}, nil)
+			},
+		},
+		{
+			name: "mesh-gateway-custom-addresses",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", func(ns *structs.NodeService) {
+					ns.Proxy.Config = map[string]interface{}{
+						"envoy_mesh_gateway_bind_addresses": map[string]structs.ServiceAddress{
+							"foo": {
+								Address: "198.17.2.3",
+								Port:    8080,
+							},
+							"bar": {
+								Address: "2001:db8::ff",
+								Port:    9999,
+							},
+							"baz": {
+								Address: "127.0.0.1",
+								Port:    8765,
+							},
+						},
+					}
+				}, nil)
+			},
+		},
+		{
+			name: "api-gateway",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, nil, nil, nil, nil)
+			},
+		},
+		{
+			name: "api-gateway-nil-config-entry",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotAPIGateway_NilConfigEntry(t)
+			},
+		},
+		{
+			name: "api-gateway-tcp-listener",
+			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,
+						},
+					}
+					bound.Listeners = []structs.BoundAPIGatewayListener{
+						{
+							Name: "listener",
+						},
+					}
+				}, nil, nil, nil)
+			},
+		},
+		{
+			name: "api-gateway-tcp-listener-with-tcp-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.ListenerProtocolTCP,
+							Port:     8080,
+						},
+					}
+					bound.Listeners = []structs.BoundAPIGatewayListener{
+						{
+							Name: "listener",
+							Routes: []structs.ResourceReference{
+								{
+									Name: "tcp-route",
+									Kind: structs.TCPRoute,
+								},
+							},
+						},
+					}
+
+				}, []structs.BoundRoute{
+					&structs.TCPRouteConfigEntry{
+						Name: "tcp-route",
+						Kind: structs.TCPRoute,
+						Parents: []structs.ResourceReference{
+							{
+								Kind: structs.APIGateway,
+								Name: "api-gateway",
+							},
+						},
+						Services: []structs.TCPService{
+							{Name: "tcp-service"},
+						},
+					},
+				}, nil, nil)
+			},
+		},
+		{
+			name: "api-gateway-http-listener",
+			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",
+							Routes: []structs.ResourceReference{},
+						},
+					}
+				}, nil, nil, nil)
+			},
+		},
+		{
+			name: "api-gateway-http-listener-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",
+							Routes: []structs.ResourceReference{
+								{
+									Name: "http-route",
+									Kind: structs.HTTPRoute,
+								},
+							},
+						},
+					}
+				}, []structs.BoundRoute{
+					&structs.HTTPRouteConfigEntry{
+						Name: "http-route",
+						Kind: structs.HTTPRoute,
+						Parents: []structs.ResourceReference{
+							{
+								Kind: structs.APIGateway,
+								Name: "api-gateway",
+							},
+						},
+						Rules: []structs.HTTPRouteRule{
+							{
+								Services: []structs.HTTPService{
+									{Name: "http-service"},
+								},
+							},
+						},
+					},
+				}, nil, nil)
+			},
+		},
+		{
+			name: "api-gateway-tcp-listener-with-tcp-and-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-tcp",
+							Protocol: structs.ListenerProtocolTCP,
+							Port:     8080,
+						},
+						{
+							Name:     "listener-http",
+							Protocol: structs.ListenerProtocolHTTP,
+							Port:     8081,
+						},
+					}
+					bound.Listeners = []structs.BoundAPIGatewayListener{
+						{
+							Name: "listener-tcp",
+							Routes: []structs.ResourceReference{
+								{
+									Name: "tcp-route",
+									Kind: structs.TCPRoute,
+								},
+							},
+						},
+						{
+							Name: "listener-http",
+							Routes: []structs.ResourceReference{
+								{
+									Name: "http-route",
+									Kind: structs.HTTPRoute,
+								},
+							},
+						},
+					}
+				}, []structs.BoundRoute{
+					&structs.TCPRouteConfigEntry{
+						Name: "tcp-route",
+						Kind: structs.TCPRoute,
+						Parents: []structs.ResourceReference{
+							{
+								Kind: structs.APIGateway,
+								Name: "api-gateway",
+							},
+						},
+						Services: []structs.TCPService{
+							{Name: "tcp-service"},
+						},
+					},
+					&structs.HTTPRouteConfigEntry{
+						Name: "http-route",
+						Kind: structs.HTTPRoute,
+						Parents: []structs.ResourceReference{
+							{
+								Kind: structs.APIGateway,
+								Name: "api-gateway",
+							},
+						},
+						Rules: []structs.HTTPRouteRule{
+							{
+								Services: []structs.HTTPService{
+									{Name: "http-service"},
+								},
+							},
+						},
+					},
+				}, nil, nil)
+			},
+		},
+		{
+			name: "ingress-gateway",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil, nil, nil)
+			},
+		},
+		{
+			name: "ingress-gateway-nil-config-entry",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway_NilConfigEntry(t)
+			},
+		},
+		{
+			name: "ingress-gateway-bind-addrs",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", func(ns *structs.NodeService) {
+					//
+					ns.TaggedAddresses = map[string]structs.ServiceAddress{
+						"lan": {Address: "10.0.0.1"},
+						"wan": {Address: "172.16.0.1"},
+					}
+					ns.Proxy.Config = map[string]interface{}{
+						"envoy_gateway_no_default_bind":       true,
+						"envoy_gateway_bind_tagged_addresses": true,
+						"envoy_gateway_bind_addresses": map[string]structs.ServiceAddress{
+							"foo": {Address: "8.8.8.8"},
+						},
+					}
+				}, nil, nil)
+			},
+		},
+		{
+			name: "ingress-gateway-no-services",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, false, "tcp",
+					"default", nil, nil, nil)
+			},
+		},
+		{
+			name: "ingress-with-chain-external-sni",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"external-sni", nil, nil, nil)
+			},
+		},
+		{
+			name: "ingress-with-tcp-chain-failover-through-remote-gateway",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"failover-through-remote-gateway", nil, nil, nil)
+			},
+		},
+		{
+			name: "ingress-with-tcp-chain-failover-through-local-gateway",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
+					"failover-through-local-gateway", nil, nil, nil)
+			},
+		},
+		{
+			name: "ingress-splitter-with-resolver-redirect",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "http",
+					"splitter-with-resolver-redirect-multidc", nil, nil, nil)
+			},
+		},
+		{
+			name: "terminating-gateway",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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 {
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Incoming: &structs.MeshDirectionalTLSConfig{
+										TLSMinVersion: types.TLSv1_3,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+		},
+		{
+			name: "terminating-gateway-with-tls-incoming-max-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Incoming: &structs.MeshDirectionalTLSConfig{
+										TLSMaxVersion: types.TLSv1_2,
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+		},
+		{
+			name: "terminating-gateway-with-tls-incoming-cipher-suites",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "mesh",
+						Result: &structs.ConfigEntryResponse{
+							Entry: &structs.MeshConfigEntry{
+								TLS: &structs.MeshTLSConfig{
+									Incoming: &structs.MeshDirectionalTLSConfig{
+										CipherSuites: []types.TLSCipherSuite{
+											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+										},
+									},
+								},
+							},
+						},
+					},
+				})
+			},
+		},
+		{
+			name: "terminating-gateway-no-services",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, false, nil, nil)
+			},
+		},
+		{
+			name: "terminating-gateway-custom-and-tagged-addresses",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, func(ns *structs.NodeService) {
+					ns.Proxy.Config = map[string]interface{}{
+						"envoy_gateway_no_default_bind":       true,
+						"envoy_gateway_bind_tagged_addresses": true,
+						"envoy_gateway_bind_addresses": map[string]structs.ServiceAddress{
+							// This bind address should not get a listener due to deduplication and it sorts to the end
+							"z-duplicate-of-tagged-wan-addr": {
+								Address: "198.18.0.1",
+								Port:    443,
+							},
+							"foo": {
+								Address: "198.17.2.3",
+								Port:    8080,
+							},
+						},
+					}
+				}, nil)
+			},
+		},
+		{
+			name:   "terminating-gateway-service-subsets",
+			create: proxycfg.TestConfigSnapshotTerminatingGatewayServiceSubsets,
+		},
+		{
+			name:   "ingress-http-multiple-services",
+			create: proxycfg.TestConfigSnapshotIngress_HTTPMultipleServices,
+		},
+		{
+			name:   "ingress-grpc-multiple-services",
+			create: proxycfg.TestConfigSnapshotIngress_GRPCMultipleServices,
+		},
+		{
+			name: "terminating-gateway-no-api-cert",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				api := structs.NewServiceName("api", nil)
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "service-leaf:" + api.String(), // serviceLeafIDPrefix
+						Result:        nil,                            // tombstone this
+					},
+				})
+			},
+		},
+		{
+			name: "terminating-gateway-with-peer-trust-bundle",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				roots, _ := proxycfg.TestCerts(t)
+				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "peer-trust-bundle:web",
+						Result: &pbpeering.TrustBundleListByServiceResponse{
+							Bundles: []*pbpeering.PeeringTrustBundle{
+								{
+									TrustDomain: "foo.bar.gov",
+									PeerName:    "dc2",
+									Partition:   "default",
+									RootPEMs: []string{
+										roots.Roots[0].RootCert,
+									},
+									ExportedPartition: "default",
+									CreateIndex:       0,
+									ModifyIndex:       0,
+								},
+							},
+						},
+					},
+					{
+						CorrelationID: "service-intentions:web",
+						Result: structs.SimplifiedIntentions{
+							{
+								SourceName:           "source",
+								SourcePeer:           "dc2",
+								DestinationName:      "web",
+								DestinationPartition: "default",
+								Action:               structs.IntentionActionAllow,
+							},
+						},
+					},
+				})
+			},
+		},
+		{
+			name: "ingress-with-tls-listener",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						entry.TLS.Enabled = true
+					}, nil)
+			},
+		},
+		{
+			name: "ingress-with-tls-listener-min-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						entry.TLS.Enabled = true
+						entry.TLS.TLSMinVersion = types.TLSv1_3
+					}, nil)
+			},
+		},
+		{
+			name: "ingress-with-tls-listener-max-version",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						entry.TLS.Enabled = true
+						entry.TLS.TLSMaxVersion = types.TLSv1_2
+					}, nil)
+			},
+		},
+		{
+			name: "ingress-with-tls-listener-cipher-suites",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
+					func(entry *structs.IngressGatewayConfigEntry) {
+						entry.TLS.Enabled = true
+						entry.TLS.CipherSuites = []types.TLSCipherSuite{
+							types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+							types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
+						}
+					}, nil)
+			},
+		},
+		{
+			name:   "ingress-with-tls-mixed-listeners",
+			create: proxycfg.TestConfigSnapshotIngressGateway_MixedListeners,
+		},
+		{
+			name:   "ingress-with-tls-min-version-listeners-gateway-defaults",
+			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMinVersionListenersGatewayDefaults,
+		},
+		{
+			name:   "ingress-with-single-tls-listener",
+			create: proxycfg.TestConfigSnapshotIngressGateway_SingleTLSListener,
+		},
+		{
+			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,
+		},
+		{
+			name:   "ingress-with-sds-listener-listener-level",
+			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayAndListenerLevel,
+		},
+		{
+			name:   "ingress-with-sds-listener-gw-level-http",
+			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayAndListenerLevel_HTTP,
+		},
+		{
+			name:   "ingress-with-sds-listener-gw-level-mixed-tls",
+			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayLevel_MixedTLS,
+		},
+		{
+			name:   "ingress-with-sds-service-level",
+			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_ServiceLevel,
+		},
+		{
+			name:   "ingress-with-sds-listener+service-level",
+			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_ListenerAndServiceLevel,
+		},
+		{
+			name:   "ingress-with-sds-service-level-mixed-no-tls",
+			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_MixedNoTLS,
+		},
+		{
+			name:   "ingress-with-grpc-single-tls-listener",
+			create: proxycfg.TestConfigSnapshotIngressGateway_SingleTLSListener_GRPC,
+		},
+		{
+			name:   "ingress-with-http2-single-tls-listener",
+			create: proxycfg.TestConfigSnapshotIngressGateway_SingleTLSListener_HTTP2,
+		},
+		{
+			name:   "ingress-with-http2-and-grpc-multiple-tls-listener",
+			create: proxycfg.TestConfigSnapshotIngressGateway_MultiTLSListener_MixedHTTP2gRPC,
+		},
+		{
+			name:   "ingress-with-http2-and-grpc-multiple-tls-listener",
+			create: proxycfg.TestConfigSnapshotIngressGateway_GWTLSListener_MixedHTTP2gRPC,
+		},
+		{
+			name: "transparent-proxy-http-upstream",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshotTransparentProxyHTTPUpstream(t)
+			},
+			alsoRunTestForV2: true,
+		},
+		{
+			name:             "transparent-proxy-with-resolver-redirect-upstream",
+			create:           proxycfg.TestConfigSnapshotTransparentProxyResolverRedirectUpstream,
+			alsoRunTestForV2: true,
+		},
+		{
+			name:             "transparent-proxy-catalog-destinations-only",
+			create:           proxycfg.TestConfigSnapshotTransparentProxyCatalogDestinationsOnly,
+			alsoRunTestForV2: true,
+		},
+		{
+			name:             "transparent-proxy-dial-instances-directly",
+			create:           proxycfg.TestConfigSnapshotTransparentProxyDialDirectly,
+			alsoRunTestForV2: true,
+		},
+		{
+			name:             "transparent-proxy-terminating-gateway",
+			create:           proxycfg.TestConfigSnapshotTransparentProxyTerminatingGatewayCatalogDestinationsOnly,
+			alsoRunTestForV2: true,
+		},
+		{
+			name: "custom-trace-listener",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					ns.Proxy.Config["protocol"] = "http"
+					ns.Proxy.Config["envoy_listener_tracing_json"] = customTraceJSON(t)
+				}, nil)
+			},
+		},
+		{
+			name: "access-logs-defaults",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					// This should be passed into the snapshot through proxy-defaults
+					ns.Proxy.AccessLogs = structs.AccessLogsConfig{
+						Enabled: true,
+					}
+				},
+					nil)
+			},
+		},
+		{
+			name: "access-logs-json-file",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					// This should be passed into the snapshot through proxy-defaults
+					ns.Proxy.AccessLogs = structs.AccessLogsConfig{
+						Enabled:    true,
+						Type:       structs.FileLogSinkType,
+						Path:       "/tmp/accesslog.txt",
+						JSONFormat: "{ \"custom_start_time\": \"%START_TIME%\" }",
+					}
+				},
+					nil)
+			},
+		},
+		{
+			name: "access-logs-text-stderr-disablelistenerlogs",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
+					// This should be passed into the snapshot through proxy-defaults
+					ns.Proxy.AccessLogs = structs.AccessLogsConfig{
+						Enabled:             true,
+						DisableListenerLogs: true,
+						Type:                structs.StdErrLogSinkType,
+						TextFormat:          "CUSTOM FORMAT %START_TIME%",
+					}
+				},
+					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)...)
+
+	latestEnvoyVersion := xdscommon.EnvoyVersions[0]
+	for _, envoyVersion := range xdscommon.EnvoyVersions {
+		sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion)
+		require.NoError(t, err)
+		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)
+
+					// TODO: it would be nice to be able to ensure these snapshots are always valid before we use them in a test.
+					// require.True(t, snap.Valid())
+
+					// We need to replace the TLS certs with deterministic ones to make golden
+					// files workable. Note we don't update these otherwise they'd change
+					// 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)
+					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)
+					require.NoError(t, err)
+
+					t.Run("current-xdsv1", 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)
+					})
+
+					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)
+						})
+					}
+
+				})
+			}
+		})
+	}
+}
+
 type customListenerJSONOptions struct {
 	Name       string
 	TLSContext string
diff --git a/agent/xds/proxystateconverter/clusters.go b/agent/xds/proxystateconverter/clusters.go
index febe29cf3152b..b8857bee29c59 100644
--- a/agent/xds/proxystateconverter/clusters.go
+++ b/agent/xds/proxystateconverter/clusters.go
@@ -725,6 +725,13 @@ func (s *Converter) createOutboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot, spi
 		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() {
@@ -754,6 +761,7 @@ func (s *Converter) createOutboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot, spi
 		Key:  cfgSnap.Leaf().PrivateKeyPEM,
 	}
 	ts.TlsParameters = makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSOutgoing())
+	ts.AlpnProtocols = getAlpnProtocols(cfg.Protocol)
 
 	return ts, nil
 }
@@ -856,7 +864,6 @@ func (s *Converter) makeUpstreamClustersForDiscoveryChain(
 			failoverGroup = &pbproxystate.FailoverGroup{
 				Config: &pbproxystate.FailoverGroupConfig{
 					ConnectTimeout: durationpb.New(node.Resolver.ConnectTimeout),
-					UseAltStatName: true,
 				},
 			}
 		}
@@ -920,7 +927,6 @@ func (s *Converter) makeUpstreamClustersForDiscoveryChain(
 					Group: &pbproxystate.EndpointGroup_Dynamic{
 						Dynamic: dynamic,
 					},
-					Name: groupedTarget.ClusterName,
 				}
 				endpointGroups = append(endpointGroups, eg)
 			} else {
@@ -934,7 +940,6 @@ func (s *Converter) makeUpstreamClustersForDiscoveryChain(
 							},
 						},
 					},
-					Name: mappedTargets.baseClusterName,
 				}
 
 				out[mappedTargets.baseClusterName] = cluster
diff --git a/agent/xds/proxystateconverter/failover_policy.go b/agent/xds/proxystateconverter/failover_policy.go
index 2b0c0617c6bf2..ae1565458fa82 100644
--- a/agent/xds/proxystateconverter/failover_policy.go
+++ b/agent/xds/proxystateconverter/failover_policy.go
@@ -124,6 +124,22 @@ func (s *Converter) mapDiscoChainTargets(cfgSnap *proxycfg.ConfigSnapshot, chain
 				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)
 	}
 
diff --git a/agent/xds/proxystateconverter/listeners.go b/agent/xds/proxystateconverter/listeners.go
index 1e15ecb97c90e..266e96383c7a6 100644
--- a/agent/xds/proxystateconverter/listeners.go
+++ b/agent/xds/proxystateconverter/listeners.go
@@ -829,6 +829,19 @@ func (s *Converter) injectConnectTLSForPublicListener(cfgSnap *proxycfg.ConfigSn
 	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:
@@ -837,6 +850,13 @@ func (s *Converter) createInboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot) (*pb
 		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() {
@@ -862,6 +882,7 @@ func (s *Converter) createInboundMeshMTLS(cfgSnap *proxycfg.ConfigSnapshot) (*pb
 		Key:  cfgSnap.Leaf().PrivateKeyPEM,
 	}
 	ts.TlsParameters = makeTLSParametersFromProxyTLSConfig(cfgSnap.MeshConfigTLSIncoming())
+	ts.AlpnProtocols = getAlpnProtocols(cfg.Protocol)
 
 	return ts, nil
 }
diff --git a/agent/xds/proxystateconverter/routes.go b/agent/xds/proxystateconverter/routes.go
index 0df72314f3041..9cdd24fe12b05 100644
--- a/agent/xds/proxystateconverter/routes.go
+++ b/agent/xds/proxystateconverter/routes.go
@@ -53,11 +53,6 @@ func (s *Converter) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapshot) erro
 			continue
 		}
 
-		// route already exists, don't clobber it.
-		if _, ok := s.proxyState.Routes[uid.EnvoyID()]; ok {
-			continue
-		}
-
 		virtualHost, err := s.makeUpstreamHostForDiscoveryChain(cfgSnap, uid, chain, []string{"*"}, false)
 		if err != nil {
 			return err
diff --git a/agent/xds/resources_test.go b/agent/xds/resources_test.go
index ed6fc6b91683d..b47edcbac3684 100644
--- a/agent/xds/resources_test.go
+++ b/agent/xds/resources_test.go
@@ -4,17 +4,11 @@
 package xds
 
 import (
-	"fmt"
 	"path/filepath"
 	"sort"
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/agent/xds/proxystateconverter"
-	"github.com/hashicorp/consul/agent/xdsv2"
-	"github.com/hashicorp/consul/proto/private/pbpeering"
-	"google.golang.org/protobuf/proto"
-
 	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"
@@ -52,7 +46,6 @@ type goldenTestCase struct {
 	setup              func(snap *proxycfg.ConfigSnapshot)
 	overrideGoldenName string
 	generatorSetup     func(*ResourceGenerator)
-	alsoRunTestForV2   bool
 }
 
 func TestAllResourcesFromSnapshot(t *testing.T) {
@@ -84,33 +77,6 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 			tt.setup(snap)
 		}
 
-		typeUrls := []string{
-			xdscommon.ListenerType,
-			xdscommon.RouteType,
-			xdscommon.ClusterType,
-			xdscommon.EndpointType,
-			xdscommon.SecretType,
-		}
-
-		resourceSortingFunc := func(items []proto.Message, typeURL string) func(i, j int) bool {
-			return func(i, j int) bool {
-				switch typeURL {
-				case xdscommon.ListenerType:
-					return items[i].(*envoy_listener_v3.Listener).Name < items[j].(*envoy_listener_v3.Listener).Name
-				case xdscommon.RouteType:
-					return items[i].(*envoy_route_v3.RouteConfiguration).Name < items[j].(*envoy_route_v3.RouteConfiguration).Name
-				case xdscommon.ClusterType:
-					return items[i].(*envoy_cluster_v3.Cluster).Name < items[j].(*envoy_cluster_v3.Cluster).Name
-				case xdscommon.EndpointType:
-					return items[i].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName < items[j].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName
-				case xdscommon.SecretType:
-					return items[i].(*envoy_tls_v3.Secret).Name < items[j].(*envoy_tls_v3.Secret).Name
-				default:
-					panic("not possible")
-				}
-			}
-		}
-
 		// Need server just for logger dependency
 		g := NewResourceGenerator(testutil.Logger(t), nil, false)
 		g.ProxyFeatures = sf
@@ -121,15 +87,37 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 		resources, err := g.AllResourcesFromSnapshot(snap)
 		require.NoError(t, err)
 
+		typeUrls := []string{
+			xdscommon.ListenerType,
+			xdscommon.RouteType,
+			xdscommon.ClusterType,
+			xdscommon.EndpointType,
+			xdscommon.SecretType,
+		}
 		require.Len(t, resources, len(typeUrls))
 
 		for _, typeUrl := range typeUrls {
 			prettyName := testTypeUrlToPrettyName[typeUrl]
-			t.Run(fmt.Sprintf("xdsv1-%s", prettyName), func(t *testing.T) {
+			t.Run(prettyName, func(t *testing.T) {
 				items, ok := resources[typeUrl]
 				require.True(t, ok)
 
-				sort.Slice(items, resourceSortingFunc(items, typeUrl))
+				sort.Slice(items, func(i, j int) bool {
+					switch typeUrl {
+					case xdscommon.ListenerType:
+						return items[i].(*envoy_listener_v3.Listener).Name < items[j].(*envoy_listener_v3.Listener).Name
+					case xdscommon.RouteType:
+						return items[i].(*envoy_route_v3.RouteConfiguration).Name < items[j].(*envoy_route_v3.RouteConfiguration).Name
+					case xdscommon.ClusterType:
+						return items[i].(*envoy_cluster_v3.Cluster).Name < items[j].(*envoy_cluster_v3.Cluster).Name
+					case xdscommon.EndpointType:
+						return items[i].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName < items[j].(*envoy_endpoint_v3.ClusterLoadAssignment).ClusterName
+					case xdscommon.SecretType:
+						return items[i].(*envoy_tls_v3.Secret).Name < items[j].(*envoy_tls_v3.Secret).Name
+					default:
+						panic("not possible")
+					}
+				})
 
 				r, err := response.CreateResponse(typeUrl, "00000001", "00000001", items)
 				require.NoError(t, err)
@@ -145,43 +133,6 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 				require.JSONEq(t, expectedJSON, gotJSON)
 			})
 		}
-
-		if tt.alsoRunTestForV2 {
-			generator := xdsv2.NewResourceGenerator(testutil.Logger(t))
-
-			converter := proxystateconverter.NewConverter(testutil.Logger(t), &mockCfgFetcher{addressLan: "192.0.2.1"})
-			proxyState, err := converter.ProxyStateFromSnapshot(snap)
-			require.NoError(t, err)
-
-			v2Resources, err := generator.AllResourcesFromIR(proxyState)
-			require.NoError(t, err)
-			require.Len(t, v2Resources, len(typeUrls)-1) // secrets are not currently implemented in V2.
-			for _, typeUrl := range typeUrls {
-				prettyName := testTypeUrlToPrettyName[typeUrl]
-				t.Run(fmt.Sprintf("xdsv2-%s", prettyName), func(t *testing.T) {
-					if typeUrl == xdscommon.SecretType {
-						t.Skip("skipping. secrets are not yet implemented in xdsv2")
-					}
-					items, ok := v2Resources[typeUrl]
-					require.True(t, ok)
-
-					sort.Slice(items, resourceSortingFunc(items, typeUrl))
-
-					r, err := response.CreateResponse(typeUrl, "00000001", "00000001", items)
-					require.NoError(t, err)
-
-					gotJSON := protoToJSON(t, r)
-
-					gName := tt.name
-					if tt.overrideGoldenName != "" {
-						gName = tt.overrideGoldenName
-					}
-
-					expectedJSON := goldenEnvoy(t, filepath.Join(prettyName, gName), envoyVersion, latestEnvoyVersion, gotJSON)
-					require.JSONEq(t, expectedJSON, gotJSON)
-				})
-			}
-		}
 	}
 
 	tests := []testcase{
@@ -190,185 +141,58 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshot(t, nil, nil)
 			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name:             "telemetry-collector",
-			create:           proxycfg.TestConfigSnapshotTelemetryCollector,
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "grpc-public-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "grpc"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "listener-bind-address",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["bind_address"] = "127.0.0.2"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "listener-bind-port",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["bind_port"] = 8888
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "listener-bind-address-port",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["bind_address"] = "127.0.0.2"
-					ns.Proxy.Config["bind_port"] = 8888
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "listener-unix-domain-socket",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].LocalBindAddress = ""
-					ns.Proxy.Upstreams[0].LocalBindPort = 0
-					ns.Proxy.Upstreams[0].LocalBindSocketPath = "/tmp/service-mesh/client-1/grpc-employee-server"
-					ns.Proxy.Upstreams[0].LocalBindSocketMode = "0640"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "listener-max-inbound-connections",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["max_inbound_connections"] = 222
-				}, nil)
-			},
-			alsoRunTestForV2: true,
 		},
 		{
-			name: "http2-public-listener",
+			name: "connect-proxy-exported-to-peers",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http2"
-				}, nil)
+					// This test is only concerned about the SPIFFE cert validator config in the public listener
+					// so we empty out the upstreams to avoid generating unnecessary upstream listeners.
+					ns.Proxy.Upstreams = structs.Upstreams{}
+				}, []proxycfg.UpdateEvent{
+					{
+						CorrelationID: "peering-trust-bundles",
+						Result:        proxycfg.TestPeerTrustBundles(t),
+					},
+				})
 			},
-			alsoRunTestForV2: true,
 		},
 		{
-			name: "listener-balance-inbound-connections",
+			name: "transparent-proxy",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["balance_inbound_connections"] = "exact_balance"
-				}, nil)
+				return proxycfg.TestConfigSnapshotTransparentProxy(t)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
-			name: "listener-balance-outbound-connections-bind-port",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["balance_outbound_connections"] = "exact_balance"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
+			name:   "connect-proxy-with-peered-upstreams",
+			create: proxycfg.TestConfigSnapshotPeering,
 		},
 		{
-			name: "http-public-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
+			name:   "connect-proxy-with-peered-upstreams-escape-overrides",
+			create: proxycfg.TestConfigSnapshotPeeringWithEscapeOverrides,
 		},
 		{
-			name: "http-public-listener-no-xfcc",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t,
-					func(ns *structs.NodeService) {
-						ns.Proxy.Config["protocol"] = "http"
-					},
-					[]proxycfg.UpdateEvent{
-						{
-							CorrelationID: "mesh",
-							Result: &structs.ConfigEntryResponse{
-								Entry: &structs.MeshConfigEntry{
-									HTTP: &structs.MeshHTTPConfig{
-										SanitizeXForwardedClientCert: true,
-									},
-								},
-							},
-						},
-					})
-			},
-			alsoRunTestForV2: true,
+			name:   "connect-proxy-with-peered-upstreams-http2",
+			create: proxycfg.TestConfigSnapshotPeeringWithHTTP2,
 		},
 		{
-			name: "http-listener-with-timeouts",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.Config["local_connect_timeout_ms"] = 1234
-					ns.Proxy.Config["local_request_timeout_ms"] = 2345
-					ns.Proxy.Config["local_idle_timeout_ms"] = 3456
-				}, nil)
-			},
-			alsoRunTestForV2: true,
+			name:   "transparent-proxy-with-peered-upstreams",
+			create: proxycfg.TestConfigSnapshotPeeringTProxy,
 		},
 		{
-			name: "http-upstream",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["protocol"] = "http"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
+			name:   "local-mesh-gateway-with-peered-upstreams",
+			create: proxycfg.TestConfigSnapshotPeeringLocalMeshGateway,
 		},
 		{
-			name: "connect-proxy-upstream-defaults",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					for _, v := range ns.Proxy.Upstreams {
-						// Prepared queries do not get centrally configured upstream defaults merged into them.
-						if v.DestinationType == structs.UpstreamDestTypePreparedQuery {
-							continue
-						}
-						// Represent upstream config as if it came from centrally configured upstream defaults.
-						// The name/namespace must not make it onto the cluster name attached to the outbound listener.
-						v.CentrallyConfigured = true
-						v.DestinationNamespace = structs.WildcardSpecifier
-						v.DestinationName = structs.WildcardSpecifier
-					}
-				}, nil)
-			},
-			alsoRunTestForV2: true,
+			name:   "telemetry-collector",
+			create: proxycfg.TestConfigSnapshotTelemetryCollector,
 		},
 	}
-	tests = append(tests, getConnectProxyDiscoChainTests(false)...)
 	tests = append(tests, getConnectProxyTransparentProxyGoldenTestCases()...)
-	tests = append(tests, getMeshGatewayGoldenTestCases()...)
 	tests = append(tests, getMeshGatewayPeeringGoldenTestCases()...)
 	tests = append(tests, getTrafficControlPeeringGoldenTestCases(false)...)
 	tests = append(tests, getEnterpriseGoldenTestCases(t)...)
 	tests = append(tests, getAPIGatewayGoldenTestCases(t)...)
-	tests = append(tests, getExposePathGoldenTestCases()...)
-	tests = append(tests, getCustomConfigurationGoldenTestCases(false)...)
-	tests = append(tests, getConnectProxyJWTProviderGoldenTestCases()...)
-	tests = append(tests, getTerminatingGatewayPeeringGoldenTestCases()...)
-	tests = append(tests, getIngressGatewayGoldenTestCases()...)
-	tests = append(tests, getAccessLogsGoldenTestCases()...)
-	tests = append(tests, getTLSGoldenTestCases()...)
-	tests = append(tests, getPeeredGoldenTestCases()...)
 
 	latestEnvoyVersion := xdscommon.EnvoyVersions[0]
 	for _, envoyVersion := range xdscommon.EnvoyVersions {
@@ -386,585 +210,85 @@ func TestAllResourcesFromSnapshot(t *testing.T) {
 
 func getConnectProxyTransparentProxyGoldenTestCases() []goldenTestCase {
 	return []goldenTestCase{
-		{
-			name: "transparent-proxy",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTransparentProxy(t)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name:             "transparent-proxy-catalog-destinations-only",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyCatalogDestinationsOnly,
-			alsoRunTestForV2: true,
-		},
-		{
-			name:             "transparent-proxy-dial-instances-directly",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyDialDirectly,
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "transparent-proxy-http-upstream",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTransparentProxyHTTPUpstream(t)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name:             "transparent-proxy-with-resolver-redirect-upstream",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyResolverRedirectUpstream,
-			alsoRunTestForV2: true,
-		},
-		{
-			name:             "transparent-proxy-terminating-gateway",
-			create:           proxycfg.TestConfigSnapshotTransparentProxyTerminatingGatewayCatalogDestinationsOnly,
-			alsoRunTestForV2: true,
-		},
 		{
 			name:   "transparent-proxy-destination",
 			create: proxycfg.TestConfigSnapshotTransparentProxyDestination,
-			// TODO(proxystate): currently failing. should work.  possible issue in converter.
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "transparent-proxy-destination-http",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotTransparentProxyDestinationHTTP(t, nil)
 			},
-			// TODO(proxystate): currently failing. should work.  possible issue in converter.
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "transparent-proxy-terminating-gateway-destinations-only",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
 				return proxycfg.TestConfigSnapshotTerminatingGatewayDestinations(t, true, nil)
 			},
-			// TODO(proxystate): terminating gateways will come at a later date.
-			alsoRunTestForV2: false,
 		},
 	}
 }
 
-func getConnectProxyDiscoChainTests(enterprise bool) []goldenTestCase {
+func getMeshGatewayPeeringGoldenTestCases() []goldenTestCase {
 	return []goldenTestCase{
 		{
-			name: "connect-proxy-with-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", false, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-chain-external-sni",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "external-sni", false, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-chain-and-failover",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", false, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-exported-to-peers",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					// This test is only concerned about the SPIFFE cert validator config in the public listener
-					// so we empty out the upstreams to avoid generating unnecessary upstream listeners.
-					ns.Proxy.Upstreams = structs.Upstreams{}
-				}, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "peering-trust-bundles",
-						Result:        proxycfg.TestPeerTrustBundles(t),
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "custom-upstream-default-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", enterprise, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
-						customAppClusterJSON(t, customClusterJSONOptions{
-							Name: "myservice",
-						})
-				}, nil)
-			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
-		},
-		{
-			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-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",
+			name: "mesh-gateway-with-exported-peered-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-local-gateway", enterprise, nil, nil)
+				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "default-services-tcp", nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
-			name: "connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered",
+			name: "mesh-gateway-with-exported-peered-services-http",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-through-double-local-gateway-triggered", enterprise, nil, nil)
+				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "default-services-http", nil, nil)
 			},
-			// TODO(proxystate): requires routes work
-			alsoRunTestForV2: false,
 		},
 		{
-			name: "splitter-with-resolver-redirect",
+			name: "mesh-gateway-with-exported-peered-services-http-with-router",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "splitter-with-resolver-redirect-multidc", enterprise, nil, nil)
+				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "chain-and-l7-stuff", nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
-			name: "connect-proxy-lb-in-resolver",
+			name: "mesh-gateway-peering-control-plane",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "lb-resolver", enterprise, nil, nil)
+				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "control-plane", nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
-			name: "connect-proxy-with-default-chain-and-custom-cluster",
+			name: "mesh-gateway-with-imported-peered-services",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", enterprise, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
-						customAppClusterJSON(t, customClusterJSONOptions{
-							Name: "myservice",
-						})
+				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "imported-services", func(ns *structs.NodeService) {
+					ns.Proxy.Config = map[string]interface{}{
+						"envoy_dns_discovery_type": "STRICT_DNS",
+					}
 				}, nil)
 			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
-		},
-		{
-			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-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",
+			name: "mesh-gateway-with-peer-through-mesh-gateway-enabled",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "chain-and-router", enterprise, nil, nil)
+				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "peer-through-mesh-gateway", nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
+	}
+}
+
+func getTrafficControlPeeringGoldenTestCases(enterprise bool) []goldenTestCase {
+	cases := []goldenTestCase{
 		{
-			name: "connect-proxy-route-to-lb-resolver",
+			name: "connect-proxy-with-chain-and-failover-to-cluster-peer",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "redirect-to-lb-node", enterprise, nil, nil)
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-to-cluster-peer", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
 		{
-			name: "connect-proxy-resolver-with-lb",
+			name: "connect-proxy-with-chain-and-redirect-to-cluster-peer",
 			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "resolver-with-lb", enterprise, nil, nil)
+				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "redirect-to-cluster-peer", enterprise, nil, nil)
 			},
-			alsoRunTestForV2: true,
 		},
-		{
-			name: "custom-upstream-ignored-with-disco-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover", enterprise, 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])
-
-						ns.Proxy.Upstreams[i].Config["envoy_listener_json"] =
-							customListenerJSON(t, customListenerJSONOptions{
-								Name: uid.EnvoyID() + ":custom-upstream",
-							})
-					}
-				}, nil)
-			},
-		},
-		{
-			name: "connect-proxy-with-tcp-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-http-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil,
-					&structs.ProxyConfigEntry{
-						Kind:     structs.ProxyDefaults,
-						Name:     structs.ProxyConfigGlobal,
-						Protocol: "http",
-						Config: map[string]interface{}{
-							"protocol": "http",
-						},
-					},
-				)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-http2-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil,
-					&structs.ProxyConfigEntry{
-						Kind:     structs.ProxyDefaults,
-						Name:     structs.ProxyConfigGlobal,
-						Protocol: "http2",
-						Config: map[string]interface{}{
-							"protocol": "http2",
-						},
-					},
-				)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-grpc-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "simple", enterprise, nil, nil,
-					&structs.ProxyConfigEntry{
-						Kind:     structs.ProxyDefaults,
-						Name:     structs.ProxyConfigGlobal,
-						Protocol: "grpc",
-						Config: map[string]interface{}{
-							"protocol": "grpc",
-						},
-					},
-				)
-			},
-			alsoRunTestForV2: true,
-		},
-	}
-}
-
-func getMeshGatewayGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			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-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-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-subsets", nil, nil)
-			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-service-subsets2", // TODO: make this merge with '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: "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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", func(ns *structs.NodeService) {
-					ns.Proxy.Config["envoy_gateway_remote_tcp_enable_keepalive"] = true
-					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_time"] = 120
-					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_interval"] = 60
-					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_probes"] = 7
-				}, nil)
-			},
-			// TODO(proxystate): mesh gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-tagged-addresses",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]interface{}{
-						"envoy_mesh_gateway_no_default_bind":       true,
-						"envoy_mesh_gateway_bind_tagged_addresses": true,
-					}
-				}, nil)
-			},
-		},
-		{
-			name: "mesh-gateway-custom-addresses",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotMeshGateway(t, "default", func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]interface{}{
-						"envoy_mesh_gateway_bind_addresses": map[string]structs.ServiceAddress{
-							"foo": {
-								Address: "198.17.2.3",
-								Port:    8080,
-							},
-							"bar": {
-								Address: "2001:db8::ff",
-								Port:    9999,
-							},
-							"baz": {
-								Address: "127.0.0.1",
-								Port:    8765,
-							},
-						},
-					}
-				}, nil)
-			},
-		},
-	}
-}
-func getMeshGatewayPeeringGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			name: "mesh-gateway-with-exported-peered-services",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "default-services-tcp", nil, nil)
-			},
-			// TODO(proxystate): mesh gateways will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-with-exported-peered-services-http",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "default-services-http", nil, nil)
-			},
-			// TODO(proxystate): mesh gateways will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-with-exported-peered-services-http-with-router",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "chain-and-l7-stuff", nil, nil)
-			},
-			// TODO(proxystate): mesh gateways will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-peering-control-plane",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "control-plane", nil, nil)
-			},
-			// TODO(proxystate): mesh gateways will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			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)
-			},
-			// TODO(proxystate): mesh gateways will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "mesh-gateway-with-peer-through-mesh-gateway-enabled",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotPeeredMeshGateway(t, "peer-through-mesh-gateway", nil, nil)
-			},
-			// TODO(proxystate): mesh gateways will come at a later date.
-			alsoRunTestForV2: false,
-		},
-	}
-}
-
-func getTrafficControlPeeringGoldenTestCases(enterprise bool) []goldenTestCase {
-	cases := []goldenTestCase{
-		{
-			name: "connect-proxy-with-chain-and-failover-to-cluster-peer",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "failover-to-cluster-peer", enterprise, nil, nil)
-			},
-			// TODO(proxystate): peering will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "connect-proxy-with-chain-and-redirect-to-cluster-peer",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "redirect-to-cluster-peer", enterprise, nil, nil)
-			},
-			// TODO(proxystate): peering will come at a later date.
-			alsoRunTestForV2: false,
-		},
-	}
+	}
 
 	if enterprise {
 		for i := range cases {
@@ -1129,8 +453,6 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 						Certificate: gatewayTestCertificate,
 					}}, nil)
 			},
-			// TODO(proxystate): api gateways will come at a later date.
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "api-gateway-with-multiple-inline-certificates",
@@ -1204,8 +526,6 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 						},
 					}, nil)
 			},
-			// TODO(proxystate): api gateways will come at a later date.
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "api-gateway-with-http-route",
@@ -1287,8 +607,6 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 					},
 				}})
 			},
-			// TODO(proxystate): api gateways will come at a later date.
-			alsoRunTestForV2: false,
 		},
 		{
 			name: "api-gateway-with-http-route-timeoutfilter-one-set",
@@ -1363,1827 +681,6 @@ func getAPIGatewayGoldenTestCases(t *testing.T) []goldenTestCase {
 					},
 				}})
 			},
-			// TODO(proxystate): api gateways will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "api-gateway",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway(t, "default", nil, nil, nil, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-nil-config-entry",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotAPIGateway_NilConfigEntry(t)
-			},
-		},
-		{
-			name: "api-gateway-tcp-listener",
-			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,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener",
-						},
-					}
-				}, nil, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-tcp-listener-with-tcp-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.ListenerProtocolTCP,
-							Port:     8080,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "tcp-route",
-									Kind: structs.TCPRoute,
-								},
-							},
-						},
-					}
-
-				}, []structs.BoundRoute{
-					&structs.TCPRouteConfigEntry{
-						Name: "tcp-route",
-						Kind: structs.TCPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Services: []structs.TCPService{
-							{Name: "tcp-service"},
-						},
-					},
-				}, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-http-listener",
-			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",
-							Routes: []structs.ResourceReference{},
-						},
-					}
-				}, nil, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-http-listener-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",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "http-route",
-									Kind: structs.HTTPRoute,
-								},
-							},
-						},
-					}
-				}, []structs.BoundRoute{
-					&structs.HTTPRouteConfigEntry{
-						Name: "http-route",
-						Kind: structs.HTTPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Rules: []structs.HTTPRouteRule{
-							{
-								Services: []structs.HTTPService{
-									{Name: "http-service"},
-								},
-							},
-						},
-					},
-				}, nil, nil)
-			},
-		},
-		{
-			name: "api-gateway-tcp-listener-with-tcp-and-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-tcp",
-							Protocol: structs.ListenerProtocolTCP,
-							Port:     8080,
-						},
-						{
-							Name:     "listener-http",
-							Protocol: structs.ListenerProtocolHTTP,
-							Port:     8081,
-						},
-					}
-					bound.Listeners = []structs.BoundAPIGatewayListener{
-						{
-							Name: "listener-tcp",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "tcp-route",
-									Kind: structs.TCPRoute,
-								},
-							},
-						},
-						{
-							Name: "listener-http",
-							Routes: []structs.ResourceReference{
-								{
-									Name: "http-route",
-									Kind: structs.HTTPRoute,
-								},
-							},
-						},
-					}
-				}, []structs.BoundRoute{
-					&structs.TCPRouteConfigEntry{
-						Name: "tcp-route",
-						Kind: structs.TCPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Services: []structs.TCPService{
-							{Name: "tcp-service"},
-						},
-					},
-					&structs.HTTPRouteConfigEntry{
-						Name: "http-route",
-						Kind: structs.HTTPRoute,
-						Parents: []structs.ResourceReference{
-							{
-								Kind: structs.APIGateway,
-								Name: "api-gateway",
-							},
-						},
-						Rules: []structs.HTTPRouteRule{
-							{
-								Services: []structs.HTTPService{
-									{Name: "http-service"},
-								},
-							},
-						},
-					},
-				}, nil, nil)
-			},
-		},
-		{
-			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)
-			},
-		},
-	}
-}
-
-func getExposePathGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Address = ""
-					ns.Port = 0
-					ns.Proxy.LocalServiceAddress = ""
-					ns.Proxy.LocalServicePort = 0
-					ns.Proxy.LocalServiceSocketPath = "/tmp/downstream_proxy.sock"
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "expose-paths-new-cluster-http2",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotExposeConfig(t, func(ns *structs.NodeService) {
-					ns.Proxy.Expose.Paths[1] = structs.ExposePath{
-						LocalPathPort: 9090,
-						Path:          "/grpc.health.v1.Health/Check",
-						ListenerPort:  21501,
-						Protocol:      "http2",
-					}
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name:   "expose-checks",
-			create: proxycfg.TestConfigSnapshotExposeChecks,
-			generatorSetup: func(s *ResourceGenerator) {
-				s.CfgFetcher = configFetcherFunc(func() string {
-					return "192.0.2.1"
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name:             "expose-paths-grpc-new-cluster-http1",
-			create:           proxycfg.TestConfigSnapshotGRPCExposeHTTP1,
-			alsoRunTestForV2: true,
-		},
-		{
-			// 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",
-			create: proxycfg.TestConfigSnapshotExposeChecks,
-			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-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"
-				})
-			},
-		},
-	}
-}
-
-func getCustomConfigurationGoldenTestCases(enterprise bool) []goldenTestCase {
-	return []goldenTestCase{
-		{
-			name: "custom-upstream-default-chain",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", enterprise, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
-						customAppClusterJSON(t, customClusterJSONOptions{
-							Name: "myservice",
-						})
-				}, nil)
-			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "custom-local-app",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["envoy_local_cluster_json"] =
-						customAppClusterJSON(t, customClusterJSONOptions{
-							Name: "mylocal",
-						})
-				}, nil)
-			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "custom-upstream",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
-						customAppClusterJSON(t, customClusterJSONOptions{
-							Name: "myservice",
-						})
-				}, nil)
-			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
-		},
-		{
-			name:               "custom-upstream-ignores-tls",
-			overrideGoldenName: "custom-upstream", // should be the same
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
-						customAppClusterJSON(t, customClusterJSONOptions{
-							Name: "myservice",
-							// Attempt to override the TLS context should be ignored
-							TLSContext: `"allowRenegotiation": false`,
-						})
-				}, 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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["local_connect_timeout_ms"] = 1234
-					ns.Proxy.Upstreams[0].Config["connect_timeout_ms"] = 2345
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "custom-passive-healthcheck",
-			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(80),
-						"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-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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["max_inbound_connections"] = 3456
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "custom-limits-max-connections-only",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					for i := range ns.Proxy.Upstreams {
-						// We check if Config is nil because the prepared_query upstream is
-						// initialized without a Config map. Use Upstreams[i] syntax to
-						// modify the actual ConfigSnapshot instead of copying the Upstream
-						// in the range.
-						if ns.Proxy.Upstreams[i].Config == nil {
-							ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
-						}
-
-						ns.Proxy.Upstreams[i].Config["limits"] = map[string]interface{}{
-							"max_connections": 500,
-						}
-					}
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "custom-limits-set-to-zero",
-			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].Config == nil {
-							ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
-						}
-
-						ns.Proxy.Upstreams[i].Config["limits"] = map[string]interface{}{
-							"max_connections":         0,
-							"max_pending_requests":    0,
-							"max_concurrent_requests": 0,
-						}
-					}
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "custom-limits",
-			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].Config == nil {
-							ns.Proxy.Upstreams[i].Config = map[string]interface{}{}
-						}
-
-						ns.Proxy.Upstreams[i].Config["limits"] = map[string]interface{}{
-							"max_connections":         500,
-							"max_pending_requests":    600,
-							"max_concurrent_requests": 700,
-						}
-					}
-				}, nil)
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-default-chain-and-custom-cluster",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotDiscoveryChain(t, "default", enterprise, func(ns *structs.NodeService) {
-					ns.Proxy.Upstreams[0].Config["envoy_cluster_json"] =
-						customAppClusterJSON(t, customClusterJSONOptions{
-							Name: "myservice",
-						})
-				}, nil)
-			},
-			// TODO(proxystate): requires custom cluster work
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "custom-public-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["envoy_public_listener_json"] =
-						customListenerJSON(t, customListenerJSONOptions{
-							Name: "custom-public-listen",
-						})
-				}, nil)
-			},
-		},
-		{
-			name: "custom-public-listener-http",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.Config["envoy_public_listener_json"] =
-						customHTTPListenerJSON(t, customHTTPListenerJSONOptions{
-							Name: "custom-public-listen",
-						})
-				}, nil)
-			},
-		},
-		{
-			name: "custom-public-listener-http-2",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.Config["envoy_public_listener_json"] =
-						customHTTPListenerJSON(t, customHTTPListenerJSONOptions{
-							Name:                      "custom-public-listen",
-							HTTPConnectionManagerName: httpConnectionManagerNewName,
-						})
-				}, nil)
-			},
-		},
-		{
-			name: "custom-public-listener-http-missing",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.Config["envoy_public_listener_json"] =
-						customListenerJSON(t, customListenerJSONOptions{
-							Name: "custom-public-listen",
-						})
-				}, nil)
-			},
-		},
-		{
-			name:               "custom-public-listener-ignores-tls",
-			overrideGoldenName: "custom-public-listener", // should be the same
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["envoy_public_listener_json"] =
-						customListenerJSON(t, customListenerJSONOptions{
-							Name: "custom-public-listen",
-							// Attempt to override the TLS context should be ignored
-							TLSContext: `"allowRenegotiation": false`,
-						})
-				}, nil)
-			},
-		},
-		{
-			name: "custom-trace-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					ns.Proxy.Config["protocol"] = "http"
-					ns.Proxy.Config["envoy_listener_tracing_json"] = customTraceJSON(t)
-				}, nil)
-			},
-		},
-	}
-}
-
-func getConnectProxyJWTProviderGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			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,
-		},
-	}
-}
-
-func getTerminatingGatewayPeeringGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			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.TestConfigSnapshotTerminatingGatewayLBConfig,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "terminating-gateway-lb-config-no-hash-policies",
-			create: proxycfg.TestConfigSnapshotTerminatingGatewayLBConfigNoHashPolicies,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "terminating-gateway-tcp-keepalives",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, func(ns *structs.NodeService) {
-					if ns.Proxy.Config == nil {
-						ns.Proxy.Config = map[string]interface{}{}
-					}
-					ns.Proxy.Config["envoy_gateway_remote_tcp_enable_keepalive"] = true
-					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_time"] = 133
-					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_interval"] = 27
-					ns.Proxy.Config["envoy_gateway_remote_tcp_keepalive_probes"] = 5
-				}, nil)
-			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			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)
-			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "terminating-gateway-with-tls-incoming-min-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Incoming: &structs.MeshDirectionalTLSConfig{
-										TLSMinVersion: types.TLSv1_3,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "terminating-gateway-with-tls-incoming-max-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Incoming: &structs.MeshDirectionalTLSConfig{
-										TLSMaxVersion: types.TLSv1_2,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "terminating-gateway-with-tls-incoming-cipher-suites",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Incoming: &structs.MeshDirectionalTLSConfig{
-										CipherSuites: []types.TLSCipherSuite{
-											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-										},
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "terminating-gateway-custom-and-tagged-addresses",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, func(ns *structs.NodeService) {
-					ns.Proxy.Config = map[string]interface{}{
-						"envoy_gateway_no_default_bind":       true,
-						"envoy_gateway_bind_tagged_addresses": true,
-						"envoy_gateway_bind_addresses": map[string]structs.ServiceAddress{
-							// This bind address should not get a listener due to deduplication and it sorts to the end
-							"z-duplicate-of-tagged-wan-addr": {
-								Address: "198.18.0.1",
-								Port:    443,
-							},
-							"foo": {
-								Address: "198.17.2.3",
-								Port:    8080,
-							},
-						},
-					}
-				}, nil)
-			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "terminating-gateway-no-api-cert",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				api := structs.NewServiceName("api", nil)
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "service-leaf:" + api.String(), // serviceLeafIDPrefix
-						Result:        nil,                            // tombstone this
-					},
-				})
-			},
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "terminating-gateway-with-peer-trust-bundle",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				roots, _ := proxycfg.TestCerts(t)
-				return proxycfg.TestConfigSnapshotTerminatingGateway(t, true, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "peer-trust-bundle:web",
-						Result: &pbpeering.TrustBundleListByServiceResponse{
-							Bundles: []*pbpeering.PeeringTrustBundle{
-								{
-									TrustDomain: "foo.bar.gov",
-									PeerName:    "dc2",
-									Partition:   "default",
-									RootPEMs: []string{
-										roots.Roots[0].RootCert,
-									},
-									ExportedPartition: "default",
-									CreateIndex:       0,
-									ModifyIndex:       0,
-								},
-							},
-						},
-					},
-					{
-						CorrelationID: "service-intentions:web",
-						Result: structs.SimplifiedIntentions{
-							{
-								SourceName:           "source",
-								SourcePeer:           "dc2",
-								DestinationName:      "web",
-								DestinationPartition: "default",
-								Action:               structs.IntentionActionAllow,
-							},
-						},
-					},
-				})
-			},
-			// 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,
-		},
-	}
-}
-
-func getIngressGatewayGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			name: "ingress-gateway",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Outgoing: &structs.MeshDirectionalTLSConfig{
-										TLSMinVersion: types.TLSv1_3,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-gateway-with-tls-outgoing-max-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Outgoing: &structs.MeshDirectionalTLSConfig{
-										TLSMaxVersion: types.TLSv1_2,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-gateway-with-tls-outgoing-cipher-suites",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Outgoing: &structs.MeshDirectionalTLSConfig{
-										CipherSuites: []types.TLSCipherSuite{
-											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-										},
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-gateway-no-services",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
-					"simple", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
-					"simple", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						entry.Defaults = &structs.IngressServiceConfig{
-							MaxConnections:        2048,
-							MaxPendingRequests:    512,
-							MaxConcurrentRequests: 4096,
-						}
-					}, nil)
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-with-overwrite-defaults-service-max-connections",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
-					"simple", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						entry.Defaults = &structs.IngressServiceConfig{
-							MaxConnections:     2048,
-							MaxPendingRequests: 512,
-						}
-						entry.Listeners[0].Services[0].MaxConnections = 4096
-						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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
-					"simple", nil,
-					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),
-						}
-					}, nil)
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-with-defaults-passive-health-check",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
-					"simple", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						enforcingConsecutive5xx := uint32(80)
-						entry.Defaults = &structs.IngressServiceConfig{
-							MaxConnections:        2048,
-							MaxPendingRequests:    512,
-							MaxConcurrentRequests: 4096,
-							PassiveHealthCheck: &structs.PassiveHealthCheck{
-								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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp",
-					"simple", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						defaultEnforcingConsecutive5xx := uint32(80)
-						entry.Defaults = &structs.IngressServiceConfig{
-							MaxConnections:     2048,
-							MaxPendingRequests: 512,
-							PassiveHealthCheck: &structs.PassiveHealthCheck{
-								Interval:                5000000000,
-								EnforcingConsecutive5xx: &defaultEnforcingConsecutive5xx,
-								MaxEjectionPercent:      uint32ptr(80),
-							},
-						}
-						enforcingConsecutive5xx := uint32(50)
-						entry.Listeners[0].Services[0].MaxConnections = 4096
-						entry.Listeners[0].Services[0].MaxPendingRequests = 2048
-						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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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-multiple-listeners-duplicate-service",
-			create: proxycfg.TestConfigSnapshotIngress_MultipleListenersDuplicateService,
-			// TODO(proxystate): terminating gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-config-entry-nil",
-			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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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-and-splitter",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				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-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-tls-listener",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						entry.TLS.Enabled = true
-					}, nil)
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-with-tls-listener-min-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						entry.TLS.Enabled = true
-						entry.TLS.TLSMinVersion = types.TLSv1_3
-					}, nil)
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-with-tls-listener-max-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						entry.TLS.Enabled = true
-						entry.TLS.TLSMaxVersion = types.TLSv1_2
-					}, nil)
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-with-tls-listener-cipher-suites",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", nil,
-					func(entry *structs.IngressGatewayConfigEntry) {
-						entry.TLS.Enabled = true
-						entry.TLS.CipherSuites = []types.TLSCipherSuite{
-							types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-							types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-						}
-					}, nil)
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-tls-mixed-listeners",
-			create: proxycfg.TestConfigSnapshotIngressGateway_MixedListeners,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-tls-min-version-listeners-gateway-defaults",
-			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMinVersionListenersGatewayDefaults,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-single-tls-listener",
-			create: proxycfg.TestConfigSnapshotIngressGateway_SingleTLSListener,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-tls-mixed-min-version-listeners",
-			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMixedMinVersionListeners,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-tls-mixed-max-version-listeners",
-			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMixedMaxVersionListeners,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-tls-mixed-cipher-suites-listeners",
-			create: proxycfg.TestConfigSnapshotIngressGateway_TLSMixedCipherVersionListeners,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-sds-listener-gw-level",
-			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayLevel,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-sds-listener-listener-level",
-			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayAndListenerLevel,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-sds-listener-gw-level-http",
-			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayAndListenerLevel_HTTP,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-sds-listener-gw-level-mixed-tls",
-			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_GatewayLevel_MixedTLS,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		// TODO: cross reference with ingress-with-sds-service-level and figure out which should stay
-		{
-			name: "ingress-with-sds-service-level-2",
-			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:   "ingress-with-sds-service-level",
-			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_ServiceLevel,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-sds-listener+service-level",
-			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_ListenerAndServiceLevel,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-sds-service-level-mixed-no-tls",
-			create: proxycfg.TestConfigSnapshotIngressGatewaySDS_MixedNoTLS,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-grpc-single-tls-listener",
-			create: proxycfg.TestConfigSnapshotIngressGateway_SingleTLSListener_GRPC,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-http2-single-tls-listener",
-			create: proxycfg.TestConfigSnapshotIngressGateway_SingleTLSListener_HTTP2,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "ingress-with-http2-and-grpc-multiple-tls-listener",
-			create: proxycfg.TestConfigSnapshotIngressGateway_GWTLSListener_MixedHTTP2gRPC,
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-		{
-			name: "ingress-gateway-bind-addrs",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshotIngressGateway(t, true, "tcp", "default", func(ns *structs.NodeService) {
-					//
-					ns.TaggedAddresses = map[string]structs.ServiceAddress{
-						"lan": {Address: "10.0.0.1"},
-						"wan": {Address: "172.16.0.1"},
-					}
-					ns.Proxy.Config = map[string]interface{}{
-						"envoy_gateway_no_default_bind":       true,
-						"envoy_gateway_bind_tagged_addresses": true,
-						"envoy_gateway_bind_addresses": map[string]structs.ServiceAddress{
-							"foo": {Address: "8.8.8.8"},
-						},
-					}
-				}, nil, nil)
-			},
-			// TODO(proxystate): ingress gateway will come at a later time
-			alsoRunTestForV2: false,
-		},
-	}
-}
-
-func getAccessLogsGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			name: "access-logs-defaults",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					// This should be passed into the snapshot through proxy-defaults
-					ns.Proxy.AccessLogs = structs.AccessLogsConfig{
-						Enabled: true,
-					}
-				},
-					nil)
-			},
-		},
-		{
-			name: "access-logs-json-file",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					// This should be passed into the snapshot through proxy-defaults
-					ns.Proxy.AccessLogs = structs.AccessLogsConfig{
-						Enabled:    true,
-						Type:       structs.FileLogSinkType,
-						Path:       "/tmp/accesslog.txt",
-						JSONFormat: "{ \"custom_start_time\": \"%START_TIME%\" }",
-					}
-				},
-					nil)
-			},
-		},
-		{
-			name: "access-logs-text-stderr-disablelistenerlogs",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, func(ns *structs.NodeService) {
-					// This should be passed into the snapshot through proxy-defaults
-					ns.Proxy.AccessLogs = structs.AccessLogsConfig{
-						Enabled:             true,
-						DisableListenerLogs: true,
-						Type:                structs.StdErrLogSinkType,
-						TextFormat:          "CUSTOM FORMAT %START_TIME%",
-					}
-				},
-					nil)
-			},
-		},
-	}
-}
-
-func getTLSGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			name: "connect-proxy-with-tls-outgoing-min-version-auto",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Outgoing: &structs.MeshDirectionalTLSConfig{
-										TLSMinVersion: types.TLSVersionAuto,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-tls-outgoing-min-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Outgoing: &structs.MeshDirectionalTLSConfig{
-										TLSMinVersion: types.TLSv1_3,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-tls-outgoing-max-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Outgoing: &structs.MeshDirectionalTLSConfig{
-										TLSMaxVersion: types.TLSv1_2,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-tls-outgoing-cipher-suites",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Outgoing: &structs.MeshDirectionalTLSConfig{
-										CipherSuites: []types.TLSCipherSuite{
-											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-										},
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-tls-incoming-min-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Incoming: &structs.MeshDirectionalTLSConfig{
-										TLSMinVersion: types.TLSv1_3,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-tls-incoming-max-version",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Incoming: &structs.MeshDirectionalTLSConfig{
-										TLSMaxVersion: types.TLSv1_2,
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			name: "connect-proxy-with-tls-incoming-cipher-suites",
-			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
-				return proxycfg.TestConfigSnapshot(t, nil, []proxycfg.UpdateEvent{
-					{
-						CorrelationID: "mesh",
-						Result: &structs.ConfigEntryResponse{
-							Entry: &structs.MeshConfigEntry{
-								TLS: &structs.MeshTLSConfig{
-									Incoming: &structs.MeshDirectionalTLSConfig{
-										CipherSuites: []types.TLSCipherSuite{
-											types.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-											types.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
-										},
-									},
-								},
-							},
-						},
-					},
-				})
-			},
-			alsoRunTestForV2: true,
-		},
-		{
-			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,
-		},
-	}
-}
-
-func getPeeredGoldenTestCases() []goldenTestCase {
-	return []goldenTestCase{
-		{
-			name:   "connect-proxy-with-peered-upstreams",
-			create: proxycfg.TestConfigSnapshotPeering,
-			// TODO(proxystate): peering will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "connect-proxy-with-peered-upstreams-escape-overrides",
-			create: proxycfg.TestConfigSnapshotPeeringWithEscapeOverrides,
-			// TODO(proxystate): peering will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "connect-proxy-with-peered-upstreams-http2",
-			create: proxycfg.TestConfigSnapshotPeeringWithHTTP2,
-			// TODO(proxystate): peering will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "transparent-proxy-with-peered-upstreams",
-			create: proxycfg.TestConfigSnapshotPeeringTProxy,
-			// TODO(proxystate): peering will come at a later date.
-			alsoRunTestForV2: false,
-		},
-		{
-			name:   "local-mesh-gateway-with-peered-upstreams",
-			create: proxycfg.TestConfigSnapshotPeeringLocalMeshGateway,
-			// TODO(proxystate): mesh gateways and peering will come at a later date.
-			alsoRunTestForV2: false,
 		},
 	}
 }
diff --git a/agent/xds/routes.go b/agent/xds/routes.go
index d4e289e033785..6ef5b470905c7 100644
--- a/agent/xds/routes.go
+++ b/agent/xds/routes.go
@@ -61,11 +61,6 @@ func (s *ResourceGenerator) routesForConnectProxy(cfgSnap *proxycfg.ConfigSnapsh
 			continue
 		}
 
-		if !structs.IsProtocolHTTPLike(chain.Protocol) {
-			// Routes can only be defined for HTTP services
-			continue
-		}
-
 		virtualHost, err := s.makeUpstreamRouteForDiscoveryChain(cfgSnap, uid, chain, []string{"*"}, false, perRouteFilterBuilder{})
 		if err != nil {
 			return nil, err
@@ -445,6 +440,8 @@ func (s *ResourceGenerator) routesForAPIGateway(cfgSnap *proxycfg.ConfigSnapshot
 	readyListeners := getReadyListeners(cfgSnap)
 	listenerNames := maps.Keys(readyListeners)
 	sort.Strings(listenerNames)
+
+	// Iterate over all listeners that are ready and configure their routes.
 	for _, listenerName := range listenerNames {
 		readyListener, ok := readyListeners[listenerName]
 		if !ok {
@@ -486,6 +483,7 @@ func (s *ResourceGenerator) routesForAPIGateway(cfgSnap *proxycfg.ConfigSnapshot
 				continue
 			}
 
+			consolidatedRoute := consolidatedRoute // Reassignment to avoid closure issues with the loop variable.
 			domains := generateUpstreamAPIsDomains(readyListener.listenerKey, upstream, consolidatedRoute.Hostnames)
 
 			filterBuilder := perRouteFilterBuilder{providerMap: cfgSnap.JWTProviders, listener: &readyListener.listenerCfg, route: &consolidatedRoute}
diff --git a/agent/xds/routes_test.go b/agent/xds/routes_test.go
index eff0e32ad1b89..eda10f2234667 100644
--- a/agent/xds/routes_test.go
+++ b/agent/xds/routes_test.go
@@ -4,16 +4,403 @@
 package xds
 
 import (
+	"path/filepath"
+	"sort"
 	"testing"
 	"time"
 
 	envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
+	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"
 )
 
+type routeTestCase struct {
+	name               string
+	create             func(t testinf.T) *proxycfg.ConfigSnapshot
+	overrideGoldenName string
+	alsoRunTestForV2   bool
+}
+
+func makeRouteDiscoChainTests(enterprise bool) []routeTestCase {
+	return []routeTestCase{
+		{
+			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-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,
+		},
+	}
+}
+
+func TestRoutesFromSnapshot(t *testing.T) {
+	// TODO: we should move all of these to TestAllResourcesFromSnapshot
+	// eventually to test all of the xDS types at once with the same input,
+	// just as it would be triggered by our xDS server.
+	if testing.Short() {
+		t.Skip("too slow for testing.Short")
+	}
+
+	tests := []routeTestCase{
+		// TODO(rb): test match stanza skipped for grpc
+		// Start ingress gateway test cases
+		{
+			name: "ingress-config-entry-nil",
+			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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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",
+			create: func(t testinf.T) *proxycfg.ConfigSnapshot {
+				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)
+			},
+		},
+	}
+
+	tests = append(tests, makeRouteDiscoChainTests(false)...)
+
+	latestEnvoyVersion := xdscommon.EnvoyVersions[0]
+	for _, envoyVersion := range xdscommon.EnvoyVersions {
+		sf, err := xdscommon.DetermineSupportedProxyFeaturesFromString(envoyVersion)
+		require.NoError(t, err)
+		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)
+
+					// We need to replace the TLS certs with deterministic ones to make golden
+					// files workable. Note we don't update these otherwise they'd change
+					// golden files for every test case and so not be any use!
+					testcommon.SetupTLSRootsAndLeaf(t, snap)
+
+					g := NewResourceGenerator(testutil.Logger(t), nil, false)
+					g.ProxyFeatures = sf
+
+					routes, err := g.routesFromSnapshot(snap)
+					require.NoError(t, err)
+
+					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)
+					require.NoError(t, err)
+
+					t.Run("current-xdsv1", func(t *testing.T) {
+						gotJSON := protoToJSON(t, r)
+
+						gName := tt.name
+						if tt.overrideGoldenName != "" {
+							gName = tt.overrideGoldenName
+						}
+
+						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)
+						})
+					}
+				})
+			}
+		})
+	}
+}
+
 func TestEnvoyLBConfig_InjectToRouteAction(t *testing.T) {
 	var tests = []struct {
 		name     string
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
index 8b919343d21a9..63ede4b9ebe1e 100644
--- 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
@@ -1,5 +1,32 @@
 {
   "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/clusters/access-logs-defaults.latest.golden b/agent/xds/testdata/clusters/access-logs-defaults.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/access-logs-defaults.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/access-logs-json-file.latest.golden b/agent/xds/testdata/clusters/access-logs-json-file.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/access-logs-json-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/clusters/access-logs-text-stderr-disablelistenerlogs.latest.golden b/agent/xds/testdata/clusters/access-logs-text-stderr-disablelistenerlogs.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/access-logs-text-stderr-disablelistenerlogs.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/api-gateway-http-listener-with-http-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-http-listener-with-http-route.latest.golden
deleted file mode 100644
index a03e0e29fc3ab..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-http-listener-with-http-route.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "http-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "http-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/http-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": "http-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-http-listener.latest.golden b/agent/xds/testdata/clusters/api-gateway-http-listener.latest.golden
deleted file mode 100644
index 04106b67f20ad..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-http-listener.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "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-nil-config-entry.latest.golden b/agent/xds/testdata/clusters/api-gateway-nil-config-entry.latest.golden
deleted file mode 100644
index 04106b67f20ad..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-nil-config-entry.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "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-tcp-listener-with-tcp-and-http-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
deleted file mode 100644
index 83c3cae4e875a..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "http-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "http-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/http-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": "http-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "tcp-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "tcp-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/tcp-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": "tcp-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-tcp-listener-with-tcp-route.latest.golden b/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-route.latest.golden
deleted file mode 100644
index c1a9d880f9144..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-tcp-listener-with-tcp-route.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "tcp-service.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "tcp-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/tcp-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": "tcp-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-tcp-listener.latest.golden b/agent/xds/testdata/clusters/api-gateway-tcp-listener.latest.golden
deleted file mode 100644
index 04106b67f20ad..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-tcp-listener.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "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-hostnames.latest.golden b/agent/xds/testdata/clusters/api-gateway-with-multiple-hostnames.latest.golden
deleted file mode 100644
index 216574da828df..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway-with-multiple-hostnames.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "backend.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "backend.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/backend"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "backend.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "frontend.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "frontend.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/frontend"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "frontend.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.latest.golden b/agent/xds/testdata/clusters/api-gateway.latest.golden
deleted file mode 100644
index 04106b67f20ad..0000000000000
--- a/agent/xds/testdata/clusters/api-gateway.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "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-resolver-with-lb.latest.golden b/agent/xds/testdata/clusters/connect-proxy-resolver-with-lb.latest.golden
deleted file mode 100644
index ff832d784bcb0..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-resolver-with-lb.latest.golden
+++ /dev/null
@@ -1,132 +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"
-        }
-      },
-      "lbPolicy": "RING_HASH",
-      "name": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "ringHashLbConfig": {
-        "maximumRingSize": "30",
-        "minimumRingSize": "20"
-      },
-      "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-route-to-lb-resolver.latest.golden b/agent/xds/testdata/clusters/connect-proxy-route-to-lb-resolver.latest.golden
deleted file mode 100644
index 4235b653fabfe..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-route-to-lb-resolver.latest.golden
+++ /dev/null
@@ -1,180 +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",
-      "altStatName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "lbPolicy": "RING_HASH",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "ringHashLbConfig": {
-        "maximumRingSize": "30",
-        "minimumRingSize": "20"
-      },
-      "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/web"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "web.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/connect-proxy-splitter-overweight.latest.golden b/agent/xds/testdata/clusters/connect-proxy-splitter-overweight.latest.golden
deleted file mode 100644
index 4f4e0d2144af1..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-splitter-overweight.latest.golden
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "big-side.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/big-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "big-side.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",
-      "altStatName": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "goldilocks-side.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/goldilocks-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "lil-bit-side.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/lil-bit-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "lil-bit-side.default.dc1.internal.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-upstream-defaults.latest.golden b/agent/xds/testdata/clusters/connect-proxy-upstream-defaults.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-upstream-defaults.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-chain-and-router.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden
deleted file mode 100644
index 013e86137f282..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-router.latest.golden
+++ /dev/null
@@ -1,1519 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "big-side.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/big-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@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"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "empty-match-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "empty-match-1.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/empty-match-1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "empty-match-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "empty-match-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "empty-match-2.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/empty-match-2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "empty-match-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "exact.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/exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "exact.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",
-      "altStatName": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "goldilocks-side.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/goldilocks-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-exact-with-method.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/hdr-exact-with-method"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-exact.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/hdr-exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-not-present.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/hdr-not-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-prefix.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/hdr-prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-present.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/hdr-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-regex.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/hdr-regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-suffix.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/hdr-suffix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "header-manip.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/header-manip"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "idle-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "idle-timeout.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/idle-timeout"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "idle-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "just-methods.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/just-methods"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "lil-bit-side.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/lil-bit-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "lil-bit-side.default.dc1.internal.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": "nil-match.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "nil-match.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/nil-match"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "nil-match.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix-rewrite-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix-rewrite-1.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/prefix-rewrite-1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix-rewrite-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix-rewrite-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix-rewrite-2.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/prefix-rewrite-2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix-rewrite-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix.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/prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-exact.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/prm-exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-present.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/prm-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-regex.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/prm-regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "regex.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/regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "req-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "req-timeout.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/req-timeout"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "req-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-all.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/retry-all"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-codes.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/retry-codes"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-connect.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/retry-connect"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-reset.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-reset.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/retry-reset"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-reset.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/connect-proxy-with-chain-and-splitter.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-splitter.latest.golden
deleted file mode 100644
index 4f4e0d2144af1..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-splitter.latest.golden
+++ /dev/null
@@ -1,223 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "big-side.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/big-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "big-side.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",
-      "altStatName": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "goldilocks-side.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/goldilocks-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "lil-bit-side.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/lil-bit-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "lil-bit-side.default.dc1.internal.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-default-chain-and-custom-cluster.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
deleted file mode 100644
index 8ec7314419f19..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
+++ /dev/null
@@ -1,133 +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",
-      "connectTimeout": "15s",
-      "loadAssignment": {
-        "clusterName": "myservice",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 8080
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "name": "myservice",
-      "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"
-        }
-      }
-    }
-  ],
-  "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-grpc-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-grpc-chain.latest.golden
deleted file mode 100644
index f03d8c0ffcc9a..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-grpc-chain.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-grpc-router.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-grpc-router.latest.golden
deleted file mode 100644
index a594d0b7cee3f..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-grpc-router.latest.golden
+++ /dev/null
@@ -1,191 +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"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix.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/prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix.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": {}
-          }
-        }
-      }
-    }
-  ],
-  "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-http-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-http-chain.latest.golden
deleted file mode 100644
index 69904e61ca163..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-http-chain.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": "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"
-    },
-    {
-      "@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-http2-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-http2-chain.latest.golden
deleted file mode 100644
index f03d8c0ffcc9a..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-http2-chain.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-tcp-chain.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain.latest.golden
deleted file mode 100644
index 69904e61ca163..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain.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": "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"
-    },
-    {
-      "@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-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-cipher-suites.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-tls-incoming-max-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-max-version.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-tls-incoming-min-version.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-tls-incoming-min-version.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-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/clusters/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index c8d1eb2d356d3..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden
+++ /dev/null
@@ -1,134 +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",
-      "connectTimeout": "5s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "original-destination",
-      "type": "ORIGINAL_DST"
-    }
-  ],
-  "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-without-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/clusters/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/connect-proxy-without-tproxy-and-permissive-mtls.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/custom-public-listener-http-2.latest.golden b/agent/xds/testdata/clusters/custom-public-listener-http-2.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/custom-public-listener-http-2.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/custom-public-listener-http-missing.latest.golden b/agent/xds/testdata/clusters/custom-public-listener-http-missing.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/custom-public-listener-http-missing.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/custom-public-listener-http.latest.golden b/agent/xds/testdata/clusters/custom-public-listener-http.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/custom-public-listener-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/clusters/custom-public-listener.latest.golden b/agent/xds/testdata/clusters/custom-public-listener.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/custom-public-listener.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/custom-trace-listener.latest.golden b/agent/xds/testdata/clusters/custom-trace-listener.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/custom-trace-listener.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/custom-upstream-ignored-with-disco-chain.latest.golden b/agent/xds/testdata/clusters/custom-upstream-ignored-with-disco-chain.latest.golden
deleted file mode 100644
index a6c7b69749e67..0000000000000
--- a/agent/xds/testdata/clusters/custom-upstream-ignored-with-disco-chain.latest.golden
+++ /dev/null
@@ -1,192 +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"
-    },
-    {
-      "@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": {},
-      "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": {},
-      "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/clusters/expose-checks-grpc.latest.golden b/agent/xds/testdata/clusters/expose-checks-grpc.latest.golden
deleted file mode 100644
index 0c94321dbb68b..0000000000000
--- a/agent/xds/testdata/clusters/expose-checks-grpc.latest.golden
+++ /dev/null
@@ -1,65 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "loadAssignment": {
-        "clusterName": "exposed_cluster_9090",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "127.0.0.1",
-                      "portValue": 9090
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "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": {}
-          }
-        }
-      }
-    },
-    {
-      "@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-checks-http-with-bind-override.latest.golden b/agent/xds/testdata/clusters/expose-checks-http-with-bind-override.latest.golden
deleted file mode 100644
index 59d8b46b80e29..0000000000000
--- a/agent/xds/testdata/clusters/expose-checks-http-with-bind-override.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-checks-http.latest.golden b/agent/xds/testdata/clusters/expose-checks-http.latest.golden
deleted file mode 100644
index 59d8b46b80e29..0000000000000
--- a/agent/xds/testdata/clusters/expose-checks-http.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/grpc-public-listener.latest.golden b/agent/xds/testdata/clusters/grpc-public-listener.latest.golden
deleted file mode 100644
index a5bb1cfdea55f..0000000000000
--- a/agent/xds/testdata/clusters/grpc-public-listener.latest.golden
+++ /dev/null
@@ -1,136 +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",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "useDownstreamProtocolConfig": {
-            "http2ProtocolOptions": {},
-            "httpProtocolOptions": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/clusters/http-listener-with-timeouts.latest.golden
deleted file mode 100644
index 688adfb4c5698..0000000000000
--- a/agent/xds/testdata/clusters/http-listener-with-timeouts.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": "1.234s",
-      "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/http-public-listener-no-xfcc.latest.golden b/agent/xds/testdata/clusters/http-public-listener-no-xfcc.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/http-public-listener-no-xfcc.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/http-public-listener.latest.golden b/agent/xds/testdata/clusters/http-public-listener.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/http-public-listener.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/http-upstream.latest.golden b/agent/xds/testdata/clusters/http-upstream.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/http-upstream.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/http2-public-listener.latest.golden b/agent/xds/testdata/clusters/http2-public-listener.latest.golden
deleted file mode 100644
index a5bb1cfdea55f..0000000000000
--- a/agent/xds/testdata/clusters/http2-public-listener.latest.golden
+++ /dev/null
@@ -1,136 +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",
-      "typedExtensionProtocolOptions": {
-        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
-          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
-          "useDownstreamProtocolConfig": {
-            "http2ProtocolOptions": {},
-            "httpProtocolOptions": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-config-entry-nil.latest.golden b/agent/xds/testdata/clusters/ingress-config-entry-nil.latest.golden
deleted file mode 100644
index 04106b67f20ad..0000000000000
--- a/agent/xds/testdata/clusters/ingress-config-entry-nil.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-defaults-no-chain.latest.golden b/agent/xds/testdata/clusters/ingress-defaults-no-chain.latest.golden
deleted file mode 100644
index 04106b67f20ad..0000000000000
--- a/agent/xds/testdata/clusters/ingress-defaults-no-chain.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-gateway-bind-addrs.latest.golden b/agent/xds/testdata/clusters/ingress-gateway-bind-addrs.latest.golden
deleted file mode 100644
index 699ed14e9cc25..0000000000000
--- a/agent/xds/testdata/clusters/ingress-gateway-bind-addrs.latest.golden
+++ /dev/null
@@ -1,55 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/clusters/ingress-grpc-multiple-services.latest.golden
deleted file mode 100644
index 6fad08d9c3b2f..0000000000000
--- a/agent/xds/testdata/clusters/ingress-grpc-multiple-services.latest.golden
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "bar.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/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",
-      "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",
-      "altStatName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "foo.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/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",
-      "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/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/clusters/ingress-http-multiple-services.latest.golden
deleted file mode 100644
index f4ba7f1802db1..0000000000000
--- a/agent/xds/testdata/clusters/ingress-http-multiple-services.latest.golden
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "bar.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/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",
-      "altStatName": "baz.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "baz.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/baz"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "baz.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "foo.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/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",
-      "altStatName": "qux.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "qux.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/qux"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "qux.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/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-router-header-manip.latest.golden
deleted file mode 100644
index 284cbeb37ce6b..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-chain-and-router-header-manip.latest.golden
+++ /dev/null
@@ -1,1447 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "big-side.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/big-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@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"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "empty-match-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "empty-match-1.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/empty-match-1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "empty-match-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "empty-match-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "empty-match-2.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/empty-match-2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "empty-match-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "exact.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/exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "goldilocks-side.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/goldilocks-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-exact-with-method.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/hdr-exact-with-method"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-exact.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/hdr-exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-not-present.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/hdr-not-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-prefix.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/hdr-prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-present.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/hdr-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-regex.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/hdr-regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-suffix.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/hdr-suffix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "header-manip.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/header-manip"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "idle-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "idle-timeout.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/idle-timeout"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "idle-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "just-methods.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/just-methods"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "lil-bit-side.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/lil-bit-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "nil-match.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "nil-match.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/nil-match"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "nil-match.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix-rewrite-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix-rewrite-1.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/prefix-rewrite-1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix-rewrite-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix-rewrite-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix-rewrite-2.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/prefix-rewrite-2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix-rewrite-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix.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/prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-exact.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/prm-exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-present.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/prm-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-regex.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/prm-regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "regex.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/regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "req-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "req-timeout.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/req-timeout"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "req-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-all.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/retry-all"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-codes.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/retry-codes"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-connect.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/retry-connect"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-reset.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-reset.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/retry-reset"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-reset.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/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-router.latest.golden
deleted file mode 100644
index 284cbeb37ce6b..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-chain-and-router.latest.golden
+++ /dev/null
@@ -1,1447 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "big-side.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/big-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@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"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "empty-match-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "empty-match-1.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/empty-match-1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "empty-match-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "empty-match-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "empty-match-2.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/empty-match-2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "empty-match-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "exact.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/exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "goldilocks-side.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/goldilocks-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-exact-with-method.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/hdr-exact-with-method"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-exact-with-method.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-exact.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/hdr-exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-not-present.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/hdr-not-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-not-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-prefix.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/hdr-prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-present.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/hdr-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-regex.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/hdr-regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "hdr-suffix.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/hdr-suffix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "hdr-suffix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "header-manip.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/header-manip"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "header-manip.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "idle-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "idle-timeout.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/idle-timeout"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "idle-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "just-methods.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/just-methods"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "just-methods.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "lil-bit-side.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/lil-bit-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "nil-match.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "nil-match.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/nil-match"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "nil-match.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix-rewrite-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix-rewrite-1.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/prefix-rewrite-1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix-rewrite-1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix-rewrite-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix-rewrite-2.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/prefix-rewrite-2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix-rewrite-2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix.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/prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-exact.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/prm-exact"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-exact.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-present.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/prm-present"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-present.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prm-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prm-regex.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/prm-regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prm-regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "regex.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/regex"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "regex.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "req-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "req-timeout.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/req-timeout"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "req-timeout.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-all.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/retry-all"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-all.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-codes.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/retry-codes"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-codes.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-connect.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/retry-connect"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-connect.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "retry-reset.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "retry-reset.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/retry-reset"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "retry-reset.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/ingress-with-chain-and-splitter.latest.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-splitter.latest.golden
deleted file mode 100644
index 22df1ec44b2ef..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-chain-and-splitter.latest.golden
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "big-side.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/big-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "big-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "goldilocks-side.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/goldilocks-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "goldilocks-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "lil-bit-side.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "lil-bit-side.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/lil-bit-side"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "lil-bit-side.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/ingress-with-grpc-router.latest.golden b/agent/xds/testdata/clusters/ingress-with-grpc-router.latest.golden
deleted file mode 100644
index 110fab806ef8c..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-grpc-router.latest.golden
+++ /dev/null
@@ -1,103 +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"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "prefix.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "prefix.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/prefix"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "prefix.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/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-grpc-single-tls-listener.latest.golden
deleted file mode 100644
index f1a8500c6c5b1..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-grpc-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.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",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
deleted file mode 100644
index f1a8500c6c5b1..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.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",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-http2-single-tls-listener.latest.golden
deleted file mode 100644
index f1a8500c6c5b1..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-http2-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.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",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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": {}
-          }
-        }
-      }
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener+service-level.latest.golden
deleted file mode 100644
index 8a9c954b9709f..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-listener+service-level.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-http.latest.golden
deleted file mode 100644
index 64347312f9384..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-http.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "http.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "http.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/http"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "http.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/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
deleted file mode 100644
index d168b6488e653..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "insecure.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "insecure.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/insecure"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "insecure.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "secure.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "secure.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/secure"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "secure.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/ingress-with-sds-listener-gw-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level.latest.golden
deleted file mode 100644
index 699ed14e9cc25..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-listener-gw-level.latest.golden
+++ /dev/null
@@ -1,55 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-sds-listener-level-wildcard.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-level-wildcard.latest.golden
deleted file mode 100644
index d8aee80140849..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-listener-level-wildcard.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "foo.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/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",
-      "altStatName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "web.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/web"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "web.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/ingress-with-sds-listener-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-level.latest.golden
deleted file mode 100644
index d8aee80140849..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-listener-level.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "foo.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/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",
-      "altStatName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "web.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/web"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "web.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/ingress-with-sds-listener-listener-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-listener-listener-level.latest.golden
deleted file mode 100644
index 699ed14e9cc25..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-listener-listener-level.latest.golden
+++ /dev/null
@@ -1,55 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-sds-service-level-2.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level-2.latest.golden
deleted file mode 100644
index d8aee80140849..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-service-level-2.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "foo.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/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",
-      "altStatName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "web.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/web"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "web.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/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-no-tls.latest.golden
deleted file mode 100644
index 8a9c954b9709f..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-no-tls.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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/ingress-with-sds-service-level-mixed-tls.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-tls.latest.golden
deleted file mode 100644
index d8aee80140849..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-service-level-mixed-tls.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "foo.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/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",
-      "altStatName": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "22s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "web.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/web"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "web.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/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/clusters/ingress-with-sds-service-level.latest.golden
deleted file mode 100644
index 8a9c954b9709f..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-sds-service-level.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-single-tls-listener.latest.golden
deleted file mode 100644
index 8a9c954b9709f..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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/ingress-with-tls-listener-cipher-suites.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener-cipher-suites.latest.golden
deleted file mode 100644
index 699ed14e9cc25..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-listener-cipher-suites.latest.golden
+++ /dev/null
@@ -1,55 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tls-listener-max-version.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener-max-version.latest.golden
deleted file mode 100644
index 699ed14e9cc25..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-listener-max-version.latest.golden
+++ /dev/null
@@ -1,55 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tls-listener-min-version.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener-min-version.latest.golden
deleted file mode 100644
index 699ed14e9cc25..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-listener-min-version.latest.golden
+++ /dev/null
@@ -1,55 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tls-listener.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-listener.latest.golden
deleted file mode 100644
index 699ed14e9cc25..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-listener.latest.golden
+++ /dev/null
@@ -1,55 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
deleted file mode 100644
index e911eee75ce88..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
+++ /dev/null
@@ -1,199 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s3.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s3.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/s3"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s3.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s4.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s4.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/s4"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s4.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/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
deleted file mode 100644
index 8a9c954b9709f..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-listeners.latest.golden
deleted file mode 100644
index 8a9c954b9709f..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-listeners.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.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/ingress-with-tls-mixed-max-version-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-max-version-listeners.latest.golden
deleted file mode 100644
index 4773f59818994..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-max-version-listeners.latest.golden
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s3.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s3.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/s3"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s3.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/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/clusters/ingress-with-tls-mixed-min-version-listeners.latest.golden
deleted file mode 100644
index 4773f59818994..0000000000000
--- a/agent/xds/testdata/clusters/ingress-with-tls-mixed-min-version-listeners.latest.golden
+++ /dev/null
@@ -1,151 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s1.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/s1"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s2.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/s2"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "altStatName": "s3.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "s3.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/s3"
-                }
-              ],
-              "trustedCa": {
-                "inlineString": "-----BEGIN CERTIFICATE-----\nMIICXDCCAgKgAwIBAgIICpZq70Z9LyUwCgYIKoZIzj0EAwIwFDESMBAGA1UEAxMJ\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": "s3.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/listener-balance-inbound-connections.latest.golden b/agent/xds/testdata/clusters/listener-balance-inbound-connections.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/listener-balance-inbound-connections.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/listener-balance-outbound-connections-bind-port.latest.golden b/agent/xds/testdata/clusters/listener-balance-outbound-connections-bind-port.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/listener-balance-outbound-connections-bind-port.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/listener-bind-address-port.latest.golden b/agent/xds/testdata/clusters/listener-bind-address-port.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/listener-bind-address-port.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/listener-bind-address.latest.golden b/agent/xds/testdata/clusters/listener-bind-address.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/listener-bind-address.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/listener-bind-port.latest.golden b/agent/xds/testdata/clusters/listener-bind-port.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/listener-bind-port.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/listener-max-inbound-connections.latest.golden b/agent/xds/testdata/clusters/listener-max-inbound-connections.latest.golden
deleted file mode 100644
index e7bd10da000cc..0000000000000
--- a/agent/xds/testdata/clusters/listener-max-inbound-connections.latest.golden
+++ /dev/null
@@ -1,134 +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",
-      "circuitBreakers": {
-        "thresholds": [
-          {
-            "maxConnections": 222
-          }
-        ]
-      },
-      "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/listener-unix-domain-socket.latest.golden b/agent/xds/testdata/clusters/listener-unix-domain-socket.latest.golden
deleted file mode 100644
index 5a25e882ab312..0000000000000
--- a/agent/xds/testdata/clusters/listener-unix-domain-socket.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/mesh-gateway-custom-addresses.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-custom-addresses.latest.golden
deleted file mode 100644
index caa140aac2d50..0000000000000
--- a/agent/xds/testdata/clusters/mesh-gateway-custom-addresses.latest.golden
+++ /dev/null
@@ -1,106 +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"
-    }
-  ],
-  "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-default-service-subset.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-default-service-subset.latest.golden
deleted file mode 100644
index fb63679d49ba7..0000000000000
--- a/agent/xds/testdata/clusters/mesh-gateway-default-service-subset.latest.golden
+++ /dev/null
@@ -1,158 +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": "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",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "v1.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": "v2.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": "v2.foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "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/mesh-gateway-newer-information-in-federation-states.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-newer-information-in-federation-states.latest.golden
deleted file mode 100644
index caa140aac2d50..0000000000000
--- a/agent/xds/testdata/clusters/mesh-gateway-newer-information-in-federation-states.latest.golden
+++ /dev/null
@@ -1,106 +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"
-    }
-  ],
-  "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-older-information-in-federation-states.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-older-information-in-federation-states.latest.golden
deleted file mode 100644
index caa140aac2d50..0000000000000
--- a/agent/xds/testdata/clusters/mesh-gateway-older-information-in-federation-states.latest.golden
+++ /dev/null
@@ -1,106 +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"
-    }
-  ],
-  "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-service-subsets2.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets2.latest.golden
deleted file mode 100644
index fb63679d49ba7..0000000000000
--- a/agent/xds/testdata/clusters/mesh-gateway-service-subsets2.latest.golden
+++ /dev/null
@@ -1,158 +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": "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",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "v1.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": "v2.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": "v2.foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "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/mesh-gateway-tagged-addresses.latest.golden b/agent/xds/testdata/clusters/mesh-gateway-tagged-addresses.latest.golden
deleted file mode 100644
index caa140aac2d50..0000000000000
--- a/agent/xds/testdata/clusters/mesh-gateway-tagged-addresses.latest.golden
+++ /dev/null
@@ -1,106 +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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-custom-and-tagged-addresses.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-custom-and-tagged-addresses.latest.golden
deleted file mode 100644
index 07cf25087bd1c..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-custom-and-tagged-addresses.latest.golden
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-custom-trace-listener.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-custom-trace-listener.latest.golden
deleted file mode 100644
index 07cf25087bd1c..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-custom-trace-listener.latest.golden
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-default-service-subset.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-default-service-subset.latest.golden
deleted file mode 100644
index 067195261be88..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-default-service-subset.latest.golden
+++ /dev/null
@@ -1,202 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "v1.web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "v2.web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-lb-config-no-hash-policies.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config-no-hash-policies.latest.golden
deleted file mode 100644
index 2820af6f1e977..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-lb-config-no-hash-policies.latest.golden
+++ /dev/null
@@ -1,217 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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"
-        }
-      },
-      "lbPolicy": "RING_HASH",
-      "name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "ringHashLbConfig": {
-        "maximumRingSize": "50",
-        "minimumRingSize": "20"
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "lbPolicy": "RING_HASH",
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "ringHashLbConfig": {
-        "maximumRingSize": "50",
-        "minimumRingSize": "20"
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "type": "EDS"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "lbPolicy": "RING_HASH",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "outlierDetection": {},
-      "ringHashLbConfig": {
-        "maximumRingSize": "50",
-        "minimumRingSize": "20"
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-no-api-cert.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-no-api-cert.latest.golden
deleted file mode 100644
index 07cf25087bd1c..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-no-api-cert.latest.golden
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-with-peer-trust-bundle.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-with-peer-trust-bundle.latest.golden
deleted file mode 100644
index 07cf25087bd1c..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-with-peer-trust-bundle.latest.golden
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index 07cf25087bd1c..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index 07cf25087bd1c..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-with-tls-incoming-max-version.latest.golden
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/terminating-gateway-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/clusters/terminating-gateway-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index 07cf25087bd1c..0000000000000
--- a/agent/xds/testdata/clusters/terminating-gateway-with-tls-incoming-min-version.latest.golden
+++ /dev/null
@@ -1,148 +0,0 @@
-{
-  "nonce": "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "api.altdomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "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": [
-              {
-                "certificateChain": {
-                  "filename": "api.cert.pem"
-                },
-                "privateKey": {
-                  "filename": "api.key.pem"
-                }
-              }
-            ],
-            "tlsParams": {},
-            "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": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "cache.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "HEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "cache.default.dc1.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": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-        "endpoints": [
-          {
-            "lbEndpoints": [
-              {
-                "endpoint": {
-                  "address": {
-                    "socketAddress": {
-                      "address": "db.mydomain",
-                      "portValue": 8081
-                    }
-                  }
-                },
-                "healthStatus": "UNHEALTHY",
-                "loadBalancingWeight": 1
-              }
-            ]
-          }
-        ]
-      },
-      "name": "db.default.dc1.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": "web.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": {},
-            "validationContext": {
-              "trustedCa": {
-                "filename": "ca.cert.pem"
-              }
-            }
-          }
-        }
-      },
-      "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/transparent-proxy-http-upstream.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-http-upstream.latest.golden
deleted file mode 100644
index fdc8e773170d0..0000000000000
--- a/agent/xds/testdata/clusters/transparent-proxy-http-upstream.latest.golden
+++ /dev/null
@@ -1,230 +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",
-      "altStatName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "google.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/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",
-      "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": "no-endpoints.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "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": [
-              {
-                "certificateChain": {
-                  "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/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"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway.latest.golden
deleted file mode 100644
index 2b3ceabc61b71..0000000000000
--- a/agent/xds/testdata/clusters/transparent-proxy-terminating-gateway.latest.golden
+++ /dev/null
@@ -1,223 +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",
-      "altStatName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "google.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/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",
-      "altStatName": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "kafka.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/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",
-      "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/transparent-proxy-with-resolver-redirect-upstream.latest.golden b/agent/xds/testdata/clusters/transparent-proxy-with-resolver-redirect-upstream.latest.golden
deleted file mode 100644
index bf459c9ad9855..0000000000000
--- a/agent/xds/testdata/clusters/transparent-proxy-with-resolver-redirect-upstream.latest.golden
+++ /dev/null
@@ -1,182 +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",
-      "altStatName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "circuitBreakers": {},
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "connectTimeout": "5s",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "name": "google.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/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",
-      "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": "5s",
-      "lbPolicy": "CLUSTER_PROVIDED",
-      "name": "original-destination",
-      "type": "ORIGINAL_DST"
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/access-logs-defaults.latest.golden b/agent/xds/testdata/endpoints/access-logs-defaults.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/access-logs-defaults.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/endpoints/access-logs-json-file.latest.golden b/agent/xds/testdata/endpoints/access-logs-json-file.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/access-logs-json-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/endpoints/access-logs-text-stderr-disablelistenerlogs.latest.golden b/agent/xds/testdata/endpoints/access-logs-text-stderr-disablelistenerlogs.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/access-logs-text-stderr-disablelistenerlogs.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/endpoints/api-gateway-http-listener-with-http-route.latest.golden b/agent/xds/testdata/endpoints/api-gateway-http-listener-with-http-route.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-http-listener-with-http-route.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-http-listener.latest.golden b/agent/xds/testdata/endpoints/api-gateway-http-listener.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-http-listener.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-nil-config-entry.latest.golden b/agent/xds/testdata/endpoints/api-gateway-nil-config-entry.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-nil-config-entry.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-tcp-listener-with-tcp-and-http-route.latest.golden b/agent/xds/testdata/endpoints/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-tcp-listener-with-tcp-and-http-route.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-tcp-listener-with-tcp-route.latest.golden b/agent/xds/testdata/endpoints/api-gateway-tcp-listener-with-tcp-route.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-tcp-listener-with-tcp-route.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-tcp-listener.latest.golden b/agent/xds/testdata/endpoints/api-gateway-tcp-listener.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-tcp-listener.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-multiple-hostnames.latest.golden b/agent/xds/testdata/endpoints/api-gateway-with-multiple-hostnames.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway-with-multiple-hostnames.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.latest.golden b/agent/xds/testdata/endpoints/api-gateway.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/api-gateway.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/connect-proxy-lb-in-resolver.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-lb-in-resolver.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-lb-in-resolver.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/endpoints/connect-proxy-resolver-with-lb.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-resolver-with-lb.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-resolver-with-lb.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/endpoints/connect-proxy-route-to-lb-resolver.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-route-to-lb-resolver.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-route-to-lb-resolver.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/endpoints/connect-proxy-splitter-overweight.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-splitter-overweight.latest.golden
deleted file mode 100644
index fde7857a2ebd8..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-splitter-overweight.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "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-upstream-defaults.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-upstream-defaults.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-upstream-defaults.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/endpoints/connect-proxy-with-chain-and-router.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-router.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-router.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/endpoints/connect-proxy-with-chain-and-splitter.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-splitter.latest.golden
deleted file mode 100644
index fde7857a2ebd8..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-splitter.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "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-chain-http2.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-http2.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-chain-http2.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/endpoints/connect-proxy-with-grpc-chain.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-grpc-chain.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-grpc-chain.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/endpoints/connect-proxy-with-grpc-router.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-grpc-router.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-grpc-router.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/endpoints/connect-proxy-with-http-chain.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-http-chain.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-http-chain.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/endpoints/connect-proxy-with-http2-chain.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-http2-chain.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-http2-chain.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/endpoints/connect-proxy-with-jwt-config-entry-with-local.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-jwt-config-entry-with-local.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-jwt-config-entry-with-local.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/endpoints/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-jwt-config-entry-with-remote-jwks.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/endpoints/connect-proxy-with-tcp-chain.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain.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/endpoints/connect-proxy-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tls-incoming-cipher-suites.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/endpoints/connect-proxy-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tls-incoming-max-version.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/endpoints/connect-proxy-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tls-incoming-min-version.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/endpoints/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-cipher-suites.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/endpoints/connect-proxy-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-max-version.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/endpoints/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-min-version-auto.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/endpoints/connect-proxy-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tls-outgoing-min-version.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/endpoints/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-with-tproxy-and-permissive-mtls.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/endpoints/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/endpoints/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/connect-proxy-without-tproxy-and-permissive-mtls.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/endpoints/custom-limits-max-connections-only.latest.golden b/agent/xds/testdata/endpoints/custom-limits-max-connections-only.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-limits-max-connections-only.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/endpoints/custom-limits-set-to-zero.latest.golden b/agent/xds/testdata/endpoints/custom-limits-set-to-zero.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-limits-set-to-zero.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/endpoints/custom-limits.latest.golden b/agent/xds/testdata/endpoints/custom-limits.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-limits.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/endpoints/custom-local-app.latest.golden b/agent/xds/testdata/endpoints/custom-local-app.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-local-app.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/endpoints/custom-max-inbound-connections.latest.golden b/agent/xds/testdata/endpoints/custom-max-inbound-connections.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-max-inbound-connections.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/endpoints/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden b/agent/xds/testdata/endpoints/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-passive-healthcheck-zero-consecutive_5xx.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/endpoints/custom-passive-healthcheck.latest.golden b/agent/xds/testdata/endpoints/custom-passive-healthcheck.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-passive-healthcheck.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/endpoints/custom-public-listener-http-2.latest.golden b/agent/xds/testdata/endpoints/custom-public-listener-http-2.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-public-listener-http-2.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/endpoints/custom-public-listener-http-missing.latest.golden b/agent/xds/testdata/endpoints/custom-public-listener-http-missing.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-public-listener-http-missing.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/endpoints/custom-public-listener-http.latest.golden b/agent/xds/testdata/endpoints/custom-public-listener-http.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-public-listener-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/endpoints/custom-public-listener.latest.golden b/agent/xds/testdata/endpoints/custom-public-listener.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-public-listener.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/endpoints/custom-timeouts.latest.golden b/agent/xds/testdata/endpoints/custom-timeouts.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-timeouts.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/endpoints/custom-trace-listener.latest.golden b/agent/xds/testdata/endpoints/custom-trace-listener.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/custom-trace-listener.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/endpoints/custom-upstream-default-chain.latest.golden b/agent/xds/testdata/endpoints/custom-upstream-default-chain.latest.golden
deleted file mode 100644
index c0d604ae53a7b..0000000000000
--- a/agent/xds/testdata/endpoints/custom-upstream-default-chain.latest.golden
+++ /dev/null
@@ -1,75 +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": "myservice",
-      "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/custom-upstream-ignored-with-disco-chain.latest.golden b/agent/xds/testdata/endpoints/custom-upstream-ignored-with-disco-chain.latest.golden
deleted file mode 100644
index ffaf0a6bae06e..0000000000000
--- a/agent/xds/testdata/endpoints/custom-upstream-ignored-with-disco-chain.latest.golden
+++ /dev/null
@@ -1,109 +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
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@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",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/custom-upstream-with-prepared-query.latest.golden b/agent/xds/testdata/endpoints/custom-upstream-with-prepared-query.latest.golden
deleted file mode 100644
index fde7857a2ebd8..0000000000000
--- a/agent/xds/testdata/endpoints/custom-upstream-with-prepared-query.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/custom-upstream.latest.golden b/agent/xds/testdata/endpoints/custom-upstream.latest.golden
deleted file mode 100644
index c0d604ae53a7b..0000000000000
--- a/agent/xds/testdata/endpoints/custom-upstream.latest.golden
+++ /dev/null
@@ -1,75 +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": "myservice",
-      "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/downstream-service-with-unix-sockets.latest.golden b/agent/xds/testdata/endpoints/downstream-service-with-unix-sockets.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/downstream-service-with-unix-sockets.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/endpoints/expose-checks-grpc.latest.golden b/agent/xds/testdata/endpoints/expose-checks-grpc.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/expose-checks-grpc.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/expose-checks-http-with-bind-override.latest.golden b/agent/xds/testdata/endpoints/expose-checks-http-with-bind-override.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/expose-checks-http-with-bind-override.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/expose-checks-http.latest.golden b/agent/xds/testdata/endpoints/expose-checks-http.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/expose-checks-http.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/expose-checks.latest.golden b/agent/xds/testdata/endpoints/expose-checks.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/expose-checks.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/expose-paths-grpc-new-cluster-http1.latest.golden b/agent/xds/testdata/endpoints/expose-paths-grpc-new-cluster-http1.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/expose-paths-grpc-new-cluster-http1.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/expose-paths-local-app-paths.latest.golden b/agent/xds/testdata/endpoints/expose-paths-local-app-paths.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/expose-paths-local-app-paths.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/expose-paths-new-cluster-http2.latest.golden b/agent/xds/testdata/endpoints/expose-paths-new-cluster-http2.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/expose-paths-new-cluster-http2.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/grpc-public-listener.latest.golden b/agent/xds/testdata/endpoints/grpc-public-listener.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/grpc-public-listener.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/endpoints/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/endpoints/http-listener-with-timeouts.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/http-listener-with-timeouts.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/endpoints/http-public-listener-no-xfcc.latest.golden b/agent/xds/testdata/endpoints/http-public-listener-no-xfcc.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/http-public-listener-no-xfcc.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/endpoints/http-public-listener.latest.golden b/agent/xds/testdata/endpoints/http-public-listener.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/http-public-listener.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/endpoints/http-upstream.latest.golden b/agent/xds/testdata/endpoints/http-upstream.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/http-upstream.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/endpoints/http2-public-listener.latest.golden b/agent/xds/testdata/endpoints/http2-public-listener.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/http2-public-listener.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/endpoints/ingress-config-entry-nil.latest.golden b/agent/xds/testdata/endpoints/ingress-config-entry-nil.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-config-entry-nil.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/ingress-defaults-no-chain.latest.golden b/agent/xds/testdata/endpoints/ingress-defaults-no-chain.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-defaults-no-chain.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/ingress-gateway-bind-addrs.latest.golden b/agent/xds/testdata/endpoints/ingress-gateway-bind-addrs.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-gateway-bind-addrs.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-max-version.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-gateway-with-tls-outgoing-min-version.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/endpoints/ingress-grpc-multiple-services.latest.golden
deleted file mode 100644
index 15a7d2b789ad4..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-grpc-multiple-services.latest.golden
+++ /dev/null
@@ -1,75 +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": "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": "foo.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/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/endpoints/ingress-http-multiple-services.latest.golden
deleted file mode 100644
index a1b8a9153d0a7..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-http-multiple-services.latest.golden
+++ /dev/null
@@ -1,143 +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": "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": "baz.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": "foo.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": "qux.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/ingress-lb-in-resolver.latest.golden b/agent/xds/testdata/endpoints/ingress-lb-in-resolver.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-lb-in-resolver.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-router-header-manip.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-chain-and-router-header-manip.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-router.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-chain-and-router.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-splitter.latest.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-splitter.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-chain-and-splitter.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/ingress-with-defaults-passive-health-check.latest.golden b/agent/xds/testdata/endpoints/ingress-with-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-defaults-passive-health-check.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-defaults-service-max-connections.latest.golden b/agent/xds/testdata/endpoints/ingress-with-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-defaults-service-max-connections.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-grpc-router.latest.golden b/agent/xds/testdata/endpoints/ingress-with-grpc-router.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-grpc-router.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/endpoints/ingress-with-grpc-single-tls-listener.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-grpc-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/endpoints/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/endpoints/ingress-with-http2-single-tls-listener.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-http2-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-overwrite-defaults-passive-health-check.latest.golden b/agent/xds/testdata/endpoints/ingress-with-overwrite-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-overwrite-defaults-passive-health-check.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-overwrite-defaults-service-max-connections.latest.golden b/agent/xds/testdata/endpoints/ingress-with-overwrite-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-overwrite-defaults-service-max-connections.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-listener+service-level.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-listener+service-level.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-listener-gw-level-http.latest.golden
deleted file mode 100644
index 71594fbf1b4ec..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-listener-gw-level-http.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "http.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/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
deleted file mode 100644
index ccf0803dc0c1e..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "insecure.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": "secure.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/ingress-with-sds-listener-gw-level.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-listener-gw-level.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-listener-gw-level.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-sds-listener-level-wildcard.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-listener-level-wildcard.latest.golden
deleted file mode 100644
index 903ff9e17f3c5..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-listener-level-wildcard.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@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": "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": "web.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/ingress-with-sds-listener-level.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-listener-level.latest.golden
deleted file mode 100644
index 903ff9e17f3c5..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-listener-level.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@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": "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": "web.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/ingress-with-sds-listener-listener-level.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-listener-listener-level.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-listener-listener-level.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-sds-service-level-2.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-service-level-2.latest.golden
deleted file mode 100644
index 903ff9e17f3c5..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-service-level-2.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@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": "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": "web.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/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-service-level-mixed-no-tls.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-service-level-mixed-no-tls.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-sds-service-level-mixed-tls.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-service-level-mixed-tls.latest.golden
deleted file mode 100644
index 903ff9e17f3c5..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-service-level-mixed-tls.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@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": "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": "web.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/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/endpoints/ingress-with-sds-service-level.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-sds-service-level.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-service-max-connections.latest.golden b/agent/xds/testdata/endpoints/ingress-with-service-max-connections.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-service-max-connections.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-service-passive-health-check.latest.golden b/agent/xds/testdata/endpoints/ingress-with-service-passive-health-check.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-service-passive-health-check.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/endpoints/ingress-with-single-tls-listener.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-tls-listener-cipher-suites.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-listener-cipher-suites.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-listener-cipher-suites.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tls-listener-max-version.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-listener-max-version.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-listener-max-version.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tls-listener-min-version.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-listener-min-version.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-listener-min-version.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tls-listener.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-listener.latest.golden
deleted file mode 100644
index 2a1b29370b637..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-listener.latest.golden
+++ /dev/null
@@ -1,41 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
deleted file mode 100644
index 29eb4029dd7e6..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
+++ /dev/null
@@ -1,143 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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": "s3.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": "s4.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/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-mixed-listeners.latest.golden
deleted file mode 100644
index c745542ee476f..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-mixed-listeners.latest.golden
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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/ingress-with-tls-mixed-max-version-listeners.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-mixed-max-version-listeners.latest.golden
deleted file mode 100644
index e77e740023ae7..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-mixed-max-version-listeners.latest.golden
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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": "s3.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/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/endpoints/ingress-with-tls-mixed-min-version-listeners.latest.golden
deleted file mode 100644
index e77e740023ae7..0000000000000
--- a/agent/xds/testdata/endpoints/ingress-with-tls-mixed-min-version-listeners.latest.golden
+++ /dev/null
@@ -1,109 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "s1.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": "s2.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": "s3.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/listener-balance-inbound-connections.latest.golden b/agent/xds/testdata/endpoints/listener-balance-inbound-connections.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/listener-balance-inbound-connections.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/endpoints/listener-balance-outbound-connections-bind-port.latest.golden b/agent/xds/testdata/endpoints/listener-balance-outbound-connections-bind-port.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/listener-balance-outbound-connections-bind-port.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/endpoints/listener-bind-address-port.latest.golden b/agent/xds/testdata/endpoints/listener-bind-address-port.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/listener-bind-address-port.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/endpoints/listener-bind-address.latest.golden b/agent/xds/testdata/endpoints/listener-bind-address.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/listener-bind-address.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/endpoints/listener-bind-port.latest.golden b/agent/xds/testdata/endpoints/listener-bind-port.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/listener-bind-port.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/endpoints/listener-max-inbound-connections.latest.golden b/agent/xds/testdata/endpoints/listener-max-inbound-connections.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/listener-max-inbound-connections.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/endpoints/listener-unix-domain-socket.latest.golden b/agent/xds/testdata/endpoints/listener-unix-domain-socket.latest.golden
deleted file mode 100644
index b4372a3439e81..0000000000000
--- a/agent/xds/testdata/endpoints/listener-unix-domain-socket.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/endpoints/mesh-gateway-custom-addresses.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-custom-addresses.latest.golden
deleted file mode 100644
index 4853c9dc932a1..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-custom-addresses.latest.golden
+++ /dev/null
@@ -1,145 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "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-hash-lb-ignored.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-hash-lb-ignored.latest.golden
deleted file mode 100644
index 8600551622112..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-hash-lb-ignored.latest.golden
+++ /dev/null
@@ -1,159 +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": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    }
-  ],
-  "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-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index 7b345547990ad..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-ignore-extra-resolvers.latest.golden
+++ /dev/null
@@ -1,120 +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": [
-        {}
-      ]
-    },
-    {
-      "@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": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    }
-  ],
-  "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-non-hash-lb-injected.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-non-hash-lb-injected.latest.golden
deleted file mode 100644
index 8600551622112..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-non-hash-lb-injected.latest.golden
+++ /dev/null
@@ -1,159 +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": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    }
-  ],
-  "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-service-subsets.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden
index 8600551622112..f4e0c1e258b04 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden
@@ -143,14 +143,124 @@
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
       "clusterName": "v1.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
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName": "v1.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
+            }
+          ]
+        }
       ]
     },
     {
       "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
       "clusterName": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
       "endpoints": [
-        {}
+        {
+          "lbEndpoints": [
+            {
+              "endpoint": {
+                "address": {
+                  "socketAddress": {
+                    "address": "172.16.1.8",
+                    "portValue": 2222
+                  }
+                }
+              },
+              "healthStatus": "HEALTHY",
+              "loadBalancingWeight": 1
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName": "v2.foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+      "endpoints": [
+        {
+          "lbEndpoints": [
+            {
+              "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": "UNHEALTHY",
+              "loadBalancingWeight": 1
+            }
+          ]
+        }
       ]
     }
   ],
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets2.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets2.latest.golden
deleted file mode 100644
index f4e0c1e258b04..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets2.latest.golden
+++ /dev/null
@@ -1,269 +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": "v1.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
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v1.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
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "172.16.1.8",
-                    "portValue": 2222
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "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": "UNHEALTHY",
-              "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-service-timeouts.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-timeouts.latest.golden
deleted file mode 100644
index 8600551622112..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-service-timeouts.latest.golden
+++ /dev/null
@@ -1,159 +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": "v1.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.bar.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    }
-  ],
-  "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-tagged-addresses.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-tagged-addresses.latest.golden
deleted file mode 100644
index 4853c9dc932a1..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-tagged-addresses.latest.golden
+++ /dev/null
@@ -1,145 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "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-tcp-keepalives.latest.golden b/agent/xds/testdata/endpoints/mesh-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 4853c9dc932a1..0000000000000
--- a/agent/xds/testdata/endpoints/mesh-gateway-tcp-keepalives.latest.golden
+++ /dev/null
@@ -1,145 +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
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-custom-and-tagged-addresses.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-custom-and-tagged-addresses.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-custom-and-tagged-addresses.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-custom-trace-listener.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-custom-trace-listener.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-custom-trace-listener.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-hostname-service-subsets.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-hostname-service-subsets.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-hostname-service-subsets.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-http2-upstream-subsets.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-http2-upstream-subsets.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-http2-upstream-subsets.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/terminating-gateway-http2-upstream.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-http2-upstream.latest.golden
deleted file mode 100644
index 96ee5c7094687..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-http2-upstream.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/terminating-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index 5663c47c82646..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-ignore-extra-resolvers.latest.golden
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.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": [
-        {}
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-lb-config-no-hash-policies.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-lb-config-no-hash-policies.latest.golden
deleted file mode 100644
index 5663c47c82646..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-lb-config-no-hash-policies.latest.golden
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.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": [
-        {}
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-lb-config.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-lb-config.latest.golden
deleted file mode 100644
index 5663c47c82646..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-lb-config.latest.golden
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {}
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "v2.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": [
-        {}
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-api-cert.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-api-cert.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-no-api-cert.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-sni.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-sni.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-sni.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-tcp-keepalives.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-tcp-keepalives.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-with-peer-trust-bundle.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-with-peer-trust-bundle.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-with-peer-trust-bundle.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-with-tls-incoming-max-version.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/terminating-gateway-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/endpoints/terminating-gateway-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index 0b67b10323e3f..0000000000000
--- a/agent/xds/testdata/endpoints/terminating-gateway-with-tls-incoming-min-version.latest.golden
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "web.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/transparent-proxy-catalog-destinations-only.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-catalog-destinations-only.latest.golden
deleted file mode 100644
index ebf0eb91d97e9..0000000000000
--- a/agent/xds/testdata/endpoints/transparent-proxy-catalog-destinations-only.latest.golden
+++ /dev/null
@@ -1,104 +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
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9090
-                  }
-                }
-              },
-              "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": [
-        {}
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/transparent-proxy-dial-instances-directly.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-dial-instances-directly.latest.golden
deleted file mode 100644
index 202693781ebd6..0000000000000
--- a/agent/xds/testdata/endpoints/transparent-proxy-dial-instances-directly.latest.golden
+++ /dev/null
@@ -1,131 +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
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9092
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "mongo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.10.10",
-                    "portValue": 27017
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            },
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "10.10.10.12",
-                    "portValue": 27017
-                  }
-                }
-              },
-              "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/transparent-proxy-http-upstream.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-http-upstream.latest.golden
deleted file mode 100644
index ebf0eb91d97e9..0000000000000
--- a/agent/xds/testdata/endpoints/transparent-proxy-http-upstream.latest.golden
+++ /dev/null
@@ -1,104 +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
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9090
-                  }
-                }
-              },
-              "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": [
-        {}
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/transparent-proxy-terminating-gateway.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-terminating-gateway.latest.golden
deleted file mode 100644
index ce0d1b671c92e..0000000000000
--- a/agent/xds/testdata/endpoints/transparent-proxy-terminating-gateway.latest.golden
+++ /dev/null
@@ -1,119 +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
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9090
-                  }
-                }
-              },
-              "healthStatus": "HEALTHY",
-              "loadBalancingWeight": 1
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-      "clusterName": "kafka.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9090
-                  }
-                }
-              },
-              "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/transparent-proxy-with-resolver-redirect-upstream.latest.golden b/agent/xds/testdata/endpoints/transparent-proxy-with-resolver-redirect-upstream.latest.golden
deleted file mode 100644
index 545759eaf5b48..0000000000000
--- a/agent/xds/testdata/endpoints/transparent-proxy-with-resolver-redirect-upstream.latest.golden
+++ /dev/null
@@ -1,63 +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": "google.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "endpoints": [
-        {
-          "lbEndpoints": [
-            {
-              "endpoint": {
-                "address": {
-                  "socketAddress": {
-                    "address": "9.9.9.9",
-                    "portValue": 9090
-                  }
-                }
-              },
-              "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/listeners/api-gateway-with-multiple-hostnames.latest.golden b/agent/xds/testdata/listeners/api-gateway-with-multiple-hostnames.latest.golden
deleted file mode 100644
index 6469727f97989..0000000000000
--- a/agent/xds/testdata/listeners/api-gateway-with-multiple-hostnames.latest.golden
+++ /dev/null
@@ -1,54 +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"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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/connect-proxy-lb-in-resolver.latest.golden b/agent/xds/testdata/listeners/connect-proxy-lb-in-resolver.latest.golden
deleted file mode 100644
index 96c6814291eb7..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-lb-in-resolver.latest.golden
+++ /dev/null
@@ -1,137 +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",
-      "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/connect-proxy-resolver-with-lb.latest.golden b/agent/xds/testdata/listeners/connect-proxy-resolver-with-lb.latest.golden
deleted file mode 100644
index 96c6814291eb7..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-resolver-with-lb.latest.golden
+++ /dev/null
@@ -1,137 +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",
-      "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/connect-proxy-route-to-lb-resolver.latest.golden b/agent/xds/testdata/listeners/connect-proxy-route-to-lb-resolver.latest.golden
deleted file mode 100644
index 96c6814291eb7..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-route-to-lb-resolver.latest.golden
+++ /dev/null
@@ -1,137 +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",
-      "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/connect-proxy-splitter-overweight.latest.golden b/agent/xds/testdata/listeners/connect-proxy-splitter-overweight.latest.golden
deleted file mode 100644
index 96c6814291eb7..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-splitter-overweight.latest.golden
+++ /dev/null
@@ -1,137 +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",
-      "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/connect-proxy-with-chain-and-failover.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-failover.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-failover.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/connect-proxy-with-chain-and-router.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-router.latest.golden
deleted file mode 100644
index 96c6814291eb7..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-router.latest.golden
+++ /dev/null
@@ -1,137 +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",
-      "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/connect-proxy-with-chain-and-splitter.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-splitter.latest.golden
deleted file mode 100644
index 96c6814291eb7..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-splitter.latest.golden
+++ /dev/null
@@ -1,137 +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",
-      "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/connect-proxy-with-chain-http2.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-http2.latest.golden
deleted file mode 100644
index 287fd5d69ae88..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain-http2.latest.golden
+++ /dev/null
@@ -1,152 +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",
-                "http2ProtocolOptions": {},
-                "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.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/connect-proxy-with-chain.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-chain.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/connect-proxy-with-default-chain-and-custom-cluster.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-default-chain-and-custom-cluster.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/connect-proxy-with-grpc-router.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-router.latest.golden
deleted file mode 100644
index bdfe7aa7bd6fa..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-router.latest.golden
+++ /dev/null
@@ -1,151 +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",
-                "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"
-                    }
-                  }
-                ],
-                "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",
-      "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/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
index 0254a224d513b..e543143959774 100644
--- 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
@@ -63,19 +63,179 @@
         {
           "filters": [
             {
-              "name": "envoy.filters.network.rbac",
+              "name": "envoy.filters.network.http_connection_manager",
               "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"
+                "@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"
+                  }
+                ]
               }
             }
           ],
@@ -84,6 +244,9 @@
             "typedConfig": {
               "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
               "commonTlsContext": {
+                "alpnProtocols": [
+                  "http/1.1"
+                ],
                 "tlsCertificates": [
                   {
                     "certificateChain": {
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-jwt-config-entry-with-remote-jwks.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/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.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/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.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/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.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/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.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/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.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/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.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/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-cipher-suites.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/connect-proxy-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-max-version.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/connect-proxy-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version.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-limits-max-connections-only.latest.golden b/agent/xds/testdata/listeners/custom-limits-max-connections-only.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-limits-max-connections-only.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-limits-set-to-zero.latest.golden b/agent/xds/testdata/listeners/custom-limits-set-to-zero.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-limits-set-to-zero.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-limits.latest.golden b/agent/xds/testdata/listeners/custom-limits.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-limits.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-local-app.latest.golden b/agent/xds/testdata/listeners/custom-local-app.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-local-app.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-max-inbound-connections.latest.golden b/agent/xds/testdata/listeners/custom-max-inbound-connections.latest.golden
deleted file mode 100644
index 7f5652c047382..0000000000000
--- a/agent/xds/testdata/listeners/custom-max-inbound-connections.latest.golden
+++ /dev/null
@@ -1,123 +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.connection_limit",
-              "typedConfig": {
-                "@type": "type.googleapis.com/envoy.extensions.filters.network.connection_limit.v3.ConnectionLimit",
-                "maxConnections": "3456",
-                "statPrefix": "inbound_connection_limit"
-              }
-            },
-            {
-              "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-passive-healthcheck-zero-consecutive_5xx.latest.golden b/agent/xds/testdata/listeners/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-passive-healthcheck-zero-consecutive_5xx.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-passive-healthcheck.latest.golden b/agent/xds/testdata/listeners/custom-passive-healthcheck.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-passive-healthcheck.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-timeouts.latest.golden b/agent/xds/testdata/listeners/custom-timeouts.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-timeouts.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-upstream-default-chain.latest.golden b/agent/xds/testdata/listeners/custom-upstream-default-chain.latest.golden
deleted file mode 100644
index 0254a224d513b..0000000000000
--- a/agent/xds/testdata/listeners/custom-upstream-default-chain.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-upstream-with-prepared-query.latest.golden b/agent/xds/testdata/listeners/custom-upstream-with-prepared-query.latest.golden
index 41d2e0f4ff241..ca92cf2177a55 100644
--- a/agent/xds/testdata/listeners/custom-upstream-with-prepared-query.latest.golden
+++ b/agent/xds/testdata/listeners/custom-upstream-with-prepared-query.latest.golden
@@ -5,8 +5,8 @@
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
       "address": {
         "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+          "address": "11.11.11.11",
+          "portValue": 11111
         }
       },
       "filterChains": [
@@ -16,15 +16,14 @@
               "name": "envoy.filters.network.tcp_proxy",
               "typedConfig": {
                 "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy",
-                "cluster": "db.default.dc1.query.11111111-2222-3333-4444-555555555555.consul",
-                "statPrefix": "upstream.prepared_query_db"
+                "cluster": "random-cluster",
+                "statPrefix": "foo-stats"
               }
             }
           ]
         }
       ],
-      "name": "prepared_query:db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "name": "db:custom-upstream"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
@@ -38,48 +37,11 @@
         {
           "filters": [
             {
-              "name": "envoy.filters.network.http_connection_manager",
+              "name": "envoy.filters.network.tcp_proxy",
               "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": "prepared_query:geo-cache",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "prepared_query:geo-cache",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "geo-cache.default.dc1.query.11111111-2222-3333-4444-555555555555.consul"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "upstream.prepared_query_geo-cache",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
+                "@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"
               }
             }
           ]
diff --git a/agent/xds/testdata/listeners/custom-upstream.latest.golden b/agent/xds/testdata/listeners/custom-upstream.latest.golden
index 0254a224d513b..ca92cf2177a55 100644
--- a/agent/xds/testdata/listeners/custom-upstream.latest.golden
+++ b/agent/xds/testdata/listeners/custom-upstream.latest.golden
@@ -5,8 +5,8 @@
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
       "address": {
         "socketAddress": {
-          "address": "127.0.0.1",
-          "portValue": 9191
+          "address": "11.11.11.11",
+          "portValue": 11111
         }
       },
       "filterChains": [
@@ -16,15 +16,14 @@
               "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"
+                "cluster": "random-cluster",
+                "statPrefix": "foo-stats"
               }
             }
           ]
         }
       ],
-      "name": "db:127.0.0.1:9191",
-      "trafficDirection": "OUTBOUND"
+      "name": "db:custom-upstream"
     },
     {
       "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
diff --git a/agent/xds/testdata/listeners/downstream-service-with-unix-sockets.latest.golden b/agent/xds/testdata/listeners/downstream-service-with-unix-sockets.latest.golden
deleted file mode 100644
index 78526457cc956..0000000000000
--- a/agent/xds/testdata/listeners/downstream-service-with-unix-sockets.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": 0
-        }
-      },
-      "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:0",
-      "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
deleted file mode 100644
index 2299f061ddec7..0000000000000
--- a/agent/xds/testdata/listeners/expose-checks.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-paths-grpc-new-cluster-http1.latest.golden b/agent/xds/testdata/listeners/expose-paths-grpc-new-cluster-http1.latest.golden
deleted file mode 100644
index 90cb383d20c45..0000000000000
--- a/agent/xds/testdata/listeners/expose-paths-grpc-new-cluster-http1.latest.golden
+++ /dev/null
@@ -1,179 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 21500
-        }
-      },
-      "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": "exposed_path_filter_healthz_21500",
-                  "virtualHosts": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "exposed_path_filter_healthz_21500",
-                      "routes": [
-                        {
-                          "match": {
-                            "path": "/healthz"
-                          },
-                          "route": {
-                            "cluster": "exposed_cluster_8090"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "statPrefix": "exposed_path_filter_healthz_21500",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "exposed_path_healthz: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.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.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": [
-                    {
-                      "domains": [
-                        "*"
-                      ],
-                      "name": "public_listener",
-                      "routes": [
-                        {
-                          "match": {
-                            "prefix": "/"
-                          },
-                          "route": {
-                            "cluster": "local_app"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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": [
-                  "h2",
-                  "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: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/ingress-config-entry-nil.latest.golden b/agent/xds/testdata/listeners/ingress-config-entry-nil.latest.golden
deleted file mode 100644
index 97cdec41ef13e..0000000000000
--- a/agent/xds/testdata/listeners/ingress-config-entry-nil.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "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-defaults-no-chain.latest.golden b/agent/xds/testdata/listeners/ingress-defaults-no-chain.latest.golden
deleted file mode 100644
index 97cdec41ef13e..0000000000000
--- a/agent/xds/testdata/listeners/ingress-defaults-no-chain.latest.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "nonce": "00000001",
-  "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-gateway-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/listeners/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-gateway-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/listeners/ingress-gateway-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-gateway-with-tls-outgoing-max-version.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-gateway-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/listeners/ingress-gateway-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-gateway-with-tls-outgoing-min-version.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-lb-in-resolver.latest.golden b/agent/xds/testdata/listeners/ingress-lb-in-resolver.latest.golden
deleted file mode 100644
index 6469727f97989..0000000000000
--- a/agent/xds/testdata/listeners/ingress-lb-in-resolver.latest.golden
+++ /dev/null
@@ -1,54 +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"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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/ingress-multiple-listeners-duplicate-service.latest.golden b/agent/xds/testdata/listeners/ingress-multiple-listeners-duplicate-service.latest.golden
deleted file mode 100644
index 63affa4498850..0000000000000
--- a/agent/xds/testdata/listeners/ingress-multiple-listeners-duplicate-service.latest.golden
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 443
-        }
-      },
-      "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": "443"
-                },
-                "statPrefix": "ingress_upstream_443",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "name": "http:1.2.3.4:443",
-      "trafficDirection": "OUTBOUND"
-    },
-    {
-      "@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"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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/ingress-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-chain-and-failover.latest.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-failover.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-chain-and-failover.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-router-header-manip.latest.golden
deleted file mode 100644
index 6469727f97989..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-chain-and-router-header-manip.latest.golden
+++ /dev/null
@@ -1,54 +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"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-router.latest.golden
deleted file mode 100644
index 6469727f97989..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-chain-and-router.latest.golden
+++ /dev/null
@@ -1,54 +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"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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/ingress-with-chain-and-splitter.latest.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-splitter.latest.golden
deleted file mode 100644
index 6469727f97989..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-chain-and-splitter.latest.golden
+++ /dev/null
@@ -1,54 +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"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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/ingress-with-chain.latest.golden b/agent/xds/testdata/listeners/ingress-with-chain.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-chain.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-defaults-passive-health-check.latest.golden b/agent/xds/testdata/listeners/ingress-with-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-defaults-passive-health-check.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-defaults-service-max-connections.latest.golden b/agent/xds/testdata/listeners/ingress-with-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-defaults-service-max-connections.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-grpc-router.latest.golden b/agent/xds/testdata/listeners/ingress-with-grpc-router.latest.golden
deleted file mode 100644
index 6469727f97989..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-grpc-router.latest.golden
+++ /dev/null
@@ -1,54 +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"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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/ingress-with-overwrite-defaults-passive-health-check.latest.golden b/agent/xds/testdata/listeners/ingress-with-overwrite-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-overwrite-defaults-passive-health-check.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-overwrite-defaults-service-max-connections.latest.golden b/agent/xds/testdata/listeners/ingress-with-overwrite-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-overwrite-defaults-service-max-connections.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-sds-listener-level-wildcard.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-level-wildcard.latest.golden
deleted file mode 100644
index 309e66dc0ed4b..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-sds-listener-level-wildcard.latest.golden
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "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": "9191"
-                },
-                "statPrefix": "ingress_upstream_9191",
-                "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"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
-                  {
-                    "name": "listener-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
-                          {
-                            "envoyGrpc": {
-                              "clusterName": "listener-cluster"
-                            },
-                            "timeout": "5s"
-                          }
-                        ],
-                        "transportApiVersion": "V3"
-                      },
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                ],
-                "tlsParams": {}
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:9191",
-      "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-sds-listener-level.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-level.latest.golden
deleted file mode 100644
index 309e66dc0ed4b..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-sds-listener-level.latest.golden
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "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": "9191"
-                },
-                "statPrefix": "ingress_upstream_9191",
-                "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"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
-                  {
-                    "name": "listener-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
-                          {
-                            "envoyGrpc": {
-                              "clusterName": "listener-cluster"
-                            },
-                            "timeout": "5s"
-                          }
-                        ],
-                        "transportApiVersion": "V3"
-                      },
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                ],
-                "tlsParams": {}
-              },
-              "requireClientCertificate": false
-            }
-          }
-        }
-      ],
-      "name": "http:1.2.3.4:9191",
-      "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-sds-service-level-2.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level-2.latest.golden
deleted file mode 100644
index db099e6b7d370..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-sds-service-level-2.latest.golden
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "www.example.com"
-            ]
-          },
-          "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": "9191_web"
-                },
-                "statPrefix": "ingress_upstream_9191_web",
-                "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"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
-                  {
-                    "name": "www-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
-                          {
-                            "envoyGrpc": {
-                              "clusterName": "web-cluster"
-                            },
-                            "timeout": "5s"
-                          }
-                        ],
-                        "transportApiVersion": "V3"
-                      },
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                ],
-                "tlsParams": {}
-              },
-              "requireClientCertificate": false
-            }
-          }
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "foo.example.com"
-            ]
-          },
-          "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": "9191_foo"
-                },
-                "statPrefix": "ingress_upstream_9191_foo",
-                "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"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
-                  {
-                    "name": "foo-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
-                          {
-                            "envoyGrpc": {
-                              "clusterName": "foo-cluster"
-                            },
-                            "timeout": "5s"
-                          }
-                        ],
-                        "transportApiVersion": "V3"
-                      },
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                ],
-                "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:9191",
-      "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-sds-service-level-mixed-tls.latest.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-tls.latest.golden
deleted file mode 100644
index dca1e584ae533..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-tls.latest.golden
+++ /dev/null
@@ -1,134 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 9191
-        }
-      },
-      "filterChains": [
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "www.example.com"
-            ]
-          },
-          "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": "9191_web"
-                },
-                "statPrefix": "ingress_upstream_9191_web",
-                "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"
-                ],
-                "tlsCertificateSdsSecretConfigs": [
-                  {
-                    "name": "www-cert",
-                    "sdsConfig": {
-                      "apiConfigSource": {
-                        "apiType": "GRPC",
-                        "grpcServices": [
-                          {
-                            "envoyGrpc": {
-                              "clusterName": "web-cluster"
-                            },
-                            "timeout": "5s"
-                          }
-                        ],
-                        "transportApiVersion": "V3"
-                      },
-                      "resourceApiVersion": "V3"
-                    }
-                  }
-                ],
-                "tlsParams": {}
-              },
-              "requireClientCertificate": false
-            }
-          }
-        },
-        {
-          "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": "9191"
-                },
-                "statPrefix": "ingress_upstream_9191",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ]
-        }
-      ],
-      "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:9191",
-      "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-service-max-connections.latest.golden b/agent/xds/testdata/listeners/ingress-with-service-max-connections.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-service-max-connections.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-service-passive-health-check.latest.golden b/agent/xds/testdata/listeners/ingress-with-service-passive-health-check.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-service-passive-health-check.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 068e01983c926..0000000000000
--- a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
+++ /dev/null
@@ -1,32 +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.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: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/mesh-gateway-default-service-subset.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-default-service-subset.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-default-service-subset.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-hash-lb-ignored.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-hash-lb-ignored.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-hash-lb-ignored.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-ignore-extra-resolvers.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-newer-information-in-federation-states.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-newer-information-in-federation-states.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-newer-information-in-federation-states.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-non-hash-lb-injected.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-non-hash-lb-injected.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-non-hash-lb-injected.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-older-information-in-federation-states.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-older-information-in-federation-states.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-older-information-in-federation-states.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-service-subsets.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-service-subsets.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-service-subsets.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-service-subsets2.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-service-subsets2.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-service-subsets2.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-service-timeouts.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-service-timeouts.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-service-timeouts.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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-tcp-keepalives.latest.golden b/agent/xds/testdata/listeners/mesh-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 3b77ccca9b996..0000000000000
--- a/agent/xds/testdata/listeners/mesh-gateway-tcp-keepalives.latest.golden
+++ /dev/null
@@ -1,96 +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"
-              }
-            }
-          ]
-        },
-        {
-          "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/terminating-gateway-default-service-subset.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-default-service-subset.latest.golden
deleted file mode 100644
index 7f77ee4de3f80..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-default-service-subset.latest.golden
+++ /dev/null
@@ -1,346 +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": [
-              "v1.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": "v1.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
-            }
-          }
-        },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "v2.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": "v2.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
-            }
-          }
-        },
-        {
-          "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-hostname-service-subsets.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-hostname-service-subsets.latest.golden
deleted file mode 100644
index 85a4720d732da..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-hostname-service-subsets.latest.golden
+++ /dev/null
@@ -1,462 +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": [
-              "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "upstream.api.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": [
-              "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "upstream.api.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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.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.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "upstream.cache.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": [
-              "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.router",
-                    "typedConfig": {
-                      "@type": "type.googleapis.com/envoy.extensions.filters.http.router.v3.Router"
-                    }
-                  }
-                ],
-                "rds": {
-                  "configSource": {
-                    "ads": {},
-                    "resourceApiVersion": "V3"
-                  },
-                  "routeConfigName": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "upstream.cache.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": [
-              "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-http2-upstream-subsets.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-http2-upstream-subsets.latest.golden
deleted file mode 100644
index 1e4dd317a7698..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-http2-upstream-subsets.latest.golden
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
-        }
-      },
-      "filterChains": [
-        {
-          "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-http2-upstream.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-http2-upstream.latest.golden
deleted file mode 100644
index 1e4dd317a7698..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-http2-upstream.latest.golden
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "address": {
-        "socketAddress": {
-          "address": "1.2.3.4",
-          "portValue": 8443
-        }
-      },
-      "filterChains": [
-        {
-          "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-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index a508e82d51595..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-ignore-extra-resolvers.latest.golden
+++ /dev/null
@@ -1,433 +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": [
-              "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": {
-            "serverNames": [
-              "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": {
-            "serverNames": [
-              "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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-lb-config-no-hash-policies.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-lb-config-no-hash-policies.latest.golden
deleted file mode 100644
index a508e82d51595..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-lb-config-no-hash-policies.latest.golden
+++ /dev/null
@@ -1,433 +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": [
-              "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": {
-            "serverNames": [
-              "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": {
-            "serverNames": [
-              "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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-lb-config.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-lb-config.latest.golden
deleted file mode 100644
index a508e82d51595..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-lb-config.latest.golden
+++ /dev/null
@@ -1,433 +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": [
-              "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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"
-                },
-                "setCurrentClientCertDetails": {
-                  "cert": true,
-                  "chain": true,
-                  "dns": true,
-                  "subject": true,
-                  "uri": true
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": {
-            "serverNames": [
-              "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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": {
-            "serverNames": [
-              "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-            ]
-          },
-          "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.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
-                },
-                "statPrefix": "upstream.web.default.default.dc1",
-                "tracing": {
-                  "randomSampling": {}
-                },
-                "upgradeConfigs": [
-                  {
-                    "upgradeType": "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "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-service-subsets.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden
index 61c0f6e3b98d4..a508e82d51595 100644
--- a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden
+++ b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden
@@ -160,56 +160,6 @@
             }
           }
         },
-        {
-          "filterChainMatch": {
-            "serverNames": [
-              "prod.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": "prod.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": [
diff --git a/agent/xds/testdata/listeners/terminating-gateway-sni.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-sni.latest.golden
deleted file mode 100644
index 45ad9d29a0958..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-sni.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-tcp-keepalives.latest.golden b/agent/xds/testdata/listeners/terminating-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 45ad9d29a0958..0000000000000
--- a/agent/xds/testdata/listeners/terminating-gateway-tcp-keepalives.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/routes/access-logs-defaults.latest.golden b/agent/xds/testdata/routes/access-logs-defaults.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/access-logs-defaults.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/access-logs-json-file.latest.golden b/agent/xds/testdata/routes/access-logs-json-file.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/access-logs-json-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/routes/access-logs-text-stderr-disablelistenerlogs.latest.golden b/agent/xds/testdata/routes/access-logs-text-stderr-disablelistenerlogs.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/access-logs-text-stderr-disablelistenerlogs.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-http-listener-with-http-route.latest.golden b/agent/xds/testdata/routes/api-gateway-http-listener-with-http-route.latest.golden
deleted file mode 100644
index 3409e2f0dabc2..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-http-listener-with-http-route.latest.golden
+++ /dev/null
@@ -1,31 +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": "/"
-              },
-              "route": {
-                "cluster": "http-service.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-http-listener.latest.golden b/agent/xds/testdata/routes/api-gateway-http-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-http-listener.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-nil-config-entry.latest.golden b/agent/xds/testdata/routes/api-gateway-nil-config-entry.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-nil-config-entry.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-tcp-listener-with-tcp-and-http-route.latest.golden b/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
deleted file mode 100644
index 9a3033d238161..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*",
-            "*:8081"
-          ],
-          "name": "api-gateway-listener-http-9b9265b",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "http-service.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-tcp-listener-with-tcp-route.latest.golden b/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-route.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-tcp-listener-with-tcp-route.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-tcp-listener.latest.golden b/agent/xds/testdata/routes/api-gateway-tcp-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/api-gateway-tcp-listener.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.latest.golden b/agent/xds/testdata/routes/api-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/api-gateway.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-upstream-defaults.latest.golden b/agent/xds/testdata/routes/connect-proxy-upstream-defaults.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-upstream-defaults.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-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 8b919343d21a9..9a73db46e0d6e 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,5 +1,31 @@
 {
   "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",
+                "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/routes/connect-proxy-with-chain-and-failover.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-failover.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-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 8b919343d21a9..b5da244e3e67f 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,5 +1,31 @@
 {
   "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.cluster-01.external.peer1.domain",
+                "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/routes/connect-proxy-with-chain-external-sni.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden
index 8b919343d21a9..9a73db46e0d6e 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,5 +1,31 @@
 {
   "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",
+                "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/routes/connect-proxy-with-chain-http2.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-http2.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-chain-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-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden
index 8b919343d21a9..9a73db46e0d6e 100644
--- a/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden
+++ b/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden
@@ -1,5 +1,31 @@
 {
   "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",
+                "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/routes/connect-proxy-with-default-chain-and-custom-cluster.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-default-chain-and-custom-cluster.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-grpc-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-chain.latest.golden
deleted file mode 100644
index 9a73db46e0d6e..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-grpc-chain.latest.golden
+++ /dev/null
@@ -1,31 +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",
-                "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/routes/connect-proxy-with-http-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-http-chain.latest.golden
deleted file mode 100644
index 9a73db46e0d6e..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-http-chain.latest.golden
+++ /dev/null
@@ -1,31 +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",
-                "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/routes/connect-proxy-with-http2-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-http2-chain.latest.golden
deleted file mode 100644
index 9a73db46e0d6e..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-http2-chain.latest.golden
+++ /dev/null
@@ -1,31 +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",
-                "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/routes/connect-proxy-with-jwt-config-entry-with-local.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-jwt-config-entry-with-local.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-jwt-config-entry-with-local.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-jwt-config-entry-with-remote-jwks.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-jwt-config-entry-with-remote-jwks.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-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.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-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.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-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.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-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.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-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.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-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-local-gateway.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-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.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-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain-failover-through-remote-gateway.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-tcp-chain.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tcp-chain.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tcp-chain.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-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tls-incoming-cipher-suites.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-tls-incoming-max-version.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tls-incoming-max-version.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-tls-incoming-min-version.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tls-incoming-min-version.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-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-cipher-suites.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-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-max-version.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-tls-outgoing-min-version-auto.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-min-version-auto.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-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tls-outgoing-min-version.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-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/routes/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-with-tproxy-and-permissive-mtls.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-without-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/routes/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/connect-proxy-without-tproxy-and-permissive-mtls.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/custom-limits-max-connections-only.latest.golden b/agent/xds/testdata/routes/custom-limits-max-connections-only.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-limits-max-connections-only.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/custom-limits-set-to-zero.latest.golden b/agent/xds/testdata/routes/custom-limits-set-to-zero.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-limits-set-to-zero.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/custom-limits.latest.golden b/agent/xds/testdata/routes/custom-limits.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-limits.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/custom-local-app.latest.golden b/agent/xds/testdata/routes/custom-local-app.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-local-app.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/custom-max-inbound-connections.latest.golden b/agent/xds/testdata/routes/custom-max-inbound-connections.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-max-inbound-connections.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/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden b/agent/xds/testdata/routes/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-passive-healthcheck-zero-consecutive_5xx.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/custom-passive-healthcheck.latest.golden b/agent/xds/testdata/routes/custom-passive-healthcheck.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-passive-healthcheck.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/custom-public-listener-http-2.latest.golden b/agent/xds/testdata/routes/custom-public-listener-http-2.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-public-listener-http-2.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/custom-public-listener-http-missing.latest.golden b/agent/xds/testdata/routes/custom-public-listener-http-missing.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-public-listener-http-missing.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/custom-public-listener-http.latest.golden b/agent/xds/testdata/routes/custom-public-listener-http.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-public-listener-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/routes/custom-public-listener.latest.golden b/agent/xds/testdata/routes/custom-public-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-public-listener.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/custom-timeouts.latest.golden b/agent/xds/testdata/routes/custom-timeouts.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-timeouts.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/custom-trace-listener.latest.golden b/agent/xds/testdata/routes/custom-trace-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-trace-listener.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/custom-upstream-default-chain.latest.golden b/agent/xds/testdata/routes/custom-upstream-default-chain.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-upstream-default-chain.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/custom-upstream-ignored-with-disco-chain.latest.golden b/agent/xds/testdata/routes/custom-upstream-ignored-with-disco-chain.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-upstream-ignored-with-disco-chain.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/custom-upstream-with-prepared-query.latest.golden b/agent/xds/testdata/routes/custom-upstream-with-prepared-query.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-upstream-with-prepared-query.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/custom-upstream.latest.golden b/agent/xds/testdata/routes/custom-upstream.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/custom-upstream.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/downstream-service-with-unix-sockets.latest.golden b/agent/xds/testdata/routes/downstream-service-with-unix-sockets.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/downstream-service-with-unix-sockets.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/expose-checks-grpc.latest.golden b/agent/xds/testdata/routes/expose-checks-grpc.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/expose-checks-grpc.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/expose-checks-http-with-bind-override.latest.golden b/agent/xds/testdata/routes/expose-checks-http-with-bind-override.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/expose-checks-http-with-bind-override.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/expose-checks-http.latest.golden b/agent/xds/testdata/routes/expose-checks-http.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/expose-checks-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/routes/expose-checks.latest.golden b/agent/xds/testdata/routes/expose-checks.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/expose-checks.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/expose-paths-grpc-new-cluster-http1.latest.golden b/agent/xds/testdata/routes/expose-paths-grpc-new-cluster-http1.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/expose-paths-grpc-new-cluster-http1.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/expose-paths-local-app-paths.latest.golden b/agent/xds/testdata/routes/expose-paths-local-app-paths.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/expose-paths-local-app-paths.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/expose-paths-new-cluster-http2.latest.golden b/agent/xds/testdata/routes/expose-paths-new-cluster-http2.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/expose-paths-new-cluster-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/grpc-public-listener.latest.golden b/agent/xds/testdata/routes/grpc-public-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/grpc-public-listener.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/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/routes/http-listener-with-timeouts.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/http-listener-with-timeouts.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/http-public-listener-no-xfcc.latest.golden b/agent/xds/testdata/routes/http-public-listener-no-xfcc.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/http-public-listener-no-xfcc.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/http-public-listener.latest.golden b/agent/xds/testdata/routes/http-public-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/http-public-listener.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/http-upstream.latest.golden b/agent/xds/testdata/routes/http-upstream.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/http-upstream.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/http2-public-listener.latest.golden b/agent/xds/testdata/routes/http2-public-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/http2-public-listener.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/ingress-gateway-bind-addrs.latest.golden b/agent/xds/testdata/routes/ingress-gateway-bind-addrs.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-gateway-bind-addrs.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/ingress-gateway-nil-config-entry.latest.golden b/agent/xds/testdata/routes/ingress-gateway-nil-config-entry.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-gateway-nil-config-entry.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/ingress-gateway-no-services.latest.golden b/agent/xds/testdata/routes/ingress-gateway-no-services.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-gateway-no-services.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/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/routes/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-gateway-with-tls-outgoing-cipher-suites.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/ingress-gateway-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/routes/ingress-gateway-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-gateway-with-tls-outgoing-max-version.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/ingress-gateway-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/routes/ingress-gateway-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-gateway-with-tls-outgoing-min-version.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/ingress-gateway.latest.golden b/agent/xds/testdata/routes/ingress-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-gateway.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/ingress-multiple-listeners-duplicate-service.latest.golden b/agent/xds/testdata/routes/ingress-multiple-listeners-duplicate-service.latest.golden
deleted file mode 100644
index cb29b2bdabd18..0000000000000
--- a/agent/xds/testdata/routes/ingress-multiple-listeners-duplicate-service.latest.golden
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "443",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "foo.ingress.*",
-            "foo.ingress.*:443"
-          ],
-          "name": "foo",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "foo.ingress.*",
-            "foo.ingress.*:8080"
-          ],
-          "name": "foo",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        },
-        {
-          "domains": [
-            "bar.ingress.*",
-            "bar.ingress.*:8080"
-          ],
-          "name": "bar",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "bar.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/ingress-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-chain-and-failover-to-cluster-peer.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/ingress-with-chain-and-failover.latest.golden b/agent/xds/testdata/routes/ingress-with-chain-and-failover.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-chain-and-failover.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/ingress-with-defaults-passive-health-check.latest.golden b/agent/xds/testdata/routes/ingress-with-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-defaults-passive-health-check.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/ingress-with-defaults-service-max-connections.latest.golden b/agent/xds/testdata/routes/ingress-with-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-defaults-service-max-connections.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/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-grpc-single-tls-listener.latest.golden
deleted file mode 100644
index a5fd13c151256..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-grpc-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.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/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
deleted file mode 100644
index a5fd13c151256..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.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/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-http2-single-tls-listener.latest.golden
deleted file mode 100644
index a5fd13c151256..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-http2-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.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/ingress-with-overwrite-defaults-passive-health-check.latest.golden b/agent/xds/testdata/routes/ingress-with-overwrite-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-overwrite-defaults-passive-health-check.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/ingress-with-overwrite-defaults-service-max-connections.latest.golden b/agent/xds/testdata/routes/ingress-with-overwrite-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-overwrite-defaults-service-max-connections.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/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener+service-level.latest.golden
deleted file mode 100644
index de35eeddfdd7c..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-sds-listener+service-level.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8080"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080_s1",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.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/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-http.latest.golden
deleted file mode 100644
index 70dcd591060de..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-http.latest.golden
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "http.ingress.*",
-            "http.ingress.*:8080"
-          ],
-          "name": "http",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "http.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/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level-mixed-tls.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/ingress-with-sds-listener-gw-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-sds-listener-gw-level.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/ingress-with-sds-listener-listener-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-listener-level.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-sds-listener-listener-level.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/ingress-with-sds-service-level-2.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-2.latest.golden
deleted file mode 100644
index 48d9d7b774439..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-sds-service-level-2.latest.golden
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191_foo",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "foo.example.com",
-            "foo.example.com:9191"
-          ],
-          "name": "foo",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9191_web",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "www.example.com",
-            "www.example.com:9191"
-          ],
-          "name": "web",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-                "timeout": "22s"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-no-tls.latest.golden
deleted file mode 100644
index de35eeddfdd7c..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-no-tls.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8080"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080_s1",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.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/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden
index be0cb1f2a4a50..48d9d7b774439 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
@@ -3,22 +3,23 @@
   "resources": [
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080_s1",
+      "name": "9191_foo",
       "validateClusters": true,
       "virtualHosts": [
         {
           "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
+            "foo.example.com",
+            "foo.example.com:9191"
           ],
-          "name": "s1",
+          "name": "foo",
           "routes": [
             {
               "match": {
                 "prefix": "/"
               },
               "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "cluster": "foo.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout": "22s"
               }
             }
           ]
@@ -27,22 +28,23 @@
     },
     {
       "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080_s2",
+      "name": "9191_web",
       "validateClusters": true,
       "virtualHosts": [
         {
           "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8080"
+            "www.example.com",
+            "www.example.com:9191"
           ],
-          "name": "s2",
+          "name": "web",
           "routes": [
             {
               "match": {
                 "prefix": "/"
               },
               "route": {
-                "cluster": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
+                "cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
+                "timeout": "22s"
               }
             }
           ]
diff --git a/agent/xds/testdata/routes/ingress-with-service-max-connections.latest.golden b/agent/xds/testdata/routes/ingress-with-service-max-connections.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-service-max-connections.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/ingress-with-service-passive-health-check.latest.golden b/agent/xds/testdata/routes/ingress-with-service-passive-health-check.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-service-passive-health-check.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/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-single-tls-listener.latest.golden
deleted file mode 100644
index a5fd13c151256..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-single-tls-listener.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.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/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.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/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-local-gateway.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/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.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/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-double-failover-through-remote-gateway.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/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-local-gateway-triggered.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/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-local-gateway.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/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.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/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tcp-chain-failover-through-remote-gateway.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/ingress-with-tls-listener-cipher-suites.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-listener-cipher-suites.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-listener-cipher-suites.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/ingress-with-tls-listener-max-version.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-listener-max-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-listener-max-version.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/ingress-with-tls-listener-min-version.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-listener-min-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-listener-min-version.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/ingress-with-tls-listener.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-listener.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/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
deleted file mode 100644
index 8dd74e7de7147..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8082",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s3.ingress.*",
-            "s3.ingress.*:8082"
-          ],
-          "name": "s3",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s3.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8083",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s4.ingress.*",
-            "s4.ingress.*:8083"
-          ],
-          "name": "s4",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s4.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8084",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s4.ingress.*",
-            "s4.ingress.*:8084"
-          ],
-          "name": "s4",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s4.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/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
deleted file mode 100644
index a5fd13c151256..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.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/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-listeners.latest.golden
deleted file mode 100644
index 78f110c770367..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-mixed-listeners.latest.golden
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "9090",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:9090"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.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/ingress-with-tls-mixed-max-version-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-max-version-listeners.latest.golden
deleted file mode 100644
index 977c827264b28..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-mixed-max-version-listeners.latest.golden
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8082",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s3.ingress.*",
-            "s3.ingress.*:8082"
-          ],
-          "name": "s3",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s3.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/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/routes/ingress-with-tls-mixed-min-version-listeners.latest.golden
deleted file mode 100644
index 977c827264b28..0000000000000
--- a/agent/xds/testdata/routes/ingress-with-tls-mixed-min-version-listeners.latest.golden
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8080",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s1.ingress.*",
-            "s1.ingress.*:8080"
-          ],
-          "name": "s1",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s1.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8081",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s2.ingress.*",
-            "s2.ingress.*:8081"
-          ],
-          "name": "s2",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s2.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "8082",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "s3.ingress.*",
-            "s3.ingress.*:8082"
-          ],
-          "name": "s3",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "cluster": "s3.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/listener-balance-inbound-connections.latest.golden b/agent/xds/testdata/routes/listener-balance-inbound-connections.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/listener-balance-inbound-connections.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/listener-balance-outbound-connections-bind-port.latest.golden b/agent/xds/testdata/routes/listener-balance-outbound-connections-bind-port.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/listener-balance-outbound-connections-bind-port.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/listener-bind-address-port.latest.golden b/agent/xds/testdata/routes/listener-bind-address-port.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/listener-bind-address-port.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/listener-bind-address.latest.golden b/agent/xds/testdata/routes/listener-bind-address.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/listener-bind-address.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/listener-bind-port.latest.golden b/agent/xds/testdata/routes/listener-bind-port.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/listener-bind-port.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/listener-max-inbound-connections.latest.golden b/agent/xds/testdata/routes/listener-max-inbound-connections.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/listener-max-inbound-connections.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/listener-unix-domain-socket.latest.golden b/agent/xds/testdata/routes/listener-unix-domain-socket.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/listener-unix-domain-socket.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/mesh-gateway-custom-addresses.latest.golden b/agent/xds/testdata/routes/mesh-gateway-custom-addresses.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-custom-addresses.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/mesh-gateway-default-service-subset.latest.golden b/agent/xds/testdata/routes/mesh-gateway-default-service-subset.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-default-service-subset.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/mesh-gateway-hash-lb-ignored.latest.golden b/agent/xds/testdata/routes/mesh-gateway-hash-lb-ignored.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-hash-lb-ignored.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/mesh-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/routes/mesh-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-ignore-extra-resolvers.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/mesh-gateway-newer-information-in-federation-states.latest.golden b/agent/xds/testdata/routes/mesh-gateway-newer-information-in-federation-states.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-newer-information-in-federation-states.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/mesh-gateway-no-services.latest.golden b/agent/xds/testdata/routes/mesh-gateway-no-services.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-no-services.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/mesh-gateway-non-hash-lb-injected.latest.golden b/agent/xds/testdata/routes/mesh-gateway-non-hash-lb-injected.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-non-hash-lb-injected.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/mesh-gateway-older-information-in-federation-states.latest.golden b/agent/xds/testdata/routes/mesh-gateway-older-information-in-federation-states.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-older-information-in-federation-states.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/mesh-gateway-service-subsets.latest.golden b/agent/xds/testdata/routes/mesh-gateway-service-subsets.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-service-subsets.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/mesh-gateway-service-subsets2.latest.golden b/agent/xds/testdata/routes/mesh-gateway-service-subsets2.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-service-subsets2.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/mesh-gateway-service-timeouts.latest.golden b/agent/xds/testdata/routes/mesh-gateway-service-timeouts.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-service-timeouts.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/mesh-gateway-tagged-addresses.latest.golden b/agent/xds/testdata/routes/mesh-gateway-tagged-addresses.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-tagged-addresses.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/mesh-gateway-tcp-keepalives.latest.golden b/agent/xds/testdata/routes/mesh-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-tcp-keepalives.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/mesh-gateway-using-federation-control-plane.latest.golden b/agent/xds/testdata/routes/mesh-gateway-using-federation-control-plane.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-using-federation-control-plane.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/mesh-gateway-using-federation-states.latest.golden b/agent/xds/testdata/routes/mesh-gateway-using-federation-states.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway-using-federation-states.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/mesh-gateway.latest.golden b/agent/xds/testdata/routes/mesh-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/mesh-gateway.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/terminating-gateway-custom-and-tagged-addresses.latest.golden b/agent/xds/testdata/routes/terminating-gateway-custom-and-tagged-addresses.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-custom-and-tagged-addresses.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/terminating-gateway-custom-trace-listener.latest.golden b/agent/xds/testdata/routes/terminating-gateway-custom-trace-listener.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-custom-trace-listener.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/terminating-gateway-default-service-subset.latest.golden b/agent/xds/testdata/routes/terminating-gateway-default-service-subset.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-default-service-subset.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/terminating-gateway-hostname-service-subsets.latest.golden b/agent/xds/testdata/routes/terminating-gateway-hostname-service-subsets.latest.golden
deleted file mode 100644
index f05a3fc603401..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-hostname-service-subsets.latest.golden
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "nonce": "00000001",
-  "resources": [
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "autoHostRewrite": true,
-                "cluster": "alt.api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "autoHostRewrite": true,
-                "cluster": "api.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "autoHostRewrite": true,
-                "cluster": "cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "prod.cache.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-          "routes": [
-            {
-              "match": {
-                "prefix": "/"
-              },
-              "route": {
-                "autoHostRewrite": true,
-                "cluster": "prod.cache.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/terminating-gateway-http2-upstream-subsets.latest.golden b/agent/xds/testdata/routes/terminating-gateway-http2-upstream-subsets.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-http2-upstream-subsets.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/terminating-gateway-http2-upstream.latest.golden b/agent/xds/testdata/routes/terminating-gateway-http2-upstream.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-http2-upstream.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/terminating-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/routes/terminating-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index fa5dbf99a413e..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-ignore-extra-resolvers.latest.golden
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "nonce": "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": [
-        {
-          "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"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "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"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "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"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config-no-hash-policies.latest.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config-no-hash-policies.latest.golden
deleted file mode 100644
index 39689dc5b2ea6..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-lb-config-no-hash-policies.latest.golden
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-  "nonce": "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": [
-        {
-          "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",
-                "timeout": "0.200s"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "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",
-                "timeout": "0.200s"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "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",
-                "timeout": "0.200s"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/terminating-gateway-no-api-cert.latest.golden b/agent/xds/testdata/routes/terminating-gateway-no-api-cert.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-no-api-cert.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/terminating-gateway-no-services.latest.golden b/agent/xds/testdata/routes/terminating-gateway-no-services.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-no-services.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/terminating-gateway-service-subsets.latest.golden b/agent/xds/testdata/routes/terminating-gateway-service-subsets.latest.golden
deleted file mode 100644
index fa5dbf99a413e..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-service-subsets.latest.golden
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  "nonce": "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": [
-        {
-          "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"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "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"
-              }
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-      "name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
-      "validateClusters": true,
-      "virtualHosts": [
-        {
-          "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"
-              }
-            }
-          ]
-        }
-      ]
-    }
-  ],
-  "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
-  "versionInfo": "00000001"
-}
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/terminating-gateway-sni.latest.golden b/agent/xds/testdata/routes/terminating-gateway-sni.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-sni.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/terminating-gateway-tcp-keepalives.latest.golden b/agent/xds/testdata/routes/terminating-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-tcp-keepalives.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/terminating-gateway-with-peer-trust-bundle.latest.golden b/agent/xds/testdata/routes/terminating-gateway-with-peer-trust-bundle.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-with-peer-trust-bundle.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/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/routes/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-with-tls-incoming-cipher-suites.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/terminating-gateway-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/routes/terminating-gateway-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-with-tls-incoming-max-version.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/terminating-gateway-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/routes/terminating-gateway-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway-with-tls-incoming-min-version.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/terminating-gateway.latest.golden b/agent/xds/testdata/routes/terminating-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/terminating-gateway.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/transparent-proxy-catalog-destinations-only.latest.golden b/agent/xds/testdata/routes/transparent-proxy-catalog-destinations-only.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/transparent-proxy-catalog-destinations-only.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/transparent-proxy-dial-instances-directly.latest.golden b/agent/xds/testdata/routes/transparent-proxy-dial-instances-directly.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/transparent-proxy-dial-instances-directly.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/transparent-proxy-http-upstream.latest.golden b/agent/xds/testdata/routes/transparent-proxy-http-upstream.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/transparent-proxy-http-upstream.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/transparent-proxy-terminating-gateway.latest.golden b/agent/xds/testdata/routes/transparent-proxy-terminating-gateway.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/transparent-proxy-terminating-gateway.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/transparent-proxy-with-resolver-redirect-upstream.latest.golden b/agent/xds/testdata/routes/transparent-proxy-with-resolver-redirect-upstream.latest.golden
deleted file mode 100644
index 8b919343d21a9..0000000000000
--- a/agent/xds/testdata/routes/transparent-proxy-with-resolver-redirect-upstream.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/secrets/access-logs-defaults.latest.golden b/agent/xds/testdata/secrets/access-logs-defaults.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/access-logs-defaults.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/access-logs-json-file.latest.golden b/agent/xds/testdata/secrets/access-logs-json-file.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/access-logs-json-file.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/access-logs-text-stderr-disablelistenerlogs.latest.golden b/agent/xds/testdata/secrets/access-logs-text-stderr-disablelistenerlogs.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/access-logs-text-stderr-disablelistenerlogs.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-http-listener-with-http-route.latest.golden b/agent/xds/testdata/secrets/api-gateway-http-listener-with-http-route.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-http-listener-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-http-listener.latest.golden b/agent/xds/testdata/secrets/api-gateway-http-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-http-listener.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-nil-config-entry.latest.golden b/agent/xds/testdata/secrets/api-gateway-nil-config-entry.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-nil-config-entry.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-tcp-listener-with-tcp-and-http-route.latest.golden b/agent/xds/testdata/secrets/api-gateway-tcp-listener-with-tcp-and-http-route.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-tcp-listener-with-tcp-and-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-tcp-listener-with-tcp-route.latest.golden b/agent/xds/testdata/secrets/api-gateway-tcp-listener-with-tcp-route.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-tcp-listener-with-tcp-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-tcp-listener.latest.golden b/agent/xds/testdata/secrets/api-gateway-tcp-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-tcp-listener.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-hostnames.latest.golden b/agent/xds/testdata/secrets/api-gateway-with-multiple-hostnames.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway-with-multiple-hostnames.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.latest.golden b/agent/xds/testdata/secrets/api-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/api-gateway.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-lb-in-resolver.latest.golden b/agent/xds/testdata/secrets/connect-proxy-lb-in-resolver.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-lb-in-resolver.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-resolver-with-lb.latest.golden b/agent/xds/testdata/secrets/connect-proxy-resolver-with-lb.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-resolver-with-lb.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-route-to-lb-resolver.latest.golden b/agent/xds/testdata/secrets/connect-proxy-route-to-lb-resolver.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-route-to-lb-resolver.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-splitter-overweight.latest.golden b/agent/xds/testdata/secrets/connect-proxy-splitter-overweight.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-splitter-overweight.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-upstream-defaults.latest.golden b/agent/xds/testdata/secrets/connect-proxy-upstream-defaults.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-upstream-defaults.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-chain-and-failover.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-failover.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-failover.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-chain-and-overrides.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-overrides.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-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-chain-and-router.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-router.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-router.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-chain-and-splitter.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-and-splitter.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-and-splitter.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-chain-external-sni.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-external-sni.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-external-sni.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-chain-http2.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain-http2.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain-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-chain.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-chain.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-default-chain-and-custom-cluster.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-default-chain-and-custom-cluster.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-default-chain-and-custom-cluster.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-grpc-chain.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-grpc-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-grpc-chain.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-grpc-router.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-grpc-router.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-grpc-router.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-http-chain.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-http-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-http-chain.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-http2-chain.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-http2-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-http2-chain.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-jwt-config-entry-with-local.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-jwt-config-entry-with-local.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-jwt-config-entry-with-local.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-jwt-config-entry-with-remote-jwks.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-jwt-config-entry-with-remote-jwks.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-jwt-config-entry-with-remote-jwks.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-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.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-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.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-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.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-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.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-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.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-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-local-gateway.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-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.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-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain-failover-through-remote-gateway.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-tcp-chain.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tcp-chain.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-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tls-incoming-cipher-suites.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-tls-incoming-max-version.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tls-incoming-max-version.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-tls-incoming-min-version.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tls-incoming-min-version.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-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-cipher-suites.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-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-max-version.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-tls-outgoing-min-version-auto.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-min-version-auto.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-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tls-outgoing-min-version.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-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/secrets/connect-proxy-with-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-with-tproxy-and-permissive-mtls.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-without-tproxy-and-permissive-mtls.latest.golden b/agent/xds/testdata/secrets/connect-proxy-without-tproxy-and-permissive-mtls.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/connect-proxy-without-tproxy-and-permissive-mtls.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/custom-limits-max-connections-only.latest.golden b/agent/xds/testdata/secrets/custom-limits-max-connections-only.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-limits-max-connections-only.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/custom-limits-set-to-zero.latest.golden b/agent/xds/testdata/secrets/custom-limits-set-to-zero.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-limits-set-to-zero.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/custom-limits.latest.golden b/agent/xds/testdata/secrets/custom-limits.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-limits.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/custom-local-app.latest.golden b/agent/xds/testdata/secrets/custom-local-app.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-local-app.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/custom-max-inbound-connections.latest.golden b/agent/xds/testdata/secrets/custom-max-inbound-connections.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-max-inbound-connections.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/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden b/agent/xds/testdata/secrets/custom-passive-healthcheck-zero-consecutive_5xx.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-passive-healthcheck-zero-consecutive_5xx.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/custom-passive-healthcheck.latest.golden b/agent/xds/testdata/secrets/custom-passive-healthcheck.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-passive-healthcheck.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/custom-public-listener-http-2.latest.golden b/agent/xds/testdata/secrets/custom-public-listener-http-2.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-public-listener-http-2.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/custom-public-listener-http-missing.latest.golden b/agent/xds/testdata/secrets/custom-public-listener-http-missing.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-public-listener-http-missing.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/custom-public-listener-http.latest.golden b/agent/xds/testdata/secrets/custom-public-listener-http.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-public-listener-http.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/custom-public-listener.latest.golden b/agent/xds/testdata/secrets/custom-public-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-public-listener.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/custom-timeouts.latest.golden b/agent/xds/testdata/secrets/custom-timeouts.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-timeouts.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/custom-trace-listener.latest.golden b/agent/xds/testdata/secrets/custom-trace-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-trace-listener.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/custom-upstream-default-chain.latest.golden b/agent/xds/testdata/secrets/custom-upstream-default-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-upstream-default-chain.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/custom-upstream-ignored-with-disco-chain.latest.golden b/agent/xds/testdata/secrets/custom-upstream-ignored-with-disco-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-upstream-ignored-with-disco-chain.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/custom-upstream-with-prepared-query.latest.golden b/agent/xds/testdata/secrets/custom-upstream-with-prepared-query.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-upstream-with-prepared-query.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/custom-upstream.latest.golden b/agent/xds/testdata/secrets/custom-upstream.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/custom-upstream.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/downstream-service-with-unix-sockets.latest.golden b/agent/xds/testdata/secrets/downstream-service-with-unix-sockets.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/downstream-service-with-unix-sockets.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/expose-checks-grpc.latest.golden b/agent/xds/testdata/secrets/expose-checks-grpc.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/expose-checks-grpc.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/expose-checks-http-with-bind-override.latest.golden b/agent/xds/testdata/secrets/expose-checks-http-with-bind-override.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/expose-checks-http-with-bind-override.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/expose-checks-http.latest.golden b/agent/xds/testdata/secrets/expose-checks-http.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/expose-checks-http.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/expose-checks.latest.golden b/agent/xds/testdata/secrets/expose-checks.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/expose-checks.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/expose-paths-grpc-new-cluster-http1.latest.golden b/agent/xds/testdata/secrets/expose-paths-grpc-new-cluster-http1.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/expose-paths-grpc-new-cluster-http1.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/expose-paths-local-app-paths.latest.golden b/agent/xds/testdata/secrets/expose-paths-local-app-paths.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/expose-paths-local-app-paths.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/expose-paths-new-cluster-http2.latest.golden b/agent/xds/testdata/secrets/expose-paths-new-cluster-http2.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/expose-paths-new-cluster-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/grpc-public-listener.latest.golden b/agent/xds/testdata/secrets/grpc-public-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/grpc-public-listener.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/http-listener-with-timeouts.latest.golden b/agent/xds/testdata/secrets/http-listener-with-timeouts.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/http-listener-with-timeouts.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/http-public-listener-no-xfcc.latest.golden b/agent/xds/testdata/secrets/http-public-listener-no-xfcc.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/http-public-listener-no-xfcc.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/http-public-listener.latest.golden b/agent/xds/testdata/secrets/http-public-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/http-public-listener.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/http-upstream.latest.golden b/agent/xds/testdata/secrets/http-upstream.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/http-upstream.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/http2-public-listener.latest.golden b/agent/xds/testdata/secrets/http2-public-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/http2-public-listener.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/ingress-config-entry-nil.latest.golden b/agent/xds/testdata/secrets/ingress-config-entry-nil.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-config-entry-nil.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/ingress-defaults-no-chain.latest.golden b/agent/xds/testdata/secrets/ingress-defaults-no-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-defaults-no-chain.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/ingress-gateway-bind-addrs.latest.golden b/agent/xds/testdata/secrets/ingress-gateway-bind-addrs.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-gateway-bind-addrs.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/ingress-gateway-nil-config-entry.latest.golden b/agent/xds/testdata/secrets/ingress-gateway-nil-config-entry.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-gateway-nil-config-entry.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/ingress-gateway-no-services.latest.golden b/agent/xds/testdata/secrets/ingress-gateway-no-services.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-gateway-no-services.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/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden b/agent/xds/testdata/secrets/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-gateway-with-tls-outgoing-cipher-suites.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/ingress-gateway-with-tls-outgoing-max-version.latest.golden b/agent/xds/testdata/secrets/ingress-gateway-with-tls-outgoing-max-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-gateway-with-tls-outgoing-max-version.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/ingress-gateway-with-tls-outgoing-min-version.latest.golden b/agent/xds/testdata/secrets/ingress-gateway-with-tls-outgoing-min-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-gateway-with-tls-outgoing-min-version.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/ingress-gateway.latest.golden b/agent/xds/testdata/secrets/ingress-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-gateway.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/ingress-grpc-multiple-services.latest.golden b/agent/xds/testdata/secrets/ingress-grpc-multiple-services.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-grpc-multiple-services.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/ingress-http-multiple-services.latest.golden b/agent/xds/testdata/secrets/ingress-http-multiple-services.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-http-multiple-services.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/ingress-lb-in-resolver.latest.golden b/agent/xds/testdata/secrets/ingress-lb-in-resolver.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-lb-in-resolver.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/ingress-multiple-listeners-duplicate-service.latest.golden b/agent/xds/testdata/secrets/ingress-multiple-listeners-duplicate-service.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-multiple-listeners-duplicate-service.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/ingress-splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/secrets/ingress-splitter-with-resolver-redirect.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-splitter-with-resolver-redirect.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/ingress-with-chain-and-failover-to-cluster-peer.latest.golden b/agent/xds/testdata/secrets/ingress-with-chain-and-failover-to-cluster-peer.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-chain-and-failover-to-cluster-peer.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/ingress-with-chain-and-failover.latest.golden b/agent/xds/testdata/secrets/ingress-with-chain-and-failover.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-chain-and-failover.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/ingress-with-chain-and-router-header-manip.latest.golden b/agent/xds/testdata/secrets/ingress-with-chain-and-router-header-manip.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-chain-and-router-header-manip.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/ingress-with-chain-and-router.latest.golden b/agent/xds/testdata/secrets/ingress-with-chain-and-router.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-chain-and-router.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/ingress-with-chain-and-splitter.latest.golden b/agent/xds/testdata/secrets/ingress-with-chain-and-splitter.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-chain-and-splitter.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/ingress-with-chain-external-sni.latest.golden b/agent/xds/testdata/secrets/ingress-with-chain-external-sni.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-chain-external-sni.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/ingress-with-chain.latest.golden b/agent/xds/testdata/secrets/ingress-with-chain.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-chain.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/ingress-with-defaults-passive-health-check.latest.golden b/agent/xds/testdata/secrets/ingress-with-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-defaults-passive-health-check.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/ingress-with-defaults-service-max-connections.latest.golden b/agent/xds/testdata/secrets/ingress-with-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-defaults-service-max-connections.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/ingress-with-grpc-router.latest.golden b/agent/xds/testdata/secrets/ingress-with-grpc-router.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-grpc-router.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/ingress-with-grpc-single-tls-listener.latest.golden b/agent/xds/testdata/secrets/ingress-with-grpc-single-tls-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-grpc-single-tls-listener.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/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden b/agent/xds/testdata/secrets/ingress-with-http2-and-grpc-multiple-tls-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-http2-and-grpc-multiple-tls-listener.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/ingress-with-http2-single-tls-listener.latest.golden b/agent/xds/testdata/secrets/ingress-with-http2-single-tls-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-http2-single-tls-listener.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/ingress-with-overwrite-defaults-passive-health-check.latest.golden b/agent/xds/testdata/secrets/ingress-with-overwrite-defaults-passive-health-check.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-overwrite-defaults-passive-health-check.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/ingress-with-overwrite-defaults-service-max-connections.latest.golden b/agent/xds/testdata/secrets/ingress-with-overwrite-defaults-service-max-connections.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-overwrite-defaults-service-max-connections.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/ingress-with-sds-listener+service-level.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-listener+service-level.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-listener+service-level.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/ingress-with-sds-listener-gw-level-http.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-listener-gw-level-http.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-listener-gw-level-http.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/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-listener-gw-level-mixed-tls.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/ingress-with-sds-listener-gw-level.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-listener-gw-level.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-listener-gw-level.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/ingress-with-sds-listener-level-wildcard.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-listener-level-wildcard.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-listener-level-wildcard.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/ingress-with-sds-listener-level.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-listener-level.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-listener-level.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/ingress-with-sds-listener-listener-level.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-listener-listener-level.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-listener-listener-level.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/ingress-with-sds-service-level-2.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-service-level-2.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-service-level-2.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/ingress-with-sds-service-level-mixed-no-tls.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-service-level-mixed-no-tls.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-service-level-mixed-no-tls.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/ingress-with-sds-service-level-mixed-tls.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-service-level-mixed-tls.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-service-level-mixed-tls.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/ingress-with-sds-service-level.latest.golden b/agent/xds/testdata/secrets/ingress-with-sds-service-level.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-sds-service-level.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/ingress-with-service-max-connections.latest.golden b/agent/xds/testdata/secrets/ingress-with-service-max-connections.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-service-max-connections.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/ingress-with-service-passive-health-check.latest.golden b/agent/xds/testdata/secrets/ingress-with-service-passive-health-check.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-service-passive-health-check.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/ingress-with-single-tls-listener.latest.golden b/agent/xds/testdata/secrets/ingress-with-single-tls-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-single-tls-listener.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/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.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/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-local-gateway.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/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.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/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-double-failover-through-remote-gateway.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/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-local-gateway-triggered.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/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-local-gateway.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/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.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/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden b/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tcp-chain-failover-through-remote-gateway.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/ingress-with-tls-listener-cipher-suites.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-listener-cipher-suites.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-listener-cipher-suites.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/ingress-with-tls-listener-max-version.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-listener-max-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-listener-max-version.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/ingress-with-tls-listener-min-version.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-listener-min-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-listener-min-version.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/ingress-with-tls-listener.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-listener.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/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-min-version-listeners-gateway-defaults.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/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-mixed-cipher-suites-listeners.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-mixed-cipher-suites-listeners.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/ingress-with-tls-mixed-listeners.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-mixed-listeners.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-mixed-listeners.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/ingress-with-tls-mixed-max-version-listeners.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-mixed-max-version-listeners.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-mixed-max-version-listeners.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/ingress-with-tls-mixed-min-version-listeners.latest.golden b/agent/xds/testdata/secrets/ingress-with-tls-mixed-min-version-listeners.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/ingress-with-tls-mixed-min-version-listeners.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/listener-balance-inbound-connections.latest.golden b/agent/xds/testdata/secrets/listener-balance-inbound-connections.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/listener-balance-inbound-connections.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/listener-balance-outbound-connections-bind-port.latest.golden b/agent/xds/testdata/secrets/listener-balance-outbound-connections-bind-port.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/listener-balance-outbound-connections-bind-port.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/listener-bind-address-port.latest.golden b/agent/xds/testdata/secrets/listener-bind-address-port.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/listener-bind-address-port.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/listener-bind-address.latest.golden b/agent/xds/testdata/secrets/listener-bind-address.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/listener-bind-address.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/listener-bind-port.latest.golden b/agent/xds/testdata/secrets/listener-bind-port.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/listener-bind-port.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/listener-max-inbound-connections.latest.golden b/agent/xds/testdata/secrets/listener-max-inbound-connections.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/listener-max-inbound-connections.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/listener-unix-domain-socket.latest.golden b/agent/xds/testdata/secrets/listener-unix-domain-socket.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/listener-unix-domain-socket.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/mesh-gateway-custom-addresses.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-custom-addresses.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-custom-addresses.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/mesh-gateway-default-service-subset.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-default-service-subset.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-default-service-subset.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/mesh-gateway-hash-lb-ignored.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-hash-lb-ignored.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-hash-lb-ignored.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/mesh-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-ignore-extra-resolvers.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/mesh-gateway-newer-information-in-federation-states.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-newer-information-in-federation-states.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-newer-information-in-federation-states.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/mesh-gateway-no-services.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-no-services.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-no-services.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/mesh-gateway-non-hash-lb-injected.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-non-hash-lb-injected.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-non-hash-lb-injected.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/mesh-gateway-older-information-in-federation-states.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-older-information-in-federation-states.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-older-information-in-federation-states.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/mesh-gateway-service-subsets.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-service-subsets.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-service-subsets.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/mesh-gateway-service-subsets2.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-service-subsets2.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-service-subsets2.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/mesh-gateway-service-timeouts.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-service-timeouts.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-service-timeouts.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/mesh-gateway-tagged-addresses.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-tagged-addresses.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-tagged-addresses.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/mesh-gateway-tcp-keepalives.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-tcp-keepalives.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/mesh-gateway-using-federation-control-plane.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-using-federation-control-plane.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-using-federation-control-plane.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/mesh-gateway-using-federation-states.latest.golden b/agent/xds/testdata/secrets/mesh-gateway-using-federation-states.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway-using-federation-states.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/mesh-gateway.latest.golden b/agent/xds/testdata/secrets/mesh-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/mesh-gateway.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/splitter-with-resolver-redirect.latest.golden b/agent/xds/testdata/secrets/splitter-with-resolver-redirect.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/splitter-with-resolver-redirect.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/terminating-gateway-custom-and-tagged-addresses.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-custom-and-tagged-addresses.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-custom-and-tagged-addresses.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/terminating-gateway-custom-trace-listener.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-custom-trace-listener.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-custom-trace-listener.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/terminating-gateway-default-service-subset.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-default-service-subset.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-default-service-subset.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/terminating-gateway-hostname-service-subsets.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-hostname-service-subsets.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-hostname-service-subsets.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/terminating-gateway-http2-upstream-subsets.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-http2-upstream-subsets.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-http2-upstream-subsets.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/terminating-gateway-http2-upstream.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-http2-upstream.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-http2-upstream.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/terminating-gateway-ignore-extra-resolvers.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-ignore-extra-resolvers.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-ignore-extra-resolvers.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/terminating-gateway-lb-config-no-hash-policies.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-lb-config-no-hash-policies.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-lb-config-no-hash-policies.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/terminating-gateway-lb-config.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-lb-config.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-lb-config.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/terminating-gateway-no-api-cert.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-no-api-cert.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-no-api-cert.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/terminating-gateway-no-services.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-no-services.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-no-services.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/terminating-gateway-service-subsets.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-service-subsets.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-service-subsets.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/terminating-gateway-sni.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-sni.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-sni.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/terminating-gateway-tcp-keepalives.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-tcp-keepalives.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-tcp-keepalives.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/terminating-gateway-with-peer-trust-bundle.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-with-peer-trust-bundle.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-with-peer-trust-bundle.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/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-with-tls-incoming-cipher-suites.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/terminating-gateway-with-tls-incoming-max-version.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-with-tls-incoming-max-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-with-tls-incoming-max-version.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/terminating-gateway-with-tls-incoming-min-version.latest.golden b/agent/xds/testdata/secrets/terminating-gateway-with-tls-incoming-min-version.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway-with-tls-incoming-min-version.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/terminating-gateway.latest.golden b/agent/xds/testdata/secrets/terminating-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/terminating-gateway.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/transparent-proxy-catalog-destinations-only.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-catalog-destinations-only.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/transparent-proxy-catalog-destinations-only.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/transparent-proxy-dial-instances-directly.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-dial-instances-directly.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/transparent-proxy-dial-instances-directly.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/transparent-proxy-http-upstream.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-http-upstream.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/transparent-proxy-http-upstream.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/transparent-proxy-terminating-gateway.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-terminating-gateway.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/transparent-proxy-terminating-gateway.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/transparent-proxy-with-resolver-redirect-upstream.latest.golden b/agent/xds/testdata/secrets/transparent-proxy-with-resolver-redirect-upstream.latest.golden
deleted file mode 100644
index 82e45650658b4..0000000000000
--- a/agent/xds/testdata/secrets/transparent-proxy-with-resolver-redirect-upstream.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/xdsv2/cluster_resources.go b/agent/xdsv2/cluster_resources.go
index 8d280853c2ad7..d32eeed2ec62b 100644
--- a/agent/xdsv2/cluster_resources.go
+++ b/agent/xdsv2/cluster_resources.go
@@ -9,7 +9,6 @@ import (
 
 	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_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"
@@ -20,58 +19,77 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbmesh/v2beta1/pbproxystate"
 )
 
-func (pr *ProxyResources) makeClustersAndEndpoints(name string) (map[string]proto.Message, map[string]proto.Message, error) {
-	envoyClusters := make(map[string]proto.Message)
-	envoyEndpoints := make(map[string]proto.Message)
+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, nil, fmt.Errorf("cluster %q not found", name)
+		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, eps, err := pr.makeEnvoyAggregateClusterAndEndpoint(name, proxyStateCluster.Protocol, fg)
+		clusters, err := pr.makeEnvoyAggregateCluster(name, proxyStateCluster.Protocol, fg)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
-		// for each cluster, add it to clusters map and add endpoint to endpoint map
 		for _, c := range clusters {
-			envoyClusters[c.Name] = c
-			if ep, ok := eps[c.Name]; ok {
-				envoyEndpoints[c.Name] = ep
-			}
+			clusters = append(clusters, c)
 		}
 
 	case *pbproxystate.Cluster_EndpointGroup:
 		eg := proxyStateCluster.GetEndpointGroup()
-		cluster, eps, err := pr.makeEnvoyClusterAndEndpoint(name, proxyStateCluster.Protocol, eg)
+		cluster, err := pr.makeEnvoyCluster(name, proxyStateCluster.Protocol, eg)
 		if err != nil {
-			return nil, nil, err
-		}
-
-		// for each cluster, add it to clusters map and add endpoint to endpoint map
-		envoyClusters[cluster.Name] = cluster
-		if ep, ok := eps[cluster.Name]; ok {
-			envoyEndpoints[cluster.Name] = ep
+			return nil, err
 		}
+		clusters = append(clusters, cluster)
 
 	default:
-		return nil, nil, errors.New("cluster group type should be Endpoint Group or Failover Group")
+		return nil, errors.New("cluster group type should be Endpoint Group or Failover Group")
 	}
-	return envoyClusters, envoyEndpoints, nil
+	return clusters, nil
 }
 
-func (pr *ProxyResources) makeEnvoyClusterAndEndpoint(name string, protocol pbproxystate.Protocol,
-	eg *pbproxystate.EndpointGroup) (*envoy_cluster_v3.Cluster, map[string]*envoy_endpoint_v3.ClusterLoadAssignment, error) {
+func (pr *ProxyResources) makeEnvoyCluster(name string, protocol pbproxystate.Protocol, 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.makeEnvoyDynamicClusterAndEndpoint(name, protocol, dynamic)
+			return pr.makeEnvoyDynamicCluster(name, protocol, dynamic)
 		case *pbproxystate.EndpointGroup_Static:
 			static := eg.GetStatic()
-			return pr.makeEnvoyStaticClusterAndEndpoint(name, protocol, static)
+			return pr.makeEnvoyStaticCluster(name, protocol, static)
 		case *pbproxystate.EndpointGroup_Dns:
 			dns := eg.GetDns()
 			return pr.makeEnvoyDnsCluster(name, protocol, dns)
@@ -79,14 +97,13 @@ func (pr *ProxyResources) makeEnvoyClusterAndEndpoint(name string, protocol pbpr
 			passthrough := eg.GetPassthrough()
 			return pr.makeEnvoyPassthroughCluster(name, protocol, passthrough)
 		default:
-			return nil, nil, fmt.Errorf("unsupported endpoint group type: %s", t)
+			return nil, fmt.Errorf("unsupported endpoint group type: %s", t)
 		}
 	}
-	return nil, nil, fmt.Errorf("no endpoint group")
+	return nil, fmt.Errorf("no endpoint group")
 }
 
-func (pr *ProxyResources) makeEnvoyDynamicClusterAndEndpoint(name string, protocol pbproxystate.Protocol,
-	dynamic *pbproxystate.DynamicEndpointGroup) (*envoy_cluster_v3.Cluster, map[string]*envoy_endpoint_v3.ClusterLoadAssignment, error) {
+func (pr *ProxyResources) makeEnvoyDynamicCluster(name string, protocol pbproxystate.Protocol, 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},
@@ -101,7 +118,7 @@ func (pr *ProxyResources) makeEnvoyDynamicClusterAndEndpoint(name string, protoc
 	}
 	err := addHttpProtocolOptions(protocol, cluster)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	if dynamic.Config != nil {
 		if dynamic.Config.UseAltStatName {
@@ -120,31 +137,23 @@ func (pr *ProxyResources) makeEnvoyDynamicClusterAndEndpoint(name string, protoc
 
 		err := addEnvoyLBToCluster(dynamic.Config, cluster)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 	}
 
 	if dynamic.OutboundTls != nil {
 		envoyTransportSocket, err := pr.makeEnvoyTransportSocket(dynamic.OutboundTls)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		cluster.TransportSocket = envoyTransportSocket
 	}
 
-	// Generate Envoy endpoint
-	endpointResources := make(map[string]*envoy_endpoint_v3.ClusterLoadAssignment)
-	if endpointList, ok := pr.proxyState.Endpoints[cluster.Name]; ok {
-		protoEndpoint := makeEnvoyClusterLoadAssignment(cluster.Name, endpointList.Endpoints)
-		endpointResources[cluster.Name] = protoEndpoint
-	}
-
-	return cluster, endpointResources, nil
+	return cluster, nil
 
 }
 
-func (pr *ProxyResources) makeEnvoyStaticClusterAndEndpoint(name string, protocol pbproxystate.Protocol,
-	static *pbproxystate.StaticEndpointGroup) (*envoy_cluster_v3.Cluster, map[string]*envoy_endpoint_v3.ClusterLoadAssignment, error) {
+func (pr *ProxyResources) makeEnvoyStaticCluster(name string, protocol pbproxystate.Protocol, 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},
@@ -163,23 +172,21 @@ func (pr *ProxyResources) makeEnvoyStaticClusterAndEndpoint(name string, protoco
 		err = addHttpProtocolOptions(protocol, cluster)
 	}
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	if static.Config != nil {
 		cluster.ConnectTimeout = static.Config.ConnectTimeout
 		addEnvoyCircuitBreakers(static.GetConfig().CircuitBreakers, cluster)
 	}
-	return cluster, nil, nil
+	return cluster, nil
 }
 
-func (pr *ProxyResources) makeEnvoyDnsCluster(name string, protocol pbproxystate.Protocol,
-	dns *pbproxystate.DNSEndpointGroup) (*envoy_cluster_v3.Cluster, map[string]*envoy_endpoint_v3.ClusterLoadAssignment, error) {
-	return nil, nil, nil
+func (pr *ProxyResources) makeEnvoyDnsCluster(name string, protocol pbproxystate.Protocol, dns *pbproxystate.DNSEndpointGroup) (*envoy_cluster_v3.Cluster, error) {
+	return nil, nil
 }
 
-func (pr *ProxyResources) makeEnvoyPassthroughCluster(name string, protocol pbproxystate.Protocol,
-	passthrough *pbproxystate.PassthroughEndpointGroup) (*envoy_cluster_v3.Cluster, map[string]*envoy_endpoint_v3.ClusterLoadAssignment, error) {
+func (pr *ProxyResources) makeEnvoyPassthroughCluster(name string, protocol pbproxystate.Protocol, passthrough *pbproxystate.PassthroughEndpointGroup) (*envoy_cluster_v3.Cluster, error) {
 	cluster := &envoy_cluster_v3.Cluster{
 		Name:                 name,
 		ConnectTimeout:       passthrough.Config.ConnectTimeout,
@@ -189,47 +196,37 @@ func (pr *ProxyResources) makeEnvoyPassthroughCluster(name string, protocol pbpr
 	if passthrough.OutboundTls != nil {
 		envoyTransportSocket, err := pr.makeEnvoyTransportSocket(passthrough.OutboundTls)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 		cluster.TransportSocket = envoyTransportSocket
 	}
 	err := addHttpProtocolOptions(protocol, cluster)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	return cluster, nil, nil
+	return cluster, nil
 }
 
-func (pr *ProxyResources) makeEnvoyAggregateClusterAndEndpoint(name string, protocol pbproxystate.Protocol,
-	fg *pbproxystate.FailoverGroup) (map[string]*envoy_cluster_v3.Cluster, map[string]*envoy_endpoint_v3.ClusterLoadAssignment, error) {
-	clusters := make(map[string]*envoy_cluster_v3.Cluster)
-	endpointResources := make(map[string]*envoy_endpoint_v3.ClusterLoadAssignment)
+func (pr *ProxyResources) makeEnvoyAggregateCluster(name string, protocol pbproxystate.Protocol, 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, eps, err := pr.makeEnvoyClusterAndEndpoint(eg.Name, protocol, eg)
+			cluster, err := pr.makeEnvoyCluster(eg.Name, protocol, eg)
 			if err != nil {
-				return nil, eps, err
+				return nil, err
 			}
 			egNames = append(egNames, cluster.Name)
-
-			// add failover cluster
-			clusters[cluster.Name] = cluster
-
-			// add endpoint for failover cluster
-			if ep, ok := eps[cluster.Name]; ok {
-				endpointResources[cluster.Name] = ep
-			}
+			clusters = append(clusters, cluster)
 		}
 		aggregateClusterConfig, err := anypb.New(&envoy_aggregate_cluster_v3.ClusterConfig{
 			Clusters: egNames,
 		})
 
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
-		// create aggregate cluster
 		c := &envoy_cluster_v3.Cluster{
 			Name:           name,
 			ConnectTimeout: fg.Config.ConnectTimeout,
@@ -246,19 +243,11 @@ func (pr *ProxyResources) makeEnvoyAggregateClusterAndEndpoint(name string, prot
 		}
 		err = addHttpProtocolOptions(protocol, c)
 		if err != nil {
-			return nil, nil, err
-		}
-
-		// add aggregate cluster
-		clusters[c.Name] = c
-
-		// add endpoint for aggregate cluster
-		if endpointList, ok := pr.proxyState.Endpoints[c.Name]; ok {
-			protoEndpoint := makeEnvoyClusterLoadAssignment(c.Name, endpointList.Endpoints)
-			endpointResources[c.Name] = protoEndpoint
+			return nil, err
 		}
+		clusters = append(clusters, c)
 	}
-	return clusters, endpointResources, nil
+	return clusters, nil
 }
 
 func addLocalAppHttpProtocolOptions(protocol pbproxystate.Protocol, c *envoy_cluster_v3.Cluster) error {
@@ -387,19 +376,9 @@ func addEnvoyLBToCluster(dynamicConfig *pbproxystate.DynamicEndpointGroupConfig,
 	return nil
 }
 
-func (pr *ProxyResources) makeEnvoyClustersAndEndpointsFromL4Destination(l4 *pbproxystate.L4Destination) error {
-	switch l4.Destination.(type) {
-	case *pbproxystate.L4Destination_Cluster:
-		pr.addEnvoyClustersAndEndpointsToEnvoyResources(l4.GetCluster().GetName())
-
-	case *pbproxystate.L4Destination_WeightedClusters:
-		psWeightedClusters := l4.GetWeightedClusters()
-		for _, psCluster := range psWeightedClusters.GetClusters() {
-			pr.addEnvoyClustersAndEndpointsToEnvoyResources(psCluster.Name)
-		}
-	default:
-		return errors.New("cluster group type should be Endpoint Group or Failover Group")
-	}
-
+// 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
index ce81d5cad0f60..fa3d39d8779fe 100644
--- a/agent/xdsv2/endpoint_resources.go
+++ b/agent/xdsv2/endpoint_resources.go
@@ -7,7 +7,9 @@ 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 {
@@ -44,3 +46,16 @@ func makeEnvoyClusterLoadAssignment(clusterName string, endpoints []*pbproxystat
 		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
index 29c0e42af0e0b..1ccfb42a6d5e1 100644
--- a/agent/xdsv2/listener_resources.go
+++ b/agent/xdsv2/listener_resources.go
@@ -42,16 +42,18 @@ const (
 	envoyHttpConnectionManagerFilterName       = "envoy.filters.network.http_connection_manager"
 )
 
-func (pr *ProxyResources) makeEnvoyResourceGraphsStartingFromListeners() error {
+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 err
+			return nil, err
 		}
-		pr.envoyResources[xdscommon.ListenerType][protoListener.Name] = protoListener
+		listeners = append(listeners, protoListener)
 	}
-	return nil
+	return listeners, nil
 }
 
 func (pr *ProxyResources) makeListener(listener *pbproxystate.Listener) (*envoy_listener_v3.Listener, error) {
@@ -303,11 +305,11 @@ func (pr *ProxyResources) makeEnvoyResourcesForSNIDestination(sni *pbproxystate.
 }
 
 func (pr *ProxyResources) makeEnvoyResourcesForL4Destination(l4 *pbproxystate.Router_L4) ([]*envoy_listener_v3.Filter, error) {
-	err := pr.makeEnvoyClustersAndEndpointsFromL4Destination(l4.L4)
+	err := pr.makeEnvoyClusterFromL4Destination(l4.L4)
 	if err != nil {
 		return nil, err
 	}
-	envoyFilters, err := pr.makeL4Filters(l4.L4)
+	envoyFilters, err := makeL4Filters(l4.L4)
 	return envoyFilters, err
 }
 
@@ -332,7 +334,7 @@ func getAlpnProtocols(protocol pbproxystate.L7Protocol) []string {
 	return alpnProtocols
 }
 
-func (pr *ProxyResources) makeL4Filters(l4 *pbproxystate.L4Destination) ([]*envoy_listener_v3.Filter, error) {
+func makeL4Filters(l4 *pbproxystate.L4Destination) ([]*envoy_listener_v3.Filter, error) {
 	var envoyFilters []*envoy_listener_v3.Filter
 	if l4 != nil {
 		rbacFilters, err := MakeRBACNetworkFilters(l4.TrafficPermissions)
@@ -440,7 +442,7 @@ func (pr *ProxyResources) makeL7Filters(l7 *pbproxystate.L7Destination) ([]*envo
 			}
 		} else {
 			// Add Envoy route under the route resource since it's not inlined.
-			pr.envoyResources[xdscommon.RouteType][routeConfig.Name] = routeConfig
+			pr.envoyResources[xdscommon.RouteType] = append(pr.envoyResources[xdscommon.RouteType], routeConfig)
 
 			httpConnMgr.RouteSpecifier = &envoy_http_v3.HttpConnectionManager_Rds{
 				Rds: &envoy_http_v3.Rds{
diff --git a/agent/xdsv2/resources.go b/agent/xdsv2/resources.go
index 1c3251930cebb..fa5f7179e6a5d 100644
--- a/agent/xdsv2/resources.go
+++ b/agent/xdsv2/resources.go
@@ -20,7 +20,6 @@ type ResourceGenerator struct {
 	ProxyFeatures xdscommon.SupportedProxyFeatures
 }
 
-// NewResourceGenerator will create a new ResourceGenerator.
 func NewResourceGenerator(
 	logger hclog.Logger,
 ) *ResourceGenerator {
@@ -29,63 +28,48 @@ func NewResourceGenerator(
 	}
 }
 
-// ProxyResources is the main state used to convert proxyState resources to Envoy resources.
 type ProxyResources struct {
-	// proxyState is the final proxyState computed by Consul controllers.
-	proxyState *proxytracker.ProxyState
-	// envoyResources is a map of each resource type (listener, endpoint, route, cluster, etc.)
-	// with a corresponding map of k/v pairs of resource name to envoy proto message.
-	// map[string]map[string]proto.Message is used over map[string][]proto.Message because
-	// AllResourcesFromIR() will create envoy resource by walking the object graph from listener
-	// to endpoint.  In the process, the same resource might be referenced more than once,
-	// so the map is used to prevent duplicate resources being created and also will use
-	// an O(1) lookup to see if it exists (it actually will set the map key rather than
-	// checks everywhere) where as each lookup would be O(n) with a []proto structure.
-	envoyResources map[string]map[string]proto.Message
+	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]map[string]proto.Message),
+		envoyResources: make(map[string][]proto.Message),
 	}
-	pr.envoyResources[xdscommon.ListenerType] = make(map[string]proto.Message)
-	pr.envoyResources[xdscommon.RouteType] = make(map[string]proto.Message)
-	pr.envoyResources[xdscommon.ClusterType] = make(map[string]proto.Message)
-	pr.envoyResources[xdscommon.EndpointType] = make(map[string]proto.Message)
-
-	err := pr.makeEnvoyResourceGraphsStartingFromListeners()
+	err := pr.generateXDSResources()
 	if err != nil {
 		return nil, fmt.Errorf("failed to generate xDS resources for ProxyState: %v", err)
 	}
+	return pr.envoyResources, nil
+}
 
-	// Now account for Clusters that did not have a destination.
-	for name := range proxyState.Clusters {
-		if _, ok := pr.envoyResources[xdscommon.ClusterType][name]; !ok {
-			pr.addEnvoyClustersAndEndpointsToEnvoyResources(name)
-		}
+func (pr *ProxyResources) generateXDSResources() error {
+	listeners, err := pr.makeXDSListeners()
+	if err != nil {
+		return err
 	}
 
-	envoyResources := convertResourceMapsToResourceArrays(pr.envoyResources)
-	return envoyResources, nil
-}
+	pr.envoyResources[xdscommon.ListenerType] = listeners
 
-// convertResourceMapsToResourceArrays will convert map[string]map[string]proto.Message, which is used to
-// prevent duplicate resource being created, to map[string][]proto.Message which is used by Delta server.
-func convertResourceMapsToResourceArrays(resourceMap map[string]map[string]proto.Message) map[string][]proto.Message {
-	resources := make(map[string][]proto.Message)
-	resources[xdscommon.ListenerType] = make([]proto.Message, 0)
-	resources[xdscommon.RouteType] = make([]proto.Message, 0)
-	resources[xdscommon.ClusterType] = make([]proto.Message, 0)
-	resources[xdscommon.EndpointType] = make([]proto.Message, 0)
+	clusters, err := pr.makeXDSClusters()
+	if err != nil {
+		return err
+	}
+	pr.envoyResources[xdscommon.ClusterType] = clusters
 
-	// This conversion incurs processing cost which is done once in the generating envoy resources.
-	// This tradeoff is preferable to doing array scan every time an envoy resource needs to be
-	// to pr.envoyResource to see if it already exists.
-	for resourceTypeName, resourceMap := range resourceMap {
-		for _, resource := range resourceMap {
-			resources[resourceTypeName] = append(resources[resourceTypeName], resource)
-		}
+	endpoints, err := pr.makeXDSEndpoints()
+	if err != nil {
+		return err
 	}
-	return resources
+	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
index 1210124494e44..c1afbda705be8 100644
--- a/agent/xdsv2/resources_test.go
+++ b/agent/xdsv2/resources_test.go
@@ -54,16 +54,17 @@ func TestAllResourcesFromIR_XDSGoldenFileInputs(t *testing.T) {
 		"destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy",
 
 		//sources - please add in alphabetical order
-		"source/l7-expose-paths",
-		"source/local-and-inbound-connections",
-		"source/multiple-workload-addresses-with-specific-ports",
-		"source/multiple-workload-addresses-without-ports",
-		"source/multiport-l4-multiple-workload-addresses-with-specific-ports",
-		"source/multiport-l4-multiple-workload-addresses-without-ports",
-		"source/multiport-l4-workload-with-only-mesh-port",
-		"source/multiport-l7-multiple-workload-addresses-with-specific-ports",
-		"source/multiport-l7-multiple-workload-addresses-without-ports",
-		"source/single-workload-address-without-ports",
+		//"source/l4-multiple-workload-addresses-with-specific-ports",
+		//"source/l4-multiple-workload-addresses-without-ports",
+		//"source/l4-single-workload-address-without-ports",
+		//"source/l7-expose-paths",
+		//"source/local-and-inbound-connections",
+		//"source/multiport-l4-multiple-workload-addresses-with-specific-ports",
+		//"source/multiport-l4-multiple-workload-addresses-without-ports",
+		//"source/multiport-l4-workload-with-only-mesh-port",
+		//"source/multiport-l7-multiple-workload-addresses-with-specific-ports",
+		//"source/multiport-l7-multiple-workload-addresses-without-ports",
+		//"source/multiport-l7-multiple-workload-addresses-without-ports",
 	}
 
 	for _, name := range cases {
diff --git a/agent/xdsv2/route_resources.go b/agent/xdsv2/route_resources.go
index 073b89d22ca87..af06c174484f8 100644
--- a/agent/xdsv2/route_resources.go
+++ b/agent/xdsv2/route_resources.go
@@ -16,8 +16,21 @@ import (
 	"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
@@ -234,18 +247,6 @@ func makeEnvoyQueryParamFromProxystateQueryMatch(psMatch *pbproxystate.QueryPara
 	return envoyQueryParamMatcher
 }
 
-func (pr *ProxyResources) addEnvoyClustersAndEndpointsToEnvoyResources(clusterName string) {
-	clusters, endpoints, _ := pr.makeClustersAndEndpoints(clusterName)
-
-	for name, cluster := range clusters {
-		pr.envoyResources[xdscommon.ClusterType][name] = cluster
-	}
-
-	for name, ep := range endpoints {
-		pr.envoyResources[xdscommon.EndpointType][name] = ep
-	}
-}
-
 // 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 {
@@ -259,15 +260,16 @@ func (pr *ProxyResources) makeEnvoyRouteActionFromProxystateRouteDestination(psR
 		envoyRouteRoute.Route.ClusterSpecifier = &envoy_route_v3.RouteAction_Cluster{
 			Cluster: psCluster.GetName(),
 		}
-		pr.addEnvoyClustersAndEndpointsToEnvoyResources(psCluster.Name)
+		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() {
-			pr.addEnvoyClustersAndEndpointsToEnvoyResources(psCluster.Name)
-
+			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))
 		}
@@ -316,7 +318,10 @@ func (pr *ProxyResources) makeEnvoyRouteActionFromProxystateRouteDestination(psR
 }
 
 func makeEnvoyClusterWeightFromProxystateWeightedCluster(cluster *pbproxystate.L7WeightedDestinationCluster) *envoy_route_v3.WeightedCluster_ClusterWeight {
-	envoyClusterWeight := makeEnvoyClusterWeightFromNameAndWeight(cluster.GetName(), cluster.GetWeight())
+	envoyClusterWeight := &envoy_route_v3.WeightedCluster_ClusterWeight{
+		Name:   cluster.GetName(),
+		Weight: cluster.GetWeight(),
+	}
 
 	for _, hm := range cluster.GetHeaderMutations() {
 		injectEnvoyClusterWeightWithProxystateHeaderMutation(envoyClusterWeight, hm)
@@ -325,15 +330,6 @@ func makeEnvoyClusterWeightFromProxystateWeightedCluster(cluster *pbproxystate.L
 	return envoyClusterWeight
 }
 
-func makeEnvoyClusterWeightFromNameAndWeight(name string, weight *wrapperspb.UInt32Value) *envoy_route_v3.WeightedCluster_ClusterWeight {
-	envoyClusterWeight := &envoy_route_v3.WeightedCluster_ClusterWeight{
-		Name:   name,
-		Weight: weight,
-	}
-
-	return envoyClusterWeight
-}
-
 func injectEnvoyClusterWeightWithProxystateHeaderMutation(envoyClusterWeight *envoy_route_v3.WeightedCluster_ClusterWeight, mutation *pbproxystate.HeaderMutation) {
 	mutation.GetAction()
 	switch mutation.GetAction().(type) {
diff --git a/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination.golden b/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination.golden
index b87031ba81b1b..280f42b8581f5 100644
--- a/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination.golden
+++ b/agent/xdsv2/testdata/clusters/destination/mixed-multi-destination.golden
@@ -1,270 +1,157 @@
 {
-  "versionInfo": "00000001",
-  "resources": [
+  "versionInfo":  "00000001",
+  "resources":  [
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul",
-      "type": "EDS",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "http.api-2.default.dc1.internal.foo.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "connectTimeout": "55s",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "connectTimeout":  "5s",
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
       },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "tlsCertificates": [
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "validationContext": {
-              "trustedCa": {
-                "inlineString": "some-root\nsome-other-root\n"
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "some-root\nsome-other-root\n"
               },
-              "matchSubjectAltNames": [
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
+                  "exact":  "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
                 }
               ]
             },
-            "alpnProtocols": [
+            "alpnProtocols":  [
               "consul~http"
             ]
           },
-          "sni": "api-1.default.dc1.internal.foo.consul"
+          "sni":  "api-2.default.dc1.internal.foo.consul"
         }
       }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name": "failover-target~1~http.api-1.default.dc1.internal.foo.consul",
-      "type": "EDS",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "connectTimeout": "5s",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "validationContext": {
-              "trustedCa": {
-                "inlineString": "some-root\nsome-other-root\n"
-              },
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://foo.consul/ap/default/ns/default/identity/backup1-identity"
-                }
-              ]
-            },
-            "alpnProtocols": [
-              "consul~http"
-            ]
-          },
-          "sni": "backup-1.default.dc1.internal.foo.consul"
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name": "http.api-1.default.dc1.internal.foo.consul",
-      "altStatName": "http.api-1.default.dc1.internal.foo.consul",
-      "clusterType": {
-        "name": "envoy.clusters.aggregate",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.clusters.aggregate.v3.ClusterConfig",
-          "clusters": [
-            "failover-target~0~http.api-1.default.dc1.internal.foo.consul",
-            "failover-target~1~http.api-1.default.dc1.internal.foo.consul"
-          ]
-        }
-      },
-      "connectTimeout": "55s",
-      "lbPolicy": "CLUSTER_PROVIDED"
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name": "http.api-2.default.dc1.internal.foo.consul",
-      "type": "EDS",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
-        }
-      },
-      "connectTimeout": "5s",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
-      },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "tlsCertificates": [
-              {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                }
-              }
-            ],
-            "validationContext": {
-              "trustedCa": {
-                "inlineString": "some-root\nsome-other-root\n"
-              },
-              "matchSubjectAltNames": [
-                {
-                  "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
-                }
-              ]
-            },
-            "alpnProtocols": [
-              "consul~http"
-            ]
-          },
-          "sni": "api-2.default.dc1.internal.foo.consul"
-        }
-      }
-    },
-    {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name": "null_route_cluster",
-      "type": "STATIC",
-      "connectTimeout": "10s"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "null_route_cluster",
+      "type":  "STATIC",
+      "connectTimeout":  "10s"
     },
     {
-      "@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"
+      "@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"
         }
       },
-      "connectTimeout": "5s",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "connectTimeout":  "5s",
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
       },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "tlsCertificates": [
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "validationContext": {
-              "trustedCa": {
-                "inlineString": "some-root\nsome-other-root\n"
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "some-root\nsome-other-root\n"
               },
-              "matchSubjectAltNames": [
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
+                  "exact":  "spiffe://foo.consul/ap/default/ns/default/identity/api1-identity"
                 }
               ]
             },
-            "alpnProtocols": [
+            "alpnProtocols":  [
               "consul~tcp"
             ]
           },
-          "sni": "api-1.default.dc1.internal.foo.consul"
+          "sni":  "api-1.default.dc1.internal.foo.consul"
         }
       }
     },
     {
-      "@type": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name": "tcp.api-2.default.dc1.internal.foo.consul",
-      "type": "EDS",
-      "edsClusterConfig": {
-        "edsConfig": {
-          "ads": {},
-          "resourceApiVersion": "V3"
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "tcp.api-2.default.dc1.internal.foo.consul",
+      "type":  "EDS",
+      "edsClusterConfig":  {
+        "edsConfig":  {
+          "ads":  {},
+          "resourceApiVersion":  "V3"
         }
       },
-      "connectTimeout": "5s",
-      "commonLbConfig": {
-        "healthyPanicThreshold": {}
+      "connectTimeout":  "5s",
+      "commonLbConfig":  {
+        "healthyPanicThreshold":  {}
       },
-      "transportSocket": {
-        "name": "tls",
-        "typedConfig": {
-          "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
-          "commonTlsContext": {
-            "tlsParams": {},
-            "tlsCertificates": [
+      "transportSocket":  {
+        "name":  "tls",
+        "typedConfig":  {
+          "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.UpstreamTlsContext",
+          "commonTlsContext":  {
+            "tlsParams":  {},
+            "tlsCertificates":  [
               {
-                "certificateChain": {
-                  "inlineString": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
+                "certificateChain":  {
+                  "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
                 },
-                "privateKey": {
-                  "inlineString": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+                "privateKey":  {
+                  "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
                 }
               }
             ],
-            "validationContext": {
-              "trustedCa": {
-                "inlineString": "some-root\nsome-other-root\n"
+            "validationContext":  {
+              "trustedCa":  {
+                "inlineString":  "some-root\nsome-other-root\n"
               },
-              "matchSubjectAltNames": [
+              "matchSubjectAltNames":  [
                 {
-                  "exact": "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
+                  "exact":  "spiffe://foo.consul/ap/default/ns/default/identity/api2-identity"
                 }
               ]
             },
-            "alpnProtocols": [
+            "alpnProtocols":  [
               "consul~tcp"
             ]
           },
-          "sni": "api-2.default.dc1.internal.foo.consul"
+          "sni":  "api-2.default.dc1.internal.foo.consul"
         }
       }
     }
   ],
-  "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-  "nonce": "00000001"
+  "typeUrl":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+  "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/clusters/source/l4-multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/clusters/source/l4-multiple-workload-addresses-with-specific-ports.golden
new file mode 100644
index 0000000000000..ce9870c06cd9d
--- /dev/null
+++ b/agent/xdsv2/testdata/clusters/source/l4-multiple-workload-addresses-with-specific-ports.golden
@@ -0,0 +1,31 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app:port1",
+      "type":  "STATIC",
+      "loadAssignment":  {
+        "clusterName":  "local_app:port1",
+        "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/xdsv2/testdata/clusters/source/l4-multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/clusters/source/l4-multiple-workload-addresses-without-ports.golden
new file mode 100644
index 0000000000000..ce9870c06cd9d
--- /dev/null
+++ b/agent/xdsv2/testdata/clusters/source/l4-multiple-workload-addresses-without-ports.golden
@@ -0,0 +1,31 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app:port1",
+      "type":  "STATIC",
+      "loadAssignment":  {
+        "clusterName":  "local_app:port1",
+        "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/xdsv2/testdata/clusters/source/l4-single-workload-address-without-ports.golden b/agent/xdsv2/testdata/clusters/source/l4-single-workload-address-without-ports.golden
new file mode 100644
index 0000000000000..ce9870c06cd9d
--- /dev/null
+++ b/agent/xdsv2/testdata/clusters/source/l4-single-workload-address-without-ports.golden
@@ -0,0 +1,31 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
+      "name":  "local_app:port1",
+      "type":  "STATIC",
+      "loadAssignment":  {
+        "clusterName":  "local_app:port1",
+        "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/xdsv2/testdata/clusters/source/multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-with-specific-ports.golden
deleted file mode 100644
index 0d7d009aa1027..0000000000000
--- a/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-with-specific-ports.golden
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "local_app:grpc",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:grpc",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8083
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "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":  "local_app:http",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:http",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8081
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "local_app:http2",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:http2",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8082
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "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":  "local_app:tcp",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:tcp",
-        "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/xdsv2/testdata/clusters/source/multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-without-ports.golden
deleted file mode 100644
index 0d7d009aa1027..0000000000000
--- a/agent/xdsv2/testdata/clusters/source/multiple-workload-addresses-without-ports.golden
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "local_app:grpc",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:grpc",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8083
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "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":  "local_app:http",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:http",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8081
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "local_app:http2",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:http2",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8082
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "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":  "local_app:tcp",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:tcp",
-        "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/xdsv2/testdata/clusters/source/single-workload-address-without-ports.golden b/agent/xdsv2/testdata/clusters/source/single-workload-address-without-ports.golden
deleted file mode 100644
index 0d7d009aa1027..0000000000000
--- a/agent/xdsv2/testdata/clusters/source/single-workload-address-without-ports.golden
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "local_app:grpc",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:grpc",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8083
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "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":  "local_app:http",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:http",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8081
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    },
-    {
-      "@type":  "type.googleapis.com/envoy.config.cluster.v3.Cluster",
-      "name":  "local_app:http2",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:http2",
-        "endpoints":  [
-          {
-            "lbEndpoints":  [
-              {
-                "endpoint":  {
-                  "address":  {
-                    "socketAddress":  {
-                      "address":  "127.0.0.1",
-                      "portValue":  8082
-                    }
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "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":  "local_app:tcp",
-      "type":  "STATIC",
-      "loadAssignment":  {
-        "clusterName":  "local_app:tcp",
-        "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/xdsv2/testdata/endpoints/source/l4-multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/endpoints/source/l4-multiple-workload-addresses-with-specific-ports.golden
new file mode 100644
index 0000000000000..b0c31e6e79c77
--- /dev/null
+++ b/agent/xdsv2/testdata/endpoints/source/l4-multiple-workload-addresses-with-specific-ports.golden
@@ -0,0 +1,27 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:port1",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/l4-multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/endpoints/source/l4-multiple-workload-addresses-without-ports.golden
new file mode 100644
index 0000000000000..b0c31e6e79c77
--- /dev/null
+++ b/agent/xdsv2/testdata/endpoints/source/l4-multiple-workload-addresses-without-ports.golden
@@ -0,0 +1,27 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:port1",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/l4-single-workload-address-without-ports.golden b/agent/xdsv2/testdata/endpoints/source/l4-single-workload-address-without-ports.golden
new file mode 100644
index 0000000000000..b0c31e6e79c77
--- /dev/null
+++ b/agent/xdsv2/testdata/endpoints/source/l4-single-workload-address-without-ports.golden
@@ -0,0 +1,27 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:port1",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/l7-expose-paths.golden b/agent/xdsv2/testdata/endpoints/source/l7-expose-paths.golden
index 47b46bca225bf..1ccb234c89dbc 100644
--- a/agent/xdsv2/testdata/endpoints/source/l7-expose-paths.golden
+++ b/agent/xdsv2/testdata/endpoints/source/l7-expose-paths.golden
@@ -1,5 +1,67 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "exposed_cluster_9090",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9090
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "exposed_cluster_9091",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9091
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:port1",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections.golden b/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections.golden
index 47b46bca225bf..c9e8727f031d4 100644
--- a/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections.golden
+++ b/agent/xdsv2/testdata/endpoints/source/local-and-inbound-connections.golden
@@ -1,5 +1,87 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "exposed_cluster_9090",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9090
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "exposed_cluster_9091",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9091
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:port1",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:port3",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8081
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-with-specific-ports.golden
deleted file mode 100644
index 47b46bca225bf..0000000000000
--- a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-with-specific-ports.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-without-ports.golden
deleted file mode 100644
index 47b46bca225bf..0000000000000
--- a/agent/xdsv2/testdata/endpoints/source/multiple-workload-addresses-without-ports.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden
index 47b46bca225bf..916fbc26ceab7 100644
--- a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden
+++ b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-with-specific-ports.golden
@@ -1,5 +1,47 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:admin-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:api-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9090
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports.golden
index 47b46bca225bf..916fbc26ceab7 100644
--- a/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports.golden
+++ b/agent/xdsv2/testdata/endpoints/source/multiport-l4-multiple-workload-addresses-without-ports.golden
@@ -1,5 +1,47 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:admin-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:api-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9090
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden
index 47b46bca225bf..916fbc26ceab7 100644
--- a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden
+++ b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden
@@ -1,5 +1,47 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:admin-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:api-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9090
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports.golden
index 47b46bca225bf..e3c67d2c90ae8 100644
--- a/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports.golden
+++ b/agent/xdsv2/testdata/endpoints/source/multiport-l7-multiple-workload-addresses-without-ports.golden
@@ -1,5 +1,67 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:admin-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  8080
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:api-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9090
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
+      "clusterName":  "local_app:grpc-port",
+      "endpoints":  [
+        {
+          "lbEndpoints":  [
+            {
+              "endpoint":  {
+                "address":  {
+                  "socketAddress":  {
+                    "address":  "127.0.0.1",
+                    "portValue":  9091
+                  }
+                }
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/endpoints/source/single-workload-address-without-ports.golden b/agent/xdsv2/testdata/endpoints/source/single-workload-address-without-ports.golden
deleted file mode 100644
index 47b46bca225bf..0000000000000
--- a/agent/xdsv2/testdata/endpoints/source/single-workload-address-without-ports.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "typeUrl":  "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination.golden b/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination.golden
index eae168bf8aa04..23dd5e4c6475c 100644
--- a/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination.golden
+++ b/agent/xdsv2/testdata/listeners/destination/mixed-multi-destination.golden
@@ -17,7 +17,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.http.api-1.default.default.dc1",
+                "statPrefix":  "upstream.",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},
diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
index b0477d8310e14..9cd146e6ef0d5 100644
--- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
+++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -47,7 +47,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.http.api-app.default.default.dc1",
+                "statPrefix":  "upstream.",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},
@@ -140,7 +140,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.http.api-app2.default.default.dc1",
+                "statPrefix":  "upstream.",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},
diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
index 180213b6523c0..71dec1b4db466 100644
--- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
+++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -47,7 +47,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.http.api-app.default.default.dc1",
+                "statPrefix":  "upstream.",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},
diff --git a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
index 180213b6523c0..71dec1b4db466 100644
--- a/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
+++ b/agent/xdsv2/testdata/listeners/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -47,7 +47,7 @@
               "name":  "envoy.filters.network.http_connection_manager",
               "typedConfig":  {
                 "@type":  "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager",
-                "statPrefix":  "upstream.http.api-app.default.default.dc1",
+                "statPrefix":  "upstream.",
                 "rds":  {
                   "configSource":  {
                     "ads":  {},
diff --git a/agent/xdsv2/testdata/listeners/source/l4-multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/listeners/source/l4-multiple-workload-addresses-with-specific-ports.golden
new file mode 100644
index 0000000000000..644769d8423fc
--- /dev/null
+++ b/agent/xdsv2/testdata/listeners/source/l4-multiple-workload-addresses-with-specific-ports.golden
@@ -0,0 +1,100 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener",
+      "address":  {
+        "socketAddress":  {
+          "address":  "10.0.0.2",
+          "portValue":  20000
+        }
+      },
+      "filterChains":  [
+        {
+          "filterChainMatch":  {
+            "applicationProtocols":  [
+              "consul~port1"
+            ]
+          },
+          "filters":  [
+            {
+              "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://foo.consul/ap/default/ns/default/identity/foo$"
+                              }
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
+                },
+                "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:port1"
+              }
+            }
+          ],
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
+                  {
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
+                    },
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+                    }
+                  }
+                ],
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "some-root\nsome-other-root\n"
+                  }
+                }
+              },
+              "requireClientCertificate":  true
+            }
+          }
+        }
+      ],
+      "listenerFilters":  [
+        {
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          }
+        }
+      ],
+      "trafficDirection":  "INBOUND"
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/listeners/source/l4-multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/listeners/source/l4-multiple-workload-addresses-without-ports.golden
new file mode 100644
index 0000000000000..82581d5762489
--- /dev/null
+++ b/agent/xdsv2/testdata/listeners/source/l4-multiple-workload-addresses-without-ports.golden
@@ -0,0 +1,78 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener",
+      "address":  {
+        "socketAddress":  {
+          "address":  "10.0.0.1",
+          "portValue":  20000
+        }
+      },
+      "filterChains":  [
+        {
+          "filterChainMatch":  {
+            "applicationProtocols":  [
+              "consul~port1"
+            ]
+          },
+          "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:port1"
+              }
+            }
+          ],
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
+                  {
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
+                    },
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+                    }
+                  }
+                ],
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "some-root\nsome-other-root\n"
+                  }
+                }
+              },
+              "requireClientCertificate":  true
+            }
+          }
+        }
+      ],
+      "listenerFilters":  [
+        {
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          }
+        }
+      ],
+      "trafficDirection":  "INBOUND"
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/listeners/source/l4-single-workload-address-without-ports.golden b/agent/xdsv2/testdata/listeners/source/l4-single-workload-address-without-ports.golden
new file mode 100644
index 0000000000000..82581d5762489
--- /dev/null
+++ b/agent/xdsv2/testdata/listeners/source/l4-single-workload-address-without-ports.golden
@@ -0,0 +1,78 @@
+{
+  "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+      "name":  "public_listener",
+      "address":  {
+        "socketAddress":  {
+          "address":  "10.0.0.1",
+          "portValue":  20000
+        }
+      },
+      "filterChains":  [
+        {
+          "filterChainMatch":  {
+            "applicationProtocols":  [
+              "consul~port1"
+            ]
+          },
+          "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:port1"
+              }
+            }
+          ],
+          "transportSocket":  {
+            "name":  "tls",
+            "typedConfig":  {
+              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
+              "commonTlsContext":  {
+                "tlsParams":  {},
+                "tlsCertificates":  [
+                  {
+                    "certificateChain":  {
+                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
+                    },
+                    "privateKey":  {
+                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+                    }
+                  }
+                ],
+                "validationContext":  {
+                  "trustedCa":  {
+                    "inlineString":  "some-root\nsome-other-root\n"
+                  }
+                }
+              },
+              "requireClientCertificate":  true
+            }
+          }
+        }
+      ],
+      "listenerFilters":  [
+        {
+          "name":  "envoy.filters.listener.tls_inspector",
+          "typedConfig":  {
+            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
+          }
+        }
+      ],
+      "trafficDirection":  "INBOUND"
+    }
+  ],
+  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
+  "nonce":  "00000001"
+}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports.golden
deleted file mode 100644
index cb81777262f64..0000000000000
--- a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-with-specific-ports.golden
+++ /dev/null
@@ -1,359 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name":  "public_listener",
-      "address":  {
-        "socketAddress":  {
-          "address":  "127.0.0.1",
-          "portValue":  20000
-        }
-      },
-      "filterChains":  [
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~grpc"
-            ]
-          },
-          "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:grpc",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:grpc",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:grpc"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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.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":  {}
-                },
-                "http2ProtocolOptions":  {},
-                "upgradeConfigs":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "h2",
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~http"
-            ]
-          },
-          "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:http",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:http",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:http"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~http2"
-            ]
-          },
-          "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:http2",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:http2",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:http2"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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":  {}
-                },
-                "http2ProtocolOptions":  {},
-                "upgradeConfigs":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "h2",
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~tcp"
-            ]
-          },
-          "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:tcp"
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                }
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        }
-      ],
-      "listenerFilters":  [
-        {
-          "name":  "envoy.filters.listener.tls_inspector",
-          "typedConfig":  {
-            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "trafficDirection":  "INBOUND"
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-without-ports.golden
deleted file mode 100644
index 81f3bcca70ffe..0000000000000
--- a/agent/xdsv2/testdata/listeners/source/multiple-workload-addresses-without-ports.golden
+++ /dev/null
@@ -1,359 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name":  "public_listener",
-      "address":  {
-        "socketAddress":  {
-          "address":  "10.0.0.1",
-          "portValue":  20000
-        }
-      },
-      "filterChains":  [
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~grpc"
-            ]
-          },
-          "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:grpc",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:grpc",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:grpc"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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.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":  {}
-                },
-                "http2ProtocolOptions":  {},
-                "upgradeConfigs":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "h2",
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~http"
-            ]
-          },
-          "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:http",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:http",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:http"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~http2"
-            ]
-          },
-          "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:http2",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:http2",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:http2"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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":  {}
-                },
-                "http2ProtocolOptions":  {},
-                "upgradeConfigs":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "h2",
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~tcp"
-            ]
-          },
-          "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:tcp"
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                }
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        }
-      ],
-      "listenerFilters":  [
-        {
-          "name":  "envoy.filters.listener.tls_inspector",
-          "typedConfig":  {
-            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "trafficDirection":  "INBOUND"
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/listeners/source/single-workload-address-without-ports.golden b/agent/xdsv2/testdata/listeners/source/single-workload-address-without-ports.golden
deleted file mode 100644
index 81f3bcca70ffe..0000000000000
--- a/agent/xdsv2/testdata/listeners/source/single-workload-address-without-ports.golden
+++ /dev/null
@@ -1,359 +0,0 @@
-{
-  "versionInfo":  "00000001",
-  "resources":  [
-    {
-      "@type":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-      "name":  "public_listener",
-      "address":  {
-        "socketAddress":  {
-          "address":  "10.0.0.1",
-          "portValue":  20000
-        }
-      },
-      "filterChains":  [
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~grpc"
-            ]
-          },
-          "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:grpc",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:grpc",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:grpc"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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.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":  {}
-                },
-                "http2ProtocolOptions":  {},
-                "upgradeConfigs":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "h2",
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~http"
-            ]
-          },
-          "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:http",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:http",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:http"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~http2"
-            ]
-          },
-          "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:http2",
-                  "virtualHosts":  [
-                    {
-                      "name":  "public_listener:http2",
-                      "domains":  [
-                        "*"
-                      ],
-                      "routes":  [
-                        {
-                          "match":  {
-                            "prefix":  "/"
-                          },
-                          "route":  {
-                            "cluster":  "local_app:http2"
-                          }
-                        }
-                      ]
-                    }
-                  ]
-                },
-                "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":  {}
-                },
-                "http2ProtocolOptions":  {},
-                "upgradeConfigs":  [
-                  {
-                    "upgradeType":  "websocket"
-                  }
-                ]
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                },
-                "alpnProtocols":  [
-                  "h2",
-                  "http/1.1"
-                ]
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        },
-        {
-          "filterChainMatch":  {
-            "applicationProtocols":  [
-              "consul~tcp"
-            ]
-          },
-          "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:tcp"
-              }
-            }
-          ],
-          "transportSocket":  {
-            "name":  "tls",
-            "typedConfig":  {
-              "@type":  "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext",
-              "commonTlsContext":  {
-                "tlsParams":  {},
-                "tlsCertificates":  [
-                  {
-                    "certificateChain":  {
-                      "inlineString":  "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n"
-                    },
-                    "privateKey":  {
-                      "inlineString":  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-                    }
-                  }
-                ],
-                "validationContext":  {
-                  "trustedCa":  {
-                    "inlineString":  "some-root\nsome-other-root\n"
-                  }
-                }
-              },
-              "requireClientCertificate":  true
-            }
-          }
-        }
-      ],
-      "listenerFilters":  [
-        {
-          "name":  "envoy.filters.listener.tls_inspector",
-          "typedConfig":  {
-            "@type":  "type.googleapis.com/envoy.extensions.filters.listener.tls_inspector.v3.TlsInspector"
-          }
-        }
-      ],
-      "trafficDirection":  "INBOUND"
-    }
-  ],
-  "typeUrl":  "type.googleapis.com/envoy.config.listener.v3.Listener",
-  "nonce":  "00000001"
-}
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/routes/source/l4-multiple-workload-addresses-with-specific-ports.golden
similarity index 100%
rename from agent/xdsv2/testdata/routes/source/multiple-workload-addresses-with-specific-ports.golden
rename to agent/xdsv2/testdata/routes/source/l4-multiple-workload-addresses-with-specific-ports.golden
diff --git a/agent/xdsv2/testdata/routes/source/multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/routes/source/l4-multiple-workload-addresses-without-ports.golden
similarity index 100%
rename from agent/xdsv2/testdata/routes/source/multiple-workload-addresses-without-ports.golden
rename to agent/xdsv2/testdata/routes/source/l4-multiple-workload-addresses-without-ports.golden
diff --git a/agent/xdsv2/testdata/routes/source/single-workload-address-without-ports.golden b/agent/xdsv2/testdata/routes/source/l4-single-workload-address-without-ports.golden
similarity index 100%
rename from agent/xdsv2/testdata/routes/source/single-workload-address-without-ports.golden
rename to agent/xdsv2/testdata/routes/source/l4-single-workload-address-without-ports.golden
diff --git a/agent/xdsv2/testdata/routes/source/l7-expose-paths.golden b/agent/xdsv2/testdata/routes/source/l7-expose-paths.golden
index 306f5220e7b9c..68b5239aec9ed 100644
--- a/agent/xdsv2/testdata/routes/source/l7-expose-paths.golden
+++ b/agent/xdsv2/testdata/routes/source/l7-expose-paths.golden
@@ -1,5 +1,53 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "exposed_path_route_GetHealth1235",
+      "virtualHosts":  [
+        {
+          "name":  "exposed_path_route_GetHealth1235",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "path":  "GetHealth"
+              },
+              "route":  {
+                "cluster":  "exposed_cluster_9091"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "exposed_path_route_health1234",
+      "virtualHosts":  [
+        {
+          "name":  "exposed_path_route_health1234",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "path":  "/health"
+              },
+              "route":  {
+                "cluster":  "exposed_cluster_9090"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/routes/source/local-and-inbound-connections.golden b/agent/xdsv2/testdata/routes/source/local-and-inbound-connections.golden
index 306f5220e7b9c..97c96f44bb629 100644
--- a/agent/xdsv2/testdata/routes/source/local-and-inbound-connections.golden
+++ b/agent/xdsv2/testdata/routes/source/local-and-inbound-connections.golden
@@ -1,5 +1,77 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "exposed_path_route_GetHealth1235",
+      "virtualHosts":  [
+        {
+          "name":  "exposed_path_route_GetHealth1235",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "path":  "GetHealth"
+              },
+              "route":  {
+                "cluster":  "exposed_cluster_9091"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "exposed_path_route_health1234",
+      "virtualHosts":  [
+        {
+          "name":  "exposed_path_route_health1234",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "path":  "/health"
+              },
+              "route":  {
+                "cluster":  "exposed_cluster_9090"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "public_listener:port3",
+      "virtualHosts":  [
+        {
+          "name":  "public_listener:port3",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "prefix":  "/"
+              },
+              "route":  {
+                "cluster":  "local_app:port3",
+                "timeout":  "9s"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden
index 306f5220e7b9c..3b1a61403ba7d 100644
--- a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden
+++ b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-with-specific-ports.golden
@@ -1,5 +1,53 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "public_listener:admin-port",
+      "virtualHosts":  [
+        {
+          "name":  "public_listener:admin-port",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "prefix":  "/"
+              },
+              "route":  {
+                "cluster":  "local_app:admin-port"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "public_listener:api-port",
+      "virtualHosts":  [
+        {
+          "name":  "public_listener:api-port",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "prefix":  "/"
+              },
+              "route":  {
+                "cluster":  "local_app:api-port"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports.golden b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports.golden
index 306f5220e7b9c..7f976890c64b0 100644
--- a/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports.golden
+++ b/agent/xdsv2/testdata/routes/source/multiport-l7-multiple-workload-addresses-without-ports.golden
@@ -1,5 +1,76 @@
 {
   "versionInfo":  "00000001",
+  "resources":  [
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "public_listener:admin-port",
+      "virtualHosts":  [
+        {
+          "name":  "public_listener:admin-port",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "prefix":  "/"
+              },
+              "route":  {
+                "cluster":  "local_app:admin-port"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "public_listener:api-port",
+      "virtualHosts":  [
+        {
+          "name":  "public_listener:api-port",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "prefix":  "/"
+              },
+              "route":  {
+                "cluster":  "local_app:api-port"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    },
+    {
+      "@type":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
+      "name":  "public_listener:grpc-port",
+      "virtualHosts":  [
+        {
+          "name":  "public_listener:grpc-port",
+          "domains":  [
+            "*"
+          ],
+          "routes":  [
+            {
+              "match":  {
+                "prefix":  "/"
+              },
+              "route":  {
+                "cluster":  "local_app:grpc-port"
+              }
+            }
+          ]
+        }
+      ],
+      "validateClusters":  true
+    }
+  ],
   "typeUrl":  "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce":  "00000001"
 }
\ No newline at end of file
diff --git a/api/acl.go b/api/acl.go
index fcea0fdde0828..f95e597af48ca 100644
--- a/api/acl.go
+++ b/api/acl.go
@@ -256,9 +256,6 @@ const (
 	// BindingRuleBindTypeNode binds to a node identity with given name.
 	BindingRuleBindTypeNode BindingRuleBindType = "node"
 
-	// BindingRuleBindTypePolicy binds to a specific policy with given name.
-	BindingRuleBindTypePolicy BindingRuleBindType = "policy"
-
 	// BindingRuleBindTypeTemplatedPolicy binds to a templated policy with given template name and variables.
 	BindingRuleBindTypeTemplatedPolicy BindingRuleBindType = "templated-policy"
 )
diff --git a/api/api_test.go b/api/api_test.go
index d1af29fbddf7b..4d5dd1fda8305 100644
--- a/api/api_test.go
+++ b/api/api_test.go
@@ -119,7 +119,7 @@ func makeClientWithConfig(
 	var server *testutil.TestServer
 	var err error
 	retry.RunWith(retry.ThreeTimes(), t, func(r *retry.R) {
-		server, err = testutil.NewTestServerConfigT(r, cb2)
+		server, err = testutil.NewTestServerConfigT(t, cb2)
 		if err != nil {
 			r.Fatalf("Failed to start server: %v", err.Error())
 		}
diff --git a/api/lock_test.go b/api/lock_test.go
index ee59a01abceff..4003a94632f8d 100644
--- a/api/lock_test.go
+++ b/api/lock_test.go
@@ -13,11 +13,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 )
 
-func createTestLock(t testutil.TestingTB, c *Client, key string) (*Lock, *Session) {
+func createTestLock(t *testing.T, c *Client, key string) (*Lock, *Session) {
 	t.Helper()
 	session := c.Session()
 
@@ -107,7 +106,7 @@ func TestAPI_LockForceInvalidate(t *testing.T) {
 	defer s.Stop()
 
 	retry.Run(t, func(r *retry.R) {
-		lock, session := createTestLock(r, c, "test/lock")
+		lock, session := createTestLock(t, c, "test/lock")
 		defer session.Destroy(lock.opts.Session, nil)
 
 		// Should work
diff --git a/build-support/scripts/devtools.sh b/build-support/scripts/devtools.sh
index c9a887c0ecf03..e3f6d154520b5 100755
--- a/build-support/scripts/devtools.sh
+++ b/build-support/scripts/devtools.sh
@@ -25,7 +25,6 @@ Options:
     -protobuf                Just install tools for protobuf.
     -lint                    Just install tools for linting.
     -codegen                 Just install tools for codegen.
-    -pre-commit              Just install pre-commit.
     -h | --help              Print this help text.
 EOF
 }
@@ -52,10 +51,6 @@ function main {
                 codegen_install
                 return 0
                 ;;
-            -pre-commit )
-                pre_commit_install
-                return 0
-                ;;
             -h | --help )
                 usage
                 return 0
@@ -143,13 +138,9 @@ function proto_tools_install {
 function lint_install {
     local lint_consul_retry_version
     lint_consul_retry_version="$(make --no-print-directory print-LINT_CONSUL_RETRY_VERSION)"
-    
     local golangci_lint_version
     golangci_lint_version="$(make --no-print-directory print-GOLANGCI_LINT_VERSION)"
 
-    local gci_version
-    gci_version="$(make --no-print-directory print-GCI_VERSION)"
-
     install_versioned_tool \
         'lint-consul-retry' \
         'github.com/hashicorp/lint-consul-retry' \
@@ -165,12 +156,6 @@ function lint_install {
         'github.com/golangci/golangci-lint' \
         "${golangci_lint_version}" \
         'github.com/golangci/golangci-lint/cmd/golangci-lint'
-
-    install_versioned_tool \
-        'gci' \
-        'github.com/daixiang0/gci' \
-        "${gci_version}" \
-        'github.com/daixiang0/gci'
 }
 
 function codegen_install {
@@ -200,50 +185,11 @@ function copywrite_install {
         'github.com/hashicorp/copywrite'
 }
 
-function pre_commit_install {
-    # if already installed make sure the hook is also installed
-    if command -v "pre-commit" &>/dev/null; then
-        # Not to be confused with installing the tool, this installs
-        # the git hook locally (.git/hooks/pre-commit) which pre-commit
-        # uses as a vector to run checks on `git commit`. This hook is
-        # generated based on the local environment hence not source
-        # controlled.
-        pre-commit install
-        return 0
-    fi
-
-    # Install options based on https://pre-commit.com/#installation
-    if command -v "brew" &>/dev/null; then
-        brew install pre-commit && pre-commit install
-        return 0
-    fi
-
-    # Try python regardless of platform (mac, linux, etc)
-    if command -v "pip3" &>/dev/null; then
-        pip3 install pre-commit && pre-commit install
-        return 0
-    fi
-
-    # Can't disappoint the linux/debian folks
-    if command -v "apt" &>/dev/null; then
-        sudo apt-get install -yq pre-commit && pre-commit install
-        return 0
-    fi
-
-    if [[ "$(uname)" == "Darwin" ]]; then
-        echo "ERROR: Install homebrew from https://brew.sh/ so that pre-commit (https://pre-commit.com) can be installed."
-        return 1
-    fi
-
-    echo "ERROR: Install python3 and pip3 so that pre-commit (https://pre-commit.com) can be installed."
-    return 1
-}
-
 function tools_install {
+
     lint_install
     proto_tools_install
     codegen_install
-    pre_commit_install
     copywrite_install
 
     return 0
diff --git a/command/acl/bindingrule/create/bindingrule_create.go b/command/acl/bindingrule/create/bindingrule_create.go
index 0b09a5eb2f0cc..ab6a16f3ed5c3 100644
--- a/command/acl/bindingrule/create/bindingrule_create.go
+++ b/command/acl/bindingrule/create/bindingrule_create.go
@@ -73,7 +73,7 @@ func (c *cmd) init() {
 		&c.bindType,
 		"bind-type",
 		string(api.BindingRuleBindTypeService),
-		"Type of binding to perform (\"service\", \"role\", \"node\", \"policy\",  or \"templated-policy\").",
+		"Type of binding to perform (\"service\", \"role\", \"node\"  or \"templated-policy\").",
 	)
 	c.flags.Var(
 		(*flags.FlagMapValue)(&c.bindVars),
diff --git a/command/acl/bindingrule/update/bindingrule_update.go b/command/acl/bindingrule/update/bindingrule_update.go
index 40c03cab546e6..ce7006748728d 100644
--- a/command/acl/bindingrule/update/bindingrule_update.go
+++ b/command/acl/bindingrule/update/bindingrule_update.go
@@ -77,7 +77,7 @@ func (c *cmd) init() {
 		&c.bindType,
 		"bind-type",
 		string(api.BindingRuleBindTypeService),
-		"Type of binding to perform (\"service\", \"policy\", or \"role\").",
+		"Type of binding to perform (\"service\" or \"role\").",
 	)
 	c.flags.StringVar(
 		&c.bindName,
diff --git a/command/acl/bindingrule/update/bindingrule_update_test.go b/command/acl/bindingrule/update/bindingrule_update_test.go
index c873aadcb4898..1bbcd35cc25d9 100644
--- a/command/acl/bindingrule/update/bindingrule_update_test.go
+++ b/command/acl/bindingrule/update/bindingrule_update_test.go
@@ -242,39 +242,6 @@ func TestBindingRuleUpdateCommand(t *testing.T) {
 		require.Equal(t, "serviceaccount.namespace==alt and serviceaccount.name==demo", rule.Selector)
 	})
 
-	t.Run("update all fields with 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", "policy",
-			"-bind-name=policy-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, "policy-updated", rule.BindName)
-		require.Equal(t, api.BindingRuleBindTypePolicy, rule.BindType)
-		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)
 
diff --git a/command/connect/envoy/exec_test.go b/command/connect/envoy/exec_test.go
index 332dd77a4fe7c..e949019e8235e 100644
--- a/command/connect/envoy/exec_test.go
+++ b/command/connect/envoy/exec_test.go
@@ -355,9 +355,6 @@ func patchExecArgs(t *testing.T) {
 }
 
 func TestMakeBootstrapPipe_DoesNotBlockOnAFullPipe(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
 	// A named pipe can buffer up to 64k, use a value larger than that
 	bootstrap := bytes.Repeat([]byte("a"), 66000)
 
diff --git a/command/registry.go b/command/registry.go
index 1a403aa11f261..604b0033b72f3 100644
--- a/command/registry.go
+++ b/command/registry.go
@@ -133,7 +133,6 @@ import (
 	tlscert "github.com/hashicorp/consul/command/tls/cert"
 	tlscertcreate "github.com/hashicorp/consul/command/tls/cert/create"
 	"github.com/hashicorp/consul/command/troubleshoot"
-	troubleshootports "github.com/hashicorp/consul/command/troubleshoot/ports"
 	troubleshootproxy "github.com/hashicorp/consul/command/troubleshoot/proxy"
 	troubleshootupstreams "github.com/hashicorp/consul/command/troubleshoot/upstreams"
 	"github.com/hashicorp/consul/command/validate"
@@ -276,7 +275,6 @@ func RegisteredCommands(ui cli.Ui) map[string]mcli.CommandFactory {
 		entry{"troubleshoot", func(ui cli.Ui) (cli.Command, error) { return troubleshoot.New(), nil }},
 		entry{"troubleshoot proxy", func(ui cli.Ui) (cli.Command, error) { return troubleshootproxy.New(ui), nil }},
 		entry{"troubleshoot upstreams", func(ui cli.Ui) (cli.Command, error) { return troubleshootupstreams.New(ui), nil }},
-		entry{"troubleshoot ports", func(ui cli.Ui) (cli.Command, error) { return troubleshootports.New(ui), nil }},
 		entry{"validate", func(ui cli.Ui) (cli.Command, error) { return validate.New(ui), nil }},
 		entry{"version", func(ui cli.Ui) (cli.Command, error) { return version.New(ui), nil }},
 		entry{"watch", func(ui cli.Ui) (cli.Command, error) { return watch.New(ui, MakeShutdownCh()), nil }},
diff --git a/command/resource/client/client.go b/command/resource/client/client.go
index e43bef014ce4f..0d0d59e2df996 100644
--- a/command/resource/client/client.go
+++ b/command/resource/client/client.go
@@ -19,11 +19,10 @@ import (
 	"sync"
 	"time"
 
+	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/go-cleanhttp"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-rootcerts"
-
-	"github.com/hashicorp/consul/api"
 )
 
 // NOTE: This client is copied from the api module to temporarily facilitate the resource cli commands
@@ -73,6 +72,12 @@ const (
 	// 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"
diff --git a/command/resource/client/grpc-client.go b/command/resource/client/grpc-client.go
deleted file mode 100644
index d9f71488adbf2..0000000000000
--- a/command/resource/client/grpc-client.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package client
-
-import (
-	"fmt"
-
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials/insecure"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type GRPCClient struct {
-	Client pbresource.ResourceServiceClient
-	Config *GRPCConfig
-	Conn   *grpc.ClientConn
-}
-
-func NewGRPCClient(config *GRPCConfig) (*GRPCClient, error) {
-	conn, err := dial(config)
-	if err != nil {
-		return nil, fmt.Errorf("**** error dialing grpc: %+v", err)
-	}
-	return &GRPCClient{
-		Client: pbresource.NewResourceServiceClient(conn),
-		Config: config,
-		Conn:   conn,
-	}, nil
-}
-
-func dial(c *GRPCConfig) (*grpc.ClientConn, error) {
-	// TODO: decide if we use TLS mode based on the config
-	dialOpts := []grpc.DialOption{
-		grpc.WithTransportCredentials(insecure.NewCredentials()),
-	}
-	return grpc.Dial(c.Address, dialOpts...)
-}
diff --git a/command/resource/client/grpc-client_test.go b/command/resource/client/grpc-client_test.go
deleted file mode 100644
index c6fe8da15582e..0000000000000
--- a/command/resource/client/grpc-client_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package client
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/proto"
-
-	"github.com/hashicorp/consul/agent"
-	"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"
-	"github.com/hashicorp/consul/testrpc"
-)
-
-func TestResourceRead(t *testing.T) {
-	t.Parallel()
-
-	a := agent.NewTestAgent(t, "ports { grpc = 8502 }")
-	testrpc.WaitForTestAgent(t, a.RPC, "dc1")
-	grpcConfig := GetDefaultGRPCConfig()
-	gRPCClient, err := NewGRPCClient(grpcConfig)
-
-	t.Cleanup(func() {
-		a.Shutdown()
-		gRPCClient.Conn.Close()
-	})
-
-	t.Run("test", func(t *testing.T) {
-		if err != nil {
-			fmt.Println("error when create new grpc client")
-		}
-
-		v2Artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		writeRsp, err := gRPCClient.Client.Write(testutil.TestContext(t), &pbresource.WriteRequest{Resource: v2Artist})
-		require.NoError(t, err)
-
-		readRsp, err := gRPCClient.Client.Read(context.Background(), &pbresource.ReadRequest{Id: v2Artist.Id})
-		require.NoError(t, err)
-		require.Equal(t, proto.Equal(readRsp.Resource.Id.Type, demo.TypeV2Artist), true)
-		prototest.AssertDeepEqual(t, writeRsp.Resource, readRsp.Resource)
-	})
-}
diff --git a/command/resource/client/grpc-config.go b/command/resource/client/grpc-config.go
deleted file mode 100644
index e6d990995c8dd..0000000000000
--- a/command/resource/client/grpc-config.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package client
-
-import (
-	"os"
-)
-
-const (
-	// GRPCAddrEnvName defines an environment variable name which sets the gRPC
-	// server address for the consul CLI.
-	GRPCAddrEnvName = "CONSUL_GRPC_ADDR"
-)
-
-type GRPCConfig struct {
-	Address string
-}
-
-func GetDefaultGRPCConfig() *GRPCConfig {
-	return &GRPCConfig{
-		Address: "localhost:8502",
-	}
-}
-
-func LoadGRPCConfig(defaultConfig *GRPCConfig) *GRPCConfig {
-	if defaultConfig == nil {
-		defaultConfig = GetDefaultGRPCConfig()
-	}
-
-	overwrittenConfig := loadEnvToDefaultConfig(defaultConfig)
-
-	return overwrittenConfig
-}
-
-func loadEnvToDefaultConfig(config *GRPCConfig) *GRPCConfig {
-
-	if addr := os.Getenv(GRPCAddrEnvName); addr != "" {
-		config.Address = addr
-	}
-
-	return config
-}
diff --git a/command/resource/client/grpc-flags.go b/command/resource/client/grpc-flags.go
deleted file mode 100644
index bc1d89c5a9482..0000000000000
--- a/command/resource/client/grpc-flags.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package client
-
-import (
-	"flag"
-)
-
-type GRPCFlags struct {
-	address StringValue
-}
-
-// mergeFlagsIntoGRPCConfig merges flag values into grpc config
-// caller has to parse the CLI args before loading them into flag values
-func (f *GRPCFlags) mergeFlagsIntoGRPCConfig(c *GRPCConfig) {
-	f.address.Merge(&c.Address)
-}
-
-func (f *GRPCFlags) ClientFlags() *flag.FlagSet {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.Var(&f.address, "grpc-addr",
-		"The `address` and port of the Consul GRPC agent. The value can be an IP "+
-			"address or DNS address, but it must also include the port. This can "+
-			"also be specified via the CONSUL_GRPC_ADDR environment variable. The "+
-			"default value is 127.0.0.1:8502. It supports TLS communication "+
-			"by setting the environment variable CONSUL_GRPC_TLS=true.")
-	return fs
-}
-
-type StringValue struct {
-	v *string
-}
-
-// Set implements the flag.Value interface.
-func (s *StringValue) Set(v string) error {
-	if s.v == nil {
-		s.v = new(string)
-	}
-	*(s.v) = v
-	return nil
-}
-
-// String implements the flag.Value interface.
-func (s *StringValue) String() string {
-	var current string
-	if s.v != nil {
-		current = *(s.v)
-	}
-	return current
-}
-
-// Merge will overlay this value if it has been set.
-func (s *StringValue) Merge(onto *string) {
-	if s.v != nil {
-		*onto = *(s.v)
-	}
-}
diff --git a/command/resource/read/read.go b/command/resource/read/read.go
index a38889ad14b87..fe35521056ba4 100644
--- a/command/resource/read/read.go
+++ b/command/resource/read/read.go
@@ -86,6 +86,10 @@ func (c *cmd) Run(args []string) int {
 			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 {
diff --git a/command/resource/read/read_test.go b/command/resource/read/read_test.go
index 5c5e854e8d9b6..ee78acdd19602 100644
--- a/command/resource/read/read_test.go
+++ b/command/resource/read/read_test.go
@@ -149,7 +149,7 @@ func TestResourceRead(t *testing.T) {
 			c := New(ui)
 			cliArgs := append(tc.args, defaultCmdArgs...)
 			code := c.Run(cliArgs)
-			require.Equal(t, tc.errMsg, ui.ErrorWriter.String())
+			require.Equal(t, ui.ErrorWriter.String(), tc.errMsg)
 			require.Equal(t, tc.expectedCode, code)
 		})
 	}
diff --git a/command/troubleshoot/ports/troubleshoot_ports.go b/command/troubleshoot/ports/troubleshoot_ports.go
deleted file mode 100644
index 1088703051101..0000000000000
--- a/command/troubleshoot/ports/troubleshoot_ports.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package ports
-
-import (
-	"flag"
-	"fmt"
-	"github.com/hashicorp/consul/troubleshoot/ports"
-	"os"
-
-	"github.com/hashicorp/consul/command/cli"
-	"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
-	help  string
-
-	// flags
-	host  string
-	ports string
-}
-
-func (c *cmd) init() {
-	c.flags = flag.NewFlagSet("", flag.ContinueOnError)
-
-	c.flags.StringVar(&c.host, "host", os.Getenv("CONSUL_HTTP_ADDR"), "The consul server host")
-
-	c.flags.StringVar(&c.ports, "ports", "", "Custom ports to troubleshoot")
-
-	c.help = flags.Usage(help, c.flags)
-}
-
-func (c *cmd) Run(args []string) int {
-
-	if err := c.flags.Parse(args); err != nil {
-		c.UI.Error(fmt.Sprintf("Failed to parse args: %v", err))
-		return 1
-	}
-
-	if c.host == "" {
-		c.UI.Error("-host is required. or set environment variable CONSUL_HTTP_ADDR")
-		return 1
-	}
-
-	if c.ports == "" {
-		ports.TroubleshootDefaultPorts(c.host)
-	} else {
-		ports.TroubleShootCustomPorts(c.host, c.ports)
-	}
-	return 0
-}
-
-func (c *cmd) Synopsis() string {
-	return synopsis
-}
-
-func (c *cmd) Help() string {
-	return c.help
-}
-
-const (
-	synopsis = "Prints open and closed ports on the Consul server"
-	help     = `
-Usage: consul troubleshoot ports [options]
-	Checks ports for TCP connectivity. Add the -ports flag to check specific ports or omit the -ports flag to check default ports. 
-	Refer to the following reference for default ports: https://developer.hashicorp.com/consul/docs/install/ports
-
-	consul troubleshoot ports -host localhost
-
-	or 
-	export CONSUL_HTTP_ADDR=localhost
-	consul troubleshoot ports 
-	
-	Use the -ports flag to check non-default ports, for example:
-	consul troubleshoot ports -host localhost -ports 1023,1024
-	or 
-	export CONSUL_HTTP_ADDR=localhost
-	consul troubleshoot ports -ports 1234,8500 
-`
-)
diff --git a/connect/proxy/proxy_test.go b/connect/proxy/proxy_test.go
index 73d65b82c6c27..20b4cdd55efef 100644
--- a/connect/proxy/proxy_test.go
+++ b/connect/proxy/proxy_test.go
@@ -98,7 +98,7 @@ func TestProxy_public(t *testing.T) {
 	retry.Run(t, func(r *retry.R) {
 		conn, err = svc.Dial(context.Background(), &connect.StaticResolver{
 			Addr:    TestLocalAddr(ports[0]),
-			CertURI: agConnect.TestSpiffeIDService(r, "echo"),
+			CertURI: agConnect.TestSpiffeIDService(t, "echo"),
 		})
 		if err != nil {
 			r.Fatalf("err: %s", err)
diff --git a/connect/service_test.go b/connect/service_test.go
index 88543a4145da8..0f6ed51a8b458 100644
--- a/connect/service_test.go
+++ b/connect/service_test.go
@@ -246,7 +246,7 @@ func TestService_HTTPClient(t *testing.T) {
 			//require.Equal(t,"https://backend.service.consul:443", addr)
 			return &StaticResolver{
 				Addr:    testSvr.Addr,
-				CertURI: connect.TestSpiffeIDService(r, "backend"),
+				CertURI: connect.TestSpiffeIDService(t, "backend"),
 			}, nil
 		}
 
diff --git a/docs/README.md b/docs/README.md
index 72bd17d6d7ae7..0d61b30fa5778 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -25,7 +25,7 @@ be found in the public [user documentation].
 1. [Agent Configuration](./config)
 1. [RPC](./rpc)
 1. [Cluster Persistence](./persistence)
-1. [V2 Architecture](v2-architecture)
+1. [Resources and Controllers](./resources)
 1. [Client Agent](./client-agent)
 1. [Service Discovery](./service-discovery)
 1. [Service Mesh (Connect)](./service-mesh)
diff --git a/docs/persistence/README.md b/docs/persistence/README.md
index 68df1addc89c7..c8ca1089d807d 100644
--- a/docs/persistence/README.md
+++ b/docs/persistence/README.md
@@ -3,7 +3,7 @@
 > **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](../v2-architecture/controller-architecture) for more information.
+> [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
diff --git a/docs/v2-architecture/controller-architecture/README.md b/docs/resources/README.md
similarity index 77%
rename from docs/v2-architecture/controller-architecture/README.md
rename to docs/resources/README.md
index d781a63cc098e..b2a05744ad563 100644
--- a/docs/v2-architecture/controller-architecture/README.md
+++ b/docs/resources/README.md
@@ -1,14 +1,14 @@
-# Overview
+# Resources
 
 > **Note**  
 > Looking for guidance on adding new resources and controllers to Consul? Check
-> out the [developer guide](guide.md).
+> 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
+[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
@@ -25,7 +25,7 @@ of a shared platform and own their resource types and controllers.
 
 ## Architecture Overview
 
-![architecture diagram](architecture-overview.png)
+![architecture diagram](./architecture-overview.png)
 
 <sup>[source](https://whimsical.com/state-store-v2-UKE6SaEPXNc4UrZBrZj4Kg)</sup>
 
@@ -33,20 +33,20 @@ Our resource-oriented architecture comprises the following components:
 
 #### Resource Service
 
-[Resource Service](../../../proto-public/pbresource/resource.proto) is a gRPC
+[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
+[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
+[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
@@ -54,13 +54,12 @@ reduce operational complexity for our customers.
 
 #### Controllers
 
-[Controllers](../../../internal/controller/api.go) implement Consul's business
+[Controllers](../../internal/controller/api.go) implement Consul's business
 logic using asynchronous control loops that respond to changes in resources.
-Please see [Controller docs](controllers.md) for more details about controllers
 
 ## Raft Storage Backend
 
-Our [Raft Storage Backend](../../../internal/storage/raft/backend.go) integrates
+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.
@@ -70,7 +69,7 @@ at how a write operation is handled.
 
 [old state store]: ../persistence/
 
-![raft storage backend diagram](raft-backend.png)
+![raft storage backend diagram](./raft-backend.png)
 
 <sup>[source](https://whimsical.com/state-store-v2-UKE6SaEPXNc4UrZBrZj4Kg)</sup>
 
@@ -85,24 +84,24 @@ 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
+[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
+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`
+[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
+[`inmem.Store`]: ../../internal/storage/inmem/store.go
 
 #### Steps 7, 8, 9
 
diff --git a/docs/v2-architecture/controller-architecture/architecture-overview.png b/docs/resources/architecture-overview.png
similarity index 100%
rename from docs/v2-architecture/controller-architecture/architecture-overview.png
rename to docs/resources/architecture-overview.png
diff --git a/docs/v2-architecture/controller-architecture/guide.md b/docs/resources/guide.md
similarity index 97%
rename from docs/v2-architecture/controller-architecture/guide.md
rename to docs/resources/guide.md
index 91ae2f494e58c..aaecdecef07df 100644
--- a/docs/v2-architecture/controller-architecture/guide.md
+++ b/docs/resources/guide.md
@@ -6,7 +6,7 @@ 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).
+message, in the appropriate package under [`proto-public`](../../proto-public).
 
 ```shell
 $ mkdir proto-public/pbfoo/v1alpha1
@@ -34,7 +34,7 @@ $ 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
+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
@@ -65,7 +65,7 @@ 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
+[`type_registry.go`]: ../../agent/consul/type_registry.go
 
 ```Go
 import (
@@ -90,7 +90,7 @@ $ consul agent -dev
 ```
 
 You can now use [grpcurl](https://github.com/fullstorydev/grpcurl) to interact
-with the [resource service](../../../proto-public/pbresource/resource.proto):
+with the [resource service](../../proto-public/pbresource/resource.proto):
 
 ```shell
 $ grpcurl -d @ \
@@ -283,7 +283,7 @@ 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
+[`server.go`]: ../../agent/consul/server.go
 
 ```Go
 package foo
diff --git a/docs/v2-architecture/controller-architecture/raft-backend.png b/docs/resources/raft-backend.png
similarity index 100%
rename from docs/v2-architecture/controller-architecture/raft-backend.png
rename to docs/resources/raft-backend.png
diff --git a/docs/v2-architecture/controller-architecture/controllers.md b/docs/v2-architecture/controller-architecture/controllers.md
deleted file mode 100644
index d346dfeacff94..0000000000000
--- a/docs/v2-architecture/controller-architecture/controllers.md
+++ /dev/null
@@ -1,223 +0,0 @@
-# Controllers
-
-This page describes how to write controllers in Consul's new controller architecture.
-
--> **Note**: This information is valid as of Consul 1.17 but some portions may change in future releases.
-
-## Controller Basics
-
-A controller consists of several parts: 
-
-1. **The watched type** - This is the main type a controller is watching and reconciling.
-2. **Additional watched types** - These are additional types a controller may care about in addition to the main watched type.
-3. **Additional custom watches** - These are the watches for things that aren't resources in Consul. 
-4. **Reconciler** - This is the instance that's responsible for reconciling requests whenever there's an event for the main watched type or for any of the watched types.
-
-A basic controller setup could look like this:
-
-```go
-func barController() controller.Controller {
-    return controller.ForType(pbexample.BarType).
-        WithReconciler(barReconciler{})
-}
-```
-
-barReconciler needs to implement the `Reconcile` method of the `Reconciler` interface. 
-It's important to note that the `Reconcile` method only gets the request with the `ID` of the main
-watched resource and so it's up to the reconcile implementation to fetch the resource and any relevant information needed
-to perform the reconciliation. The most basic reconciler could look as follows:
-
-```go
-type barReconciler struct {}
-
-func (b *barReconciler) Reconcile(ctx context.Context, rt Runtime, req Request) error {
-    ...
-}
-```
-
-## Watching Additional Resources
-
-Most of the time, controllers will need to watch more resources in addition to the main watched type. 
-To set up an additional watch, the main thing we need to figure out is how to map additional watched resource to the main
-watched resource. Controller-runtime allows us to implement a mapper function that can take the additional watched resource
-as the input and produce reconcile `Requests` for our main watched type.
-
-To figure out how to map the two resources together, we need to think about the relationship between the two resources.
-
-There are several common relationship types between resources that are being used currently:
-1. Name-alignment: this relationship means that resources are named the same and live in the same tenancy, but have different data. Examples: `Service` and `ServiceEndpoints`, `Workload` and `ProxyStateTemplate`.
-2. Selector: this relationship happens when one resource selects another by name or name prefix. Examples: `Service` and `Workload`, `ProxyConfiguration` and `Workload`.
-3. Owner: in this relationship, one resource is the owner of another resource. Examples: `Service` and `ServiceEndpoints`, `HealthStatus` and `Workload`.
-4. Arbitrary reference: in this relationship, one resource may reference another by some sort of reference. This reference could be a single string in the resource data or a more composite reference containing name, tenancy, and type. Examples: `Workload` and `WorkloadIdentity`, `HTTPRoute` and `Service`.
-
-Note that it's possible for the two watched resources to have more than one relationship type simultaneously. 
-For example, `FailoverPolicy` type is name-aligned with a service to which it applies, however, it also contains
-references to destination services, and for a controller that reconciles `FailoverPolicy` and watches `Service`
-we need to account for both type 1 and type 4 relationship whenever we get an event for a `Service`. 
-
-### Simple Mappers
-
-Let's look at some simple mapping examples. 
-
-#### Name-aligned resources
-If our resources only have a name-aligned relationship, we can map them with a built-in function:
-
-```go
-func barController() controller.Controller {
-    return controller.ForType(pbexample.BarType).
-        WithWatch(pbexample.FooType, controller.ReplaceType(pbexample.BarType)). 
-        WithReconciler(barReconciler{})
-}
-```
-
-Here, all we need to do is replace the type of the `Foo` resource whenever we get an event for it.
-
-#### Owned resources
-
-Let's say our `Foo` resource owns `Bar` resources, where any `Foo` resource can own multiple `Bar` resources. 
-In this case, whenever we see a new event for `Foo`, all we need to do is get all `Bar` resources that `Foo` currently owns.
-For this, we can also use a built-in function to set up our watch:
-
-```go
-func MapOwned(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-    resp, err := rt.Client.ListByOwner(ctx, &pbresource.ListByOwnerRequest{Owner: res.Id})
-    if err != nil {
-        return nil, err
-    }
-
-    var result []controller.Request
-    for _, r := range resp.Resources {
-        result = append(result, controller.Request{ID: r.Id})
-    }
-
-    return result, nil
-}
-
-func barController() controller.Controller {
-    return controller.ForType(pbexample.BarType).
-        WithWatch(pbexample.FooType, MapOwned). 
-        WithReconciler(barReconciler{})
-}
-```
-
-### Advanced Mappers and Caches
-
-For selector or arbitrary reference relationships, the mapping that we choose may need to be more advanced. 
-
-#### Naive mapper implementation
-
-Let's first consider what a naive mapping function could look like in this case. Let's say that the `Bar` resource
-references `Foo` resource by name in the data. Now to watch and map `Foo` resources, we need to be able to find all relevant `Bar` resources
-whenever we get an event for a `Foo` resource.
-
-```go
-func MapFoo(ctx context.Context, rt controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-    resp, err := rt.Client.List(ctx, &pbresource.ListRequest{Type: pbexample.BarType, Tenancy: res.Id.Tenancy})
-    if err != nil {
-        return nil, err
-    }
-
-    var result []controller.Request
-    for _, r := range resp.Resources {
-        decodedResource, err := resource.Decode[*pbexample.Bar](r)
-        if err != nil {
-            return nil, err
-        }
-        
-        // Only add Bar resources that match Foo by name. 
-        if decodedResource.GetData().GetFooName() == res.Id.Name {
-            result = append(result, controller.Request{ID: r.Id})
-        }
-    }
-}
-```
-
-This approach is fine for cases when the number of `Bar` resources in a cluster is relatively small. If it's not,
-then we'd be doing a large `O(N)` search on each `Bar` event which could be too expensive. 
-
-#### Caching mappers
-
-For cases when `N` is too large, we'd want to use a caching layer to help us make lookups more efficient so that they
-don't require an `O(N)` search of potentially all cluster resources.
-
-Caching mappers need to be kept up-to-date by individual controllers and because of their added complexity, it's important
-to carefully consider whether these mappers are strictly necessary for any given controller implementation.
-
-For reference-relationships, we recommend using the `bimapper` to track relationships, while for the workload selector relationships,
-we recommend using the `workloadselectionmapper.Mapper` or the underlying `selectiontracker.WorkloadSelectionTracker`.
-These two mappers types can be combined into more complex mappers such as the ones used by the `routes-controller`
-or the `sidecar-proxy-controller`.
-
-In our example, because we `Foo` and `Bar` are using name-reference relationship, we'll use a `bimapper`.
-
-```go
-func barController() controller.Controller {
-    mapper := bimapper.New(pbexample.Bar, pbexample.Foo)
-	
-    return controller.ForType(pbexample.BarType).
-        WithWatch(pbexample.FooType, mapper.MapLink).
-        WithReconciler(barReconciler{mapper: mapper})
-}
-```
-
-Now we need to make sure that we populate and clear the mapper as necessary. Generally, this should happen when the data
-is fetched in the reconcile.
-
-```go
-func (b *barReconciler) Reconcile(ctx context.Context, rt Runtime, req Request) error {
-	// Fetch the `Bar` resource we're reconciling.
-    barResource, err := resource.GetDecodedResource[*pbexample.Bar](ctx, rt.Client, req.ID)
-    if err != nil {
-        return err
-    }
-	
-	//  If the resource is not found, we should make sure to untrack it from mapper.
-    if barResource == nil {
-        b.mapper.UntrackItem(req.ID)
-    }
-	
-	// Fetch our referenced `Foo` resource.
-    fooID := &pbresource.ID{
-        Type:    pbexample.FooType,
-        Name:    barResource.GetData().GetFooName(),
-        Tenancy: req.Id.Tenancy,
-    }
-    res, err := resource.GetDecodedResource[*pbexample.Foo](ctx, rt.Client, fooID)
-    if err != nil {
-        return err
-    }
-    // If the referenced Foo resource is not found, we should not untrack it in case it comes back.
-    if res == nil {
-        // no-op	
-    }
-    // Otherwise, we need to track it.
-    b.mapper.TrackItem(req.ID, []resource.ReferenceOrID{fooID})
-}
-```
-
-TODO: bound ref problem
-
-### Custom Watches
-
-In some cases, we may want to trigger reconciles for events that aren't generated from CRUD operations on resources, for example
-when Envoy proxy connects or disconnects to a server. Controller-runtime allows us to setup watches from
-events that come from a custom event channel. Please see [xds-controller](https://github.com/hashicorp/consul/blob/ecfeb7aac51df8730064d869bb1f2c633a531522/internal/mesh/internal/controllers/xds/controller.go#L40-L41) for examples of custom watches.
-
-## Statuses
-
-In many cases, controllers would need to update statuses on resources to let the user know about the successful or unsuccessful
-state of a resource.
-
-These are the guidelines that we recommend for statuses:
-
-* While status conditions is a list, the Condition type should be treated as a key in a map, meaning a resource should not have two status conditions with the same type.
-* Controllers need to both update successful and unsuccessful conditions states. This is because we need to make sure that we clear any failed status conditions.
-* Status conditions should be named such that the `True` state is a successful state and `False` state is a failed state. 
-
-## Best Practices
-
-Below is a list of controller best practices that we've learned so far. Many of them are inspired by [kubebuilder](https://book.kubebuilder.io/reference/good-practices).
-
-* Avoid monolithic controllers as much as possible. A single controller should only manage a single resource to avoid complexity and race conditions.
-* If using cached mappers, aim to write (update or delete entries) to mappers in the `Reconcile` method and read from them in the mapper functions used by watches.
-* Fetch all data in the `Reconcile` method and avoid caching it from the mapper functions. This ensures that we get the latest data for each reconciliation.
diff --git a/docs/v2-architecture/service-mesh/README.md b/docs/v2-architecture/service-mesh/README.md
deleted file mode 100644
index 4d0b6e9ff279d..0000000000000
--- a/docs/v2-architecture/service-mesh/README.md
+++ /dev/null
@@ -1,47 +0,0 @@
-# V2 Service Mesh Architecture
-
-In Consul 1.16 and 1.17 releases, Consul's service mesh has been rewritten to use the controller architecture and the
-resource APIs.
-
-At a high level, the service mesh consists of resources and controllers living in three groups: `catalog`, `mesh`,
-and `auth`.
-
-![controllers diagram](controllers.png)
-
-The controllers in each groups are responsible for producing an output that may then be used by other controllers.
-
--> **Note:** This diagram is valid as of Consul 1.17. It may change in the future releases.
-
-## Catalog controllers
-
-Catalog controllers are responsible for reconciling resources in the `catalog` API group.
-
-1. **FailoverPolicy** controller validates `FailoverPolicy` resource has valid service references and updating the
-   status the `FailoverPolicy` resource with the result.
-2. **WorkloadHealth** controller takes in workloads and any relevant health statuses and updates the status of a
-   workload with the combined health status.
-3. **NodeHealth** controller takes in nodes and any relevant health statuses and updates the status of a node with the
-   combined health status.
-4. **ServiceEndpoints** controller generates a `ServiceEndpoints` object that is name-aligned with a service and
-   contains workload addresses and ports that constitute a service.
-
-## Mesh Controllers
-
-1. **ProxyConfiguration** controller generates a `ComputedProxyConfiguration` resource that is name-aligned with a
-   workload. `ComputedProxyConfiguration` contains all merged `ProxyConfiguration` resources that apply to a specific
-   workload.
-2. **Routes** controller generates a `ComputedRoutes` resource that is name-aligned with a service. It contains merged
-   configuration from all xRoutes objects as well as `FailoverPolicy` and `DestinationPolicy`.
-3. **ExplicitDestinations** controller generates a `ComputedExplicitDestinations` resource that is name-aligned with a
-   workload. It contains merged `Destinations` resources that apply to a specific workload.
-4. **SidecarProxy** controller takes in the results of the previous three controllers as well as some user-provided
-   resources and generates `ProxyStateTemplate` resource which serves as the representation of Envoy configuration for
-   sidecar proxies.
-5. **XDSController** takes in `ProxyStateTemplate` resources, fills in missing endpoints references as well as
-   certificates and CA roots and sends them over to another component that sends this information over to Envoy.
-
-## Auth Controllers
-
-1. **TrafficPermissions** controller generates `ComputedTrafficPermissions` resource that is name-aligned
-   with `WorkloadIdentity`. This computed resource contains all traffic permissions that apply to a specific workload
-   identity.
\ No newline at end of file
diff --git a/docs/v2-architecture/service-mesh/controllers.png b/docs/v2-architecture/service-mesh/controllers.png
deleted file mode 100644
index 76efac1d059cd..0000000000000
Binary files a/docs/v2-architecture/service-mesh/controllers.png and /dev/null differ
diff --git a/go.mod b/go.mod
index f5044715eda14..88a2eb86a5b32 100644
--- a/go.mod
+++ b/go.mod
@@ -24,7 +24,6 @@ require (
 	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/deckarep/golang-set/v2 v2.3.1
 	github.com/docker/go-connections v0.4.0
 	github.com/envoyproxy/go-control-plane v0.11.1
 	github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e
@@ -276,10 +275,10 @@ require (
 	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.100.1 // 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-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // 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
 )
diff --git a/go.sum b/go.sum
index 4f226d0d74c69..bca1359dadc77 100644
--- a/go.sum
+++ b/go.sum
@@ -208,8 +208,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 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/deckarep/golang-set/v2 v2.3.1 h1:vjmkvJt/IV27WXPyYQpAh4bRyWJc5Y435D17XQ9QU5A=
-github.com/deckarep/golang-set/v2 v2.3.1/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661 h1:lrWnAyy/F72MbxIxFUzKmcMCdt9Oi8RzpAxzTNQHD7o=
 github.com/denverdino/aliyungo v0.0.0-20170926055100-d3308649c661/go.mod h1:dV8lFg6daOBZbT6/BDGIz6Y3WFGn8juu6G+CQ6LHtl0=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
@@ -1566,19 +1564,19 @@ k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8
 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.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
-k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
+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-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-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
+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-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
+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/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/structured-merge-diff/v4 v4.2.3 h1:PRbqxJClWWYMNV1dhaG4NsibJbArud9kFxnAMREiWFE=
diff --git a/internal/auth/internal/controllers/trafficpermissions/controller_test.go b/internal/auth/internal/controllers/trafficpermissions/controller_test.go
index 8f0fd99860136..910a6fb88e71e 100644
--- a/internal/auth/internal/controllers/trafficpermissions/controller_test.go
+++ b/internal/auth/internal/controllers/trafficpermissions/controller_test.go
@@ -5,7 +5,6 @@ package trafficpermissions
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -16,13 +15,11 @@ import (
 	"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/resourcetest"
 	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"
-	"github.com/hashicorp/consul/version/versiontest"
 )
 
 type controllerSuite struct {
@@ -31,21 +28,13 @@ type controllerSuite struct {
 	client *rtest.Client
 	rt     controller.Runtime
 
-	mapper       *trafficpermissionsmapper.TrafficPermissionsMapper
-	reconciler   *reconciler
-	tenancies    []*pbresource.Tenancy
-	isEnterprise bool
+	mapper     *trafficpermissionsmapper.TrafficPermissionsMapper
+	reconciler *reconciler
 }
 
 func (suite *controllerSuite) SetupTest() {
-	suite.isEnterprise = versiontest.IsEnterprise()
-	suite.tenancies = resourcetest.TestTenancies()
 	suite.ctx = testutil.TestContext(suite.T())
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
-
+	client := svctest.RunResourceService(suite.T(), types.Register)
 	suite.client = rtest.NewClient(client)
 	suite.rt = controller.Runtime{
 		Client: suite.client,
@@ -77,514 +66,371 @@ func (suite *controllerSuite) requireCTP(resource *pbresource.Resource, allowExp
 }
 
 func (suite *controllerSuite) TestReconcile_CTPCreate_NoReferencingTrafficPermissionsExist() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").WithTenancy(tenancy).Write(suite.T(), suite.client)
-		require.NotNil(suite.T(), wi)
-		id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(tenancy).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{})
-	})
+	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
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		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},
-		}).
-			WithTenancy(tenancy).
-			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},
-		}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-		suite.requireTrafficPermissionsTracking(tp2, wi1ID)
-
-		// create the workload identity that they reference
-		wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").WithTenancy(tenancy).Write(suite.T(), suite.client)
-		id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(tenancy).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)
-	})
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		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},
-		}).
-			WithTenancy(tenancy).
-			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},
-		}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-		suite.requireTrafficPermissionsTracking(tp2, wi1ID)
-
-		// create the workload identity that they reference
-		wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").WithTenancy(tenancy).Write(suite.T(), suite.client)
-		id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(tenancy).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)
-	})
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// create the workload identity that they reference
-		wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").WithTenancy(tenancy).Write(suite.T(), suite.client)
-		id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(tenancy).WithOwner(wi.Id).ID()
+	// 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)
+	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)
+	// 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)
+	// 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)
-	})
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// create the workload identity to be referenced
-		wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").WithTenancy(tenancy).Write(suite.T(), suite.client)
-		id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(tenancy).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").WithTenancy(tenancy).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").WithTenancy(tenancy).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").WithTenancy(tenancy).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)
-	})
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// create the workload identity to be referenced
-		wi := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").WithTenancy(tenancy).Write(suite.T(), suite.client)
-		id := rtest.Resource(pbauth.ComputedTrafficPermissionsType, wi.Id.Name).WithTenancy(tenancy).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},
-		}).
-			WithTenancy(tenancy).
-			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},
-		}).
-			WithTenancy(tenancy).
-			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)
-	})
-}
+	// 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()
 
-func (suite *controllerSuite) TestReconcile_TrafficPermissionsDelete_DestinationWorkloadIdentityDoesNotExist() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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},
-		}).
-			WithTenancy(tenancy).
-			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},
-		}).
-			WithTenancy(tenancy).
-			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)
-	})
-}
+	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
+	require.NoError(suite.T(), err)
 
-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)
+	// 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)
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Add a workload identity
-		workloadIdentity := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").WithTenancy(tenancy).Write(suite.T(), suite.client)
+	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
+	require.NoError(suite.T(), err)
 
-		// 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))
+	ctp := suite.client.RequireResourceExists(suite.T(), id)
+	suite.requireCTP(ctp, []*pbauth.Permission{p2}, []*pbauth.Permission{p1})
+	rtest.RequireOwner(suite.T(), ctp, wi.Id, true)
 
-		// Check that the CTP resource exists and contains no permissions
-		ctpID := rtest.Resource(pbauth.ComputedTrafficPermissionsType, "wi1").WithTenancy(tenancy).ID()
-		ctpObject := suite.client.RequireResourceExists(suite.T(), ctpID)
-		suite.requireCTP(ctpObject, nil, nil)
+	// Delete TP2
+	suite.client.MustDelete(suite.T(), tp2.Id)
 
-		// add a traffic permission that references wi1
-		p1 := &pbauth.Permission{
-			Sources: []*pbauth.Source{{
-				IdentityName: "wi2",
+	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",
 			}},
-			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},
-		}).
-			WithTenancy(tenancy).
-			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",
+	}
+	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",
 			}},
-			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},
-		}).
-			WithTenancy(tenancy).
-			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").WithTenancy(tenancy).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},
-		}).
-			WithTenancy(tenancy).
-			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").WithTenancy(tenancy).ID()
-		suite.client.RequireResourceNotFound(suite.T(), ctpID2)
+	}
+	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)
 }
 
-// This test tests the behaviour of the Controller when dealing with near identical
-// resources present in different tenancies. On a high level here is what the test does
-//
-//  1. Register two workload identities with the same name in two different tenancies (default+default, foo+bar)
-//  2. Register traffic permissions separately in both of those tenants and verify if the CTPs
-//     get computed as expected.
-//  3. Delete the traffic permission present in the default namespace and partition and verify the
-//     changes occurred to the CTP in the same tenant.
-//  4. Delete the traffic permission present in the custom namespace and partition and verify the
-//     changes occurred to the CTP in the same tenant.
-//  5. Add back the traffic permission tp2 to the default namespace and partition and verify the
-//     computed CTP in the same tenant
-func (suite *controllerSuite) TestControllerBasicWithMultipleTenancyLevels() {
-	if !suite.isEnterprise {
-		suite.T().Skip("this test should only run against the enterprise build")
-	}
-
+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)
@@ -592,44 +438,25 @@ func (suite *controllerSuite) TestControllerBasicWithMultipleTenancyLevels() {
 	mgr.SetRaftLeader(true)
 	go mgr.Run(suite.ctx)
 
-	customTenancy := &pbresource.Tenancy{Partition: "foo", Namespace: "bar"}
-
-	// Add a workload identity in a default namespace and partition
-	workloadIdentity1 := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		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, workloadIdentity1.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
-	ctpID1 := rtest.Resource(pbauth.ComputedTrafficPermissionsType, "wi1").WithTenancy(resource.DefaultNamespacedTenancy()).ID()
-	ctpObject1 := suite.client.RequireResourceExists(suite.T(), ctpID1)
-	suite.requireCTP(ctpObject1, nil, nil)
-
-	// Add a workload identity with the same name in a custom namespace and partition
-	workloadIdentity2 := rtest.Resource(pbauth.WorkloadIdentityType, "wi1").
-		WithTenancy(customTenancy).
-		Write(suite.T(), suite.client)
+	// 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, workloadIdentity2.Id), StatusKey)
+	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
-	ctpID2 := rtest.Resource(pbauth.ComputedTrafficPermissionsType, "wi1").WithTenancy(customTenancy).ID()
-	ctpObject2 := suite.client.RequireResourceExists(suite.T(), ctpID2)
-	suite.requireCTP(ctpObject2, nil, nil)
+	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 present in the default namespace and partition
+	// add a traffic permission that references wi1
 	p1 := &pbauth.Permission{
 		Sources: []*pbauth.Source{{
 			IdentityName: "wi2",
-			Namespace:    "bar",
-			Partition:    "foo",
+			Namespace:    "default",
+			Partition:    "default",
 			Peer:         "local",
 		}},
 		DestinationRules: nil,
@@ -638,22 +465,20 @@ func (suite *controllerSuite) TestControllerBasicWithMultipleTenancyLevels() {
 		Destination: &pbauth.Destination{IdentityName: "wi1"},
 		Action:      pbauth.Action_ACTION_ALLOW,
 		Permissions: []*pbauth.Permission{p1},
-	}).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Write(suite.T(), suite.client)
+	}).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, workloadIdentity1.Id), StatusKey)
+	suite.client.WaitForReconciliation(suite.T(), resource.ReplaceType(pbauth.ComputedTrafficPermissionsType, workloadIdentity.Id), StatusKey)
 	// Check that the ctp has been regenerated
-	ctpObject1 = suite.client.WaitForNewVersion(suite.T(), ctpID1, ctpObject1.Version)
-	rtest.RequireStatusCondition(suite.T(), ctpObject1, StatusKey, ConditionComputed("wi1", false))
+	ctpObject = suite.client.WaitForNewVersion(suite.T(), ctpID, ctpObject.Version)
+	rtest.RequireStatusCondition(suite.T(), ctpObject, StatusKey, ConditionComputed("wi1", false))
 	// check wi1
-	suite.requireCTP(ctpObject1, []*pbauth.Permission{p1}, nil)
+	suite.requireCTP(ctpObject, []*pbauth.Permission{p1}, nil)
 
-	// add a traffic permission that references wi1 present in the custom namespace and partition
+	// add a traffic permission that references wi2
 	p2 := &pbauth.Permission{
 		Sources: []*pbauth.Source{{
-			IdentityName: "wi2",
+			IdentityName: "wi1",
 			Namespace:    "default",
 			Partition:    "default",
 			Peer:         "local",
@@ -661,47 +486,37 @@ func (suite *controllerSuite) TestControllerBasicWithMultipleTenancyLevels() {
 		DestinationRules: nil,
 	}
 	tp2 := rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
-		Destination: &pbauth.Destination{IdentityName: "wi1"},
+		Destination: &pbauth.Destination{IdentityName: "wi2"},
 		Action:      pbauth.Action_ACTION_ALLOW,
 		Permissions: []*pbauth.Permission{p2},
-	}).
-		WithTenancy(customTenancy).
-		Write(suite.T(), suite.client)
+	}).Write(suite.T(), suite.client)
 	suite.client.RequireResourceExists(suite.T(), tp2.Id)
-	// Wait for the controller to record that the CTP has been re-computed
-	suite.client.WaitForReconciliation(suite.T(), resource.ReplaceType(pbauth.ComputedTrafficPermissionsType, workloadIdentity2.Id), StatusKey)
-	// Check that the ctp has been regenerated
-	ctpObject2 = suite.client.WaitForNewVersion(suite.T(), ctpID2, ctpObject2.Version)
-	rtest.RequireStatusCondition(suite.T(), ctpObject2, StatusKey, ConditionComputed("wi1", false))
-	// check wi1
-	suite.requireCTP(ctpObject2, []*pbauth.Permission{p2}, nil)
+	// 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 that the CTP in default tenancy has no permissions
-	ctpObject1 = suite.client.WaitForNewVersion(suite.T(), ctpID1, ctpObject1.Version)
-	suite.requireCTP(ctpObject1, nil, nil)
+	// check wi1 has no permissions
+	ctpObject = suite.client.WaitForNewVersion(suite.T(), ctpID, ctpObject.Version)
+	suite.requireCTP(ctpObject, nil, nil)
 
-	// delete tp2 in the custom partition and namespace
-	suite.client.MustDelete(suite.T(), tp2.Id)
-	suite.client.WaitForDeletion(suite.T(), tp2.Id)
-	// check that the CTP in custom tenancy has no permissions
-	ctpObject2 = suite.client.WaitForNewVersion(suite.T(), ctpID2, ctpObject2.Version)
-	suite.requireCTP(ctpObject2, nil, nil)
-
-	// Add tp2 to point to wi1 in the default partition and namespace
-	tp2 = rtest.Resource(pbauth.TrafficPermissionsType, "tp2").WithData(suite.T(), &pbauth.TrafficPermissions{
+	// 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},
-	}).
-		WithTenancy(resource.DefaultNamespacedTenancy()).
-		Write(suite.T(), suite.client)
-	suite.client.RequireResourceExists(suite.T(), tp2.Id)
-	// check wi1 in the default partition and namespace has tp2's permissions
-	ctpObject1 = suite.client.WaitForNewVersion(suite.T(), ctpID1, ctpObject1.Version)
-	suite.requireCTP(ctpObject1, []*pbauth.Permission{p2}, nil)
+	}).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() {
@@ -713,173 +528,147 @@ func (suite *controllerSuite) TestControllerMultipleTrafficPermissions() {
 	mgr.SetRaftLeader(true)
 	go mgr.Run(suite.ctx)
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		wi1ID := &pbresource.ID{
-			Name:    "wi1",
-			Type:    pbauth.ComputedTrafficPermissionsType,
-			Tenancy: tenancy,
-		}
-		// add tp1 and tp2
-		p1 := &pbauth.Permission{
-			Sources: []*pbauth.Source{{
-				IdentityName: "wi2",
-				Namespace:    tenancy.Namespace,
-				Partition:    tenancy.Partition,
-				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},
-		}).
-			WithTenancy(tenancy).
-			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:    tenancy.Namespace,
-				Partition:    tenancy.Partition,
-				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},
-		}).
-			WithTenancy(tenancy).
-			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").WithTenancy(tenancy).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:    tenancy.Namespace,
-				Partition:    tenancy.Partition,
-				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},
-		}).
-			WithTenancy(tenancy).
-			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").WithTenancy(tenancy).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").WithTenancy(tenancy).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},
-		}).
-			WithTenancy(tenancy).
-			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},
-		}).
-			WithTenancy(tenancy).
-			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},
-		}).
-			WithTenancy(tenancy).
-			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)
-		})
-	})
-}
+	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)
 
-func (suite *controllerSuite) runTestCaseWithTenancies(testFunc func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			testFunc(tenancy)
-		})
+	// 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)
 
-func (suite *controllerSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
+	// 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) {
diff --git a/internal/auth/internal/types/computed_traffic_permissions.go b/internal/auth/internal/types/computed_traffic_permissions.go
index 800d2a8fb66f4..0a32e13d29267 100644
--- a/internal/auth/internal/types/computed_traffic_permissions.go
+++ b/internal/auth/internal/types/computed_traffic_permissions.go
@@ -12,8 +12,6 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedComputedTrafficPermissions = resource.DecodedResource[*pbauth.ComputedTrafficPermissions]
-
 func RegisterComputedTrafficPermission(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:  pbauth.ComputedTrafficPermissionsType,
@@ -28,12 +26,16 @@ func RegisterComputedTrafficPermission(r resource.Registry) {
 	})
 }
 
-var ValidateComputedTrafficPermissions = resource.DecodeAndValidate(validateComputedTrafficPermissions)
+func ValidateComputedTrafficPermissions(res *pbresource.Resource) error {
+	var ctp pbauth.ComputedTrafficPermissions
+
+	if err := res.Data.UnmarshalTo(&ctp); err != nil {
+		return resource.NewErrDataParse(&ctp, err)
+	}
 
-func validateComputedTrafficPermissions(res *DecodedComputedTrafficPermissions) error {
 	var merr error
 
-	for i, permission := range res.Data.AllowPermissions {
+	for i, permission := range ctp.AllowPermissions {
 		wrapErr := func(err error) error {
 			return resource.ErrInvalidListElement{
 				Name:    "allow_permissions",
@@ -46,7 +48,7 @@ func validateComputedTrafficPermissions(res *DecodedComputedTrafficPermissions)
 		}
 	}
 
-	for i, permission := range res.Data.DenyPermissions {
+	for i, permission := range ctp.DenyPermissions {
 		wrapErr := func(err error) error {
 			return resource.ErrInvalidListElement{
 				Name:    "deny_permissions",
diff --git a/internal/auth/internal/types/traffic_permissions.go b/internal/auth/internal/types/traffic_permissions.go
index acf2655371697..84a30a46e2f60 100644
--- a/internal/auth/internal/types/traffic_permissions.go
+++ b/internal/auth/internal/types/traffic_permissions.go
@@ -12,15 +12,13 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedTrafficPermissions = resource.DecodedResource[*pbauth.TrafficPermissions]
-
 func RegisterTrafficPermissions(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:  pbauth.TrafficPermissionsType,
 		Proto: &pbauth.TrafficPermissions{},
 		ACLs: &resource.ACLHooks{
-			Read:  resource.DecodeAndAuthorizeRead(aclReadHookTrafficPermissions),
-			Write: resource.DecodeAndAuthorizeWrite(aclWriteHookTrafficPermissions),
+			Read:  aclReadHookTrafficPermissions,
+			Write: aclWriteHookTrafficPermissions,
 			List:  resource.NoOpACLListHook,
 		},
 		Validate: ValidateTrafficPermissions,
@@ -29,12 +27,16 @@ func RegisterTrafficPermissions(r resource.Registry) {
 	})
 }
 
-var MutateTrafficPermissions = resource.DecodeAndMutate(mutateTrafficPermissions)
+func MutateTrafficPermissions(res *pbresource.Resource) error {
+	var tp pbauth.TrafficPermissions
+
+	if err := res.Data.UnmarshalTo(&tp); err != nil {
+		return resource.NewErrDataParse(&tp, err)
+	}
 
-func mutateTrafficPermissions(res *DecodedTrafficPermissions) (bool, error) {
 	var changed bool
 
-	for _, p := range res.Data.Permissions {
+	for _, p := range tp.Permissions {
 		for _, s := range p.Sources {
 			if updated := normalizedTenancyForSource(s, res.Id.Tenancy); updated {
 				changed = true
@@ -42,7 +44,11 @@ func mutateTrafficPermissions(res *DecodedTrafficPermissions) (bool, error) {
 		}
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&tp)
 }
 
 func normalizedTenancyForSource(src *pbauth.Source, parentTenancy *pbresource.Tenancy) bool {
@@ -104,13 +110,17 @@ func firstNonEmptyString(a, b, c string) (string, bool) {
 	return c, true
 }
 
-var ValidateTrafficPermissions = resource.DecodeAndValidate(validateTrafficPermissions)
+func ValidateTrafficPermissions(res *pbresource.Resource) error {
+	var tp pbauth.TrafficPermissions
+
+	if err := res.Data.UnmarshalTo(&tp); err != nil {
+		return resource.NewErrDataParse(&tp, err)
+	}
 
-func validateTrafficPermissions(res *DecodedTrafficPermissions) error {
 	var merr error
 
 	// enumcover:pbauth.Action
-	switch res.Data.Action {
+	switch tp.Action {
 	case pbauth.Action_ACTION_ALLOW:
 	case pbauth.Action_ACTION_DENY:
 	case pbauth.Action_ACTION_UNSPECIFIED:
@@ -122,14 +132,14 @@ func validateTrafficPermissions(res *DecodedTrafficPermissions) error {
 		})
 	}
 
-	if res.Data.Destination == nil || (len(res.Data.Destination.IdentityName) == 0) {
+	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 res.Data.Permissions {
+	for i, permission := range tp.Permissions {
 		wrapErr := func(err error) error {
 			return resource.ErrInvalidListElement{
 				Name:    "permissions",
@@ -275,10 +285,30 @@ func isLocalPeer(p string) bool {
 	return p == "local" || p == ""
 }
 
-func aclReadHookTrafficPermissions(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *DecodedTrafficPermissions) error {
-	return authorizer.ToAllowAuthorizer().TrafficPermissionsReadAllowed(res.Data.Destination.IdentityName, authzContext)
+func aclReadHookTrafficPermissions(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
+	if res == nil {
+		return resource.ErrNeedResource
+	}
+	return authorizeDestination(res, func(dest string) error {
+		return authorizer.ToAllowAuthorizer().TrafficPermissionsReadAllowed(dest, authzContext)
+	})
 }
 
-func aclWriteHookTrafficPermissions(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *DecodedTrafficPermissions) error {
-	return authorizer.ToAllowAuthorizer().TrafficPermissionsWriteAllowed(res.Data.Destination.IdentityName, 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 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/workload_identity.go b/internal/auth/internal/types/workload_identity.go
index a15fd5bf5b2dd..17334e66099ef 100644
--- a/internal/auth/internal/types/workload_identity.go
+++ b/internal/auth/internal/types/workload_identity.go
@@ -10,8 +10,6 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedWorkloadIdentity = resource.DecodedResource[*pbauth.WorkloadIdentity]
-
 func RegisterWorkloadIdentity(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:  pbauth.WorkloadIdentityType,
@@ -22,17 +20,10 @@ func RegisterWorkloadIdentity(r resource.Registry) {
 			Write: aclWriteHookWorkloadIdentity,
 			List:  resource.NoOpACLListHook,
 		},
-		Validate: ValidateWorkloadIdentity,
+		Validate: nil,
 	})
 }
 
-var ValidateWorkloadIdentity = resource.DecodeAndValidate(validateWorkloadIdentity)
-
-func validateWorkloadIdentity(res *DecodedWorkloadIdentity) error {
-	// currently the WorkloadIdentity type has no fields.
-	return nil
-}
-
 func aclReadHookWorkloadIdentity(
 	authorizer acl.Authorizer,
 	authzCtx *acl.AuthorizerContext,
diff --git a/internal/auth/internal/types/workload_identity_test.go b/internal/auth/internal/types/workload_identity_test.go
index 19ed4cbeea87e..8dfb22bc74a2e 100644
--- a/internal/auth/internal/types/workload_identity_test.go
+++ b/internal/auth/internal/types/workload_identity_test.go
@@ -144,13 +144,3 @@ func TestWorkloadIdentityACLs(t *testing.T) {
 		})
 	}
 }
-
-func TestWorkloadIdentity_ParseError(t *testing.T) {
-	rsc := resourcetest.Resource(pbauth.WorkloadIdentityType, "example").
-		WithData(t, &pbauth.TrafficPermissions{}).
-		Build()
-
-	err := ValidateWorkloadIdentity(rsc)
-	var parseErr resource.ErrDataParse
-	require.ErrorAs(t, err, &parseErr)
-}
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
index 45cf1503012c0..705eeb6ced262 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1-health.json
@@ -3,10 +3,11 @@
       "type": {
          "group": "catalog",
          "group_version": "v2beta1",
-         "kind": "NodeHealthStatus"
+         "kind": "HealthStatus"
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-1-health"
@@ -19,12 +20,13 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-1"
    },
    "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.NodeHealthStatus",
+      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
       "type": "synthetic",
       "status": "HEALTH_PASSING"
    }
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json
index e9f78a033664d..a190e5bc1ab1e 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-1.json
@@ -7,6 +7,7 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-1"
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
index ed1958e644a2f..1e9baaefde5ec 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2-health.json
@@ -3,10 +3,11 @@
       "type": {
          "group": "catalog",
          "group_version": "v2beta1",
-         "kind": "NodeHealthStatus"
+         "kind": "HealthStatus"
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-2-health"
@@ -19,12 +20,13 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-2"
    },
    "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.NodeHealthStatus",
+      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
       "type": "synthetic",
       "status": "HEALTH_WARNING"
    }
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json
index f51b598c7b097..218f8d1ae35bb 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-2.json
@@ -7,6 +7,7 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-2"
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
index 0257dc2f0c37c..5e2df1a13f8b1 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3-health.json
@@ -3,10 +3,11 @@
       "type": {
          "group": "catalog",
          "group_version": "v2beta1",
-         "kind": "NodeHealthStatus"
+         "kind": "HealthStatus"
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-3-health"
@@ -19,12 +20,13 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-3"
    },
    "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.NodeHealthStatus",
+      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
       "type": "synthetic",
       "status": "HEALTH_CRITICAL"
    }
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json
index 6fb149e2cebf2..f02361cd58faa 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-3.json
@@ -7,6 +7,7 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-3"
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
index 2da46f58cb354..f403c929b4eae 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4-health.json
@@ -3,10 +3,11 @@
       "type": {
          "group": "catalog",
          "group_version": "v2beta1",
-         "kind": "NodeHealthStatus"
+         "kind": "HealthStatus"
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-4-health"
@@ -19,12 +20,13 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-4"
    },
    "data": {
-      "@type": "hashicorp.consul.catalog.v2beta1.NodeHealthStatus",
+      "@type": "hashicorp.consul.catalog.v2beta1.HealthStatus",
       "type": "synthetic",
       "status": "HEALTH_MAINTENANCE"
    }
diff --git a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json
index bea561ace54e4..c66e70fd0c64e 100644
--- a/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json
+++ b/internal/catalog/catalogtest/integration_test_data/v2beta1/node-4.json
@@ -7,6 +7,7 @@
       },
       "tenancy": {
          "partition": "default",
+         "namespace": "default",
          "peer_name": "local"
       },
       "name": "node-4"
diff --git a/internal/catalog/catalogtest/run_test.go b/internal/catalog/catalogtest/run_test.go
index f6e9610e0b693..554900559e464 100644
--- a/internal/catalog/catalogtest/run_test.go
+++ b/internal/catalog/catalogtest/run_test.go
@@ -26,9 +26,7 @@ func runInMemResourceServiceAndControllers(t *testing.T, deps controllers.Depend
 	ctx := testutil.TestContext(t)
 
 	// Create the in-mem resource service
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(catalog.RegisterTypes).
-		Run(t)
+	client := svctest.RunResourceService(t, catalog.RegisterTypes)
 
 	// Setup/Run the controller manager
 	mgr := controller.NewManager(client, testutil.Logger(t))
diff --git a/internal/catalog/catalogtest/test_integration_v2beta1.go b/internal/catalog/catalogtest/test_integration_v2beta1.go
index d88692e910a80..6d5c5854d7b00 100644
--- a/internal/catalog/catalogtest/test_integration_v2beta1.go
+++ b/internal/catalog/catalogtest/test_integration_v2beta1.go
@@ -26,7 +26,7 @@ var (
 	testData embed.FS
 )
 
-// RunCatalogV2Beta1IntegrationTest will push up a bunch of catalog related data and then
+// 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
@@ -68,10 +68,10 @@ func VerifyCatalogV2Beta1IntegrationTestResults(t *testing.T, client pbresource.
 		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.DefaultPartitionedTenancy()).ID()
+			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.NodeHealthStatusType, fmt.Sprintf("node-%d-health", i)).ID())
+			res := c.RequireResourceExists(t, rtest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("node-%d-health", i)).ID())
 			rtest.RequireOwner(t, res, nodeId, true)
 		}
 
@@ -85,10 +85,10 @@ func VerifyCatalogV2Beta1IntegrationTestResults(t *testing.T, client pbresource.
 	})
 
 	testutil.RunStep(t, "node-health-reconciliation", func(t *testing.T) {
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-1").WithTenancy(resource.DefaultPartitionedTenancy()).ID(), nodehealth.StatusKey, nodehealth.ConditionPassing)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-2").WithTenancy(resource.DefaultPartitionedTenancy()).ID(), nodehealth.StatusKey, nodehealth.ConditionWarning)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-3").WithTenancy(resource.DefaultPartitionedTenancy()).ID(), nodehealth.StatusKey, nodehealth.ConditionCritical)
-		c.WaitForStatusCondition(t, rtest.Resource(pbcatalog.NodeType, "node-4").WithTenancy(resource.DefaultPartitionedTenancy()).ID(), nodehealth.StatusKey, nodehealth.ConditionMaintenance)
+		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) {
diff --git a/internal/catalog/catalogtest/test_lifecycle_v2beta1.go b/internal/catalog/catalogtest/test_lifecycle_v2beta1.go
index 0c7fd1343546d..5093b516cf421 100644
--- a/internal/catalog/catalogtest/test_lifecycle_v2beta1.go
+++ b/internal/catalog/catalogtest/test_lifecycle_v2beta1.go
@@ -7,7 +7,6 @@ import (
 	"testing"
 
 	"github.com/hashicorp/consul/internal/catalog"
-	"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"
@@ -50,7 +49,6 @@ func RunCatalogV2Beta1NodeLifecycleIntegrationTest(t *testing.T, client pbresour
 
 	// initial node creation
 	node := rtest.Resource(pbcatalog.NodeType, nodeName).
-		WithTenancy(resource.DefaultPartitionedTenancy()).
 		WithData(t, &pbcatalog.Node{
 			Addresses: []*pbcatalog.NodeAddress{
 				{Host: "172.16.2.3"},
@@ -88,7 +86,7 @@ func RunCatalogV2Beta1NodeLifecycleIntegrationTest(t *testing.T, client pbresour
 	// reconciliation at each point
 	for _, health := range healthChanges {
 		// update the health check
-		nodeHealth = setNodeHealthStatus(t, c, node.Id, nodeHealthName, health)
+		nodeHealth = setHealthStatus(t, c, node.Id, nodeHealthName, health)
 
 		// wait for reconciliation to kick in and put the node into the right
 		// health status.
@@ -108,7 +106,7 @@ func RunCatalogV2Beta1NodeLifecycleIntegrationTest(t *testing.T, client pbresour
 	// 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 := setNodeHealthStatus(t, c, node.Id, nodeHealthName, pbcatalog.Health_HEALTH_CRITICAL)
+	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)
@@ -248,13 +246,11 @@ func runV2Beta1NodeAssociatedWorkloadLifecycleIntegrationTest(t *testing.T, c *r
 
 	// Insert a some nodes to link the workloads to at various points throughout the test
 	node1 := rtest.Resource(pbcatalog.NodeType, nodeName1).
-		WithTenancy(resource.DefaultPartitionedTenancy()).
 		WithData(t, &pbcatalog.Node{
 			Addresses: []*pbcatalog.NodeAddress{{Host: "172.17.9.10"}},
 		}).
 		Write(t, c)
 	node2 := rtest.Resource(pbcatalog.NodeType, nodeName2).
-		WithTenancy(resource.DefaultPartitionedTenancy()).
 		WithData(t, &pbcatalog.Node{
 			Addresses: []*pbcatalog.NodeAddress{{Host: "172.17.9.11"}},
 		}).
@@ -263,8 +259,8 @@ func runV2Beta1NodeAssociatedWorkloadLifecycleIntegrationTest(t *testing.T, c *r
 	// 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.
-	setNodeHealthStatus(t, c, node1.Id, nodeHealthName1, pbcatalog.Health_HEALTH_CRITICAL)
-	setNodeHealthStatus(t, c, node2.Id, nodeHealthName2, pbcatalog.Health_HEALTH_WARNING)
+	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).
@@ -337,7 +333,7 @@ func runV2Beta1NodeAssociatedWorkloadLifecycleIntegrationTest(t *testing.T, c *r
 		Write(t, c)
 
 	// Also set node 1 health down to WARNING
-	setNodeHealthStatus(t, c, node1.Id, nodeHealthName1, pbcatalog.Health_HEALTH_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,
@@ -718,13 +714,3 @@ func setHealthStatus(t *testing.T, client *rtest.Client, owner *pbresource.ID, n
 		WithOwner(owner).
 		Write(t, client)
 }
-
-func setNodeHealthStatus(t *testing.T, client *rtest.Client, owner *pbresource.ID, name string, health pbcatalog.Health) *pbresource.Resource {
-	return rtest.Resource(pbcatalog.NodeHealthStatusType, name).
-		WithData(t, &pbcatalog.NodeHealthStatus{
-			Type:   "synthetic",
-			Status: health,
-		}).
-		WithOwner(owner).
-		Write(t, client)
-}
diff --git a/internal/catalog/internal/controllers/endpoints/controller_test.go b/internal/catalog/internal/controllers/endpoints/controller_test.go
index 35c235260181a..5a0155ef76837 100644
--- a/internal/catalog/internal/controllers/endpoints/controller_test.go
+++ b/internal/catalog/internal/controllers/endpoints/controller_test.go
@@ -5,7 +5,6 @@ package endpoints
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -16,7 +15,6 @@ import (
 	"github.com/hashicorp/consul/internal/catalog/internal/types"
 	"github.com/hashicorp/consul/internal/controller"
 	"github.com/hashicorp/consul/internal/resource/mappers/selectiontracker"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
 	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
 	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
 	"github.com/hashicorp/consul/proto-public/pbresource"
@@ -443,16 +441,11 @@ type controllerSuite struct {
 
 	tracker    *selectiontracker.WorkloadSelectionTracker
 	reconciler *serviceEndpointsReconciler
-	tenancies  []*pbresource.Tenancy
 }
 
 func (suite *controllerSuite) SetupTest() {
-	suite.tenancies = resourcetest.TestTenancies()
 	suite.ctx = testutil.TestContext(suite.T())
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
+	client := svctest.RunResourceService(suite.T(), types.Register)
 	suite.rt = controller.Runtime{
 		Client: client,
 		Logger: testutil.Logger(suite.T()),
@@ -485,28 +478,25 @@ func (suite *controllerSuite) TestReconcile_ServiceNotFound() {
 
 	// generate a workload resource to use for checking if it maps
 	// to a service endpoints object
+	workload := rtest.Resource(pbcatalog.WorkloadType, "foo").Build()
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		workload := rtest.Resource(pbcatalog.WorkloadType, "foo").WithTenancy(tenancy).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{""}})
 
-		// 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").WithTenancy(tenancy).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)
 
-		// 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)
+	// 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)
-	})
+	// Now ensure that the tracking was removed
+	suite.requireTracking(workload)
 }
 
 func (suite *controllerSuite) TestReconcile_NoSelector_NoEndpoints() {
@@ -515,23 +505,20 @@ func (suite *controllerSuite) TestReconcile_NoSelector_NoEndpoints() {
 	// managed. Additionally, with no endpoints pre-existing it will
 	// not attempt to delete them.
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		service := rtest.Resource(pbcatalog.ServiceType, "test").
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Service{
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-			}).
-			Write(suite.T(), suite.client)
+	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").WithTenancy(tenancy).ID()
+	endpointsID := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").ID()
 
-		err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: endpointsID})
-		require.NoError(suite.T(), err)
+	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)
-	})
+	suite.client.RequireStatusCondition(suite.T(), service.Id, StatusKey, ConditionUnmanaged)
 }
 
 func (suite *controllerSuite) TestReconcile_NoSelector_ManagedEndpoints() {
@@ -539,30 +526,26 @@ func (suite *controllerSuite) TestReconcile_NoSelector_ManagedEndpoints() {
 	// to unmanaged endpoints for a service, any already generated managed endpoints
 	// get deleted.
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		service := rtest.Resource(pbcatalog.ServiceType, "test").
-			WithTenancy(tenancy).
-			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").
-			WithTenancy(tenancy).
-			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)
-	})
+	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() {
@@ -570,73 +553,65 @@ func (suite *controllerSuite) TestReconcile_NoSelector_UnmanagedEndpoints() {
 	// doesn't have its endpoints managed, that we do not delete any unmanaged
 	// ServiceEndpoints resource that the user would have manually written.
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		service := rtest.Resource(pbcatalog.ServiceType, "test").
-			WithTenancy(tenancy).
-			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").
-			WithTenancy(tenancy).
-			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)
-	})
+	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.
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		service := rtest.Resource(pbcatalog.ServiceType, "test").
-			WithTenancy(tenancy).
-			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)
+	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").WithTenancy(tenancy).ID()
+	endpointsID := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").ID()
 
-		rtest.Resource(pbcatalog.WorkloadType, "test-workload").
-			WithTenancy(tenancy).
-			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)
+	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)
+	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)
+	// 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)
+	// 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)
-	})
+	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
@@ -647,46 +622,41 @@ 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.
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		service := rtest.Resource(pbcatalog.ServiceType, "test").
-			WithTenancy(tenancy).
-			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").
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.ServiceEndpoints{}).
-			WithOwner(service.Id).
-			Write(suite.T(), suite.client)
-
-		rtest.Resource(pbcatalog.WorkloadType, "test-workload").
-			WithTenancy(tenancy).
-			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)
+	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)
 
-		err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: endpoints.Id})
-		require.NoError(suite.T(), err)
+	endpoints := rtest.Resource(pbcatalog.ServiceEndpointsType, "test").
+		WithData(suite.T(), &pbcatalog.ServiceEndpoints{}).
+		WithOwner(service.Id).
+		Write(suite.T(), suite.client)
 
-		suite.client.RequireStatusCondition(suite.T(), service.Id, StatusKey, ConditionManaged)
-		res := suite.client.RequireResourceMeta(suite.T(), endpoints.Id, endpointsMetaManagedBy, StatusKey)
+	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)
 
-		var newEndpoints pbcatalog.ServiceEndpoints
-		err = res.Data.UnmarshalTo(&newEndpoints)
-		require.NoError(suite.T(), err)
-		require.Len(suite.T(), newEndpoints.Endpoints, 1)
-	})
+	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() {
@@ -703,202 +673,184 @@ func (suite *controllerSuite) TestController() {
 	mgr.SetRaftLeader(true)
 	go mgr.Run(suite.ctx)
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Add a service - there are no workloads so an empty endpoints
-		// object should be created.
-		service := rtest.Resource(pbcatalog.ServiceType, "api").
-			WithTenancy(tenancy).
-			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)
-		rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionIdentitiesNotFound)
-
-		// Check that the endpoints resource exists and contains 0 endpoints
-		endpointsID := rtest.Resource(pbcatalog.ServiceEndpointsType, "api").WithTenancy(tenancy).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").
-			WithTenancy(tenancy).
-			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)
-
-		suite.client.WaitForStatusCondition(suite.T(), service.Id, StatusKey,
-			ConditionIdentitiesFound([]string{"api"}))
-
-		// 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"}},
+	// 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)
+	rtest.RequireStatusCondition(suite.T(), res, StatusKey, ConditionIdentitiesNotFound)
+
+	// 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},
 			},
-			HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
-			Identity:     "api",
-		})
+			Identity: "api",
+		}).
+		Write(suite.T(), suite.client)
 
-		// 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",
-					},
+	suite.client.WaitForStatusCondition(suite.T(), service.Id, StatusKey,
+		ConditionIdentitiesFound([]string{"api"}))
+
+	// 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)
+	// 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"}},
-			},
+	// 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",
+	})
+
+	// Update workload identity and check that the status on the service is updated
+	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},
 			},
-			HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-			Identity:     "api",
-		})
+			Identity: "endpoints-api-identity",
+		}).
+		Write(suite.T(), suite.client)
 
-		// Update workload identity and check that the status on the service is updated
-		workload = rtest.Resource(pbcatalog.WorkloadType, "api-1").WithTenancy(tenancy).
-			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: "endpoints-api-identity",
-			}).
-			Write(suite.T(), suite.client)
-
-		suite.client.WaitForStatusCondition(suite.T(), service.Id, StatusKey, ConditionIdentitiesFound([]string{"endpoints-api-identity"}))
-
-		// Verify that the generated endpoints now contain the workload
-		endpoints = suite.client.WaitForNewVersion(suite.T(), endpointsID, endpoints.Version)
-		suite.requireEndpoints(endpoints, &pbcatalog.Endpoint{
-			TargetRef: workload.Id,
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "127.0.0.1", Ports: []string{"http"}},
+	suite.client.WaitForStatusCondition(suite.T(), service.Id, StatusKey, ConditionIdentitiesFound([]string{"endpoints-api-identity"}))
+
+	// Verify that the generated endpoints now contain the workload
+	endpoints = suite.client.WaitForNewVersion(suite.T(), endpointsID, endpoints.Version)
+	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:     "endpoints-api-identity",
+	})
+
+	// 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: map[string]*pbcatalog.WorkloadPort{
-				"http": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
+			Ports: []*pbcatalog.ServicePort{
+				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
 			},
-			HealthStatus: pbcatalog.Health_HEALTH_PASSING,
-			Identity:     "endpoints-api-identity",
-		})
-
-		// 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").WithTenancy(tenancy).
-			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)
+		}).
+		Write(suite.T(), suite.client)
 
-		// Wait for the service status' observed generation to get bumped
-		service = suite.client.WaitForReconciliation(suite.T(), service.Id, StatusKey)
+	// 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)
+	// Verify that the endpoints were not regenerated
+	suite.client.RequireVersionUnchanged(suite.T(), endpointsID, endpoints.Version)
 
-		// Update the service.
-		updatedService := rtest.Resource(pbcatalog.ServiceType, "api").
-			WithTenancy(tenancy).
-			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)
+	// 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)
+	// 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})
+	// 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)
-		})
+	// 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").
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Service{
-				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-				},
-			}).
-			Write(suite.T(), suite.client)
+	// 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)
+	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)
-	})
+	// Verify that the endpoints were deleted
+	suite.client.RequireResourceNotFound(suite.T(), endpointsID)
 }
 
 func TestController(t *testing.T) {
 	suite.Run(t, new(controllerSuite))
 }
-
-func (suite *controllerSuite) runTestCaseWithTenancies(testFunc func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			testFunc(tenancy)
-		})
-	}
-}
-
-func (suite *controllerSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
diff --git a/internal/catalog/internal/controllers/endpoints/reconciliation_data.go b/internal/catalog/internal/controllers/endpoints/reconciliation_data.go
index 186354eda9e0d..320ad47470d5b 100644
--- a/internal/catalog/internal/controllers/endpoints/reconciliation_data.go
+++ b/internal/catalog/internal/controllers/endpoints/reconciliation_data.go
@@ -34,7 +34,7 @@ type workloadData struct {
 
 // 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 unmarshalled form. If the resource doesn't
+// 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
diff --git a/internal/catalog/internal/controllers/endpoints/reconciliation_data_test.go b/internal/catalog/internal/controllers/endpoints/reconciliation_data_test.go
index 14c729e2cfa37..d855c710f6c28 100644
--- a/internal/catalog/internal/controllers/endpoints/reconciliation_data_test.go
+++ b/internal/catalog/internal/controllers/endpoints/reconciliation_data_test.go
@@ -5,7 +5,6 @@ package endpoints
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -18,7 +17,6 @@ import (
 	"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/resourcetest"
 	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
 	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
 	"github.com/hashicorp/consul/proto-public/pbresource"
@@ -30,7 +28,7 @@ type reconciliationDataSuite struct {
 	suite.Suite
 
 	ctx    context.Context
-	client *resourcetest.Client
+	client pbresource.ResourceServiceClient
 	rt     controller.Runtime
 
 	apiServiceData       *pbcatalog.Service
@@ -43,18 +41,11 @@ type reconciliationDataSuite struct {
 	api123Workload       *pbresource.Resource
 	web1Workload         *pbresource.Resource
 	web2Workload         *pbresource.Resource
-
-	tenancies []*pbresource.Tenancy
 }
 
 func (suite *reconciliationDataSuite) SetupTest() {
 	suite.ctx = testutil.TestContext(suite.T())
-	suite.tenancies = rtest.TestTenancies()
-	resourceClient := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
-	suite.client = resourcetest.NewClient(resourceClient)
+	suite.client = svctest.RunResourceService(suite.T(), types.Register)
 	suite.rt = controller.Runtime{
 		Client: suite.client,
 		Logger: testutil.Logger(suite.T()),
@@ -76,174 +67,16 @@ func (suite *reconciliationDataSuite) SetupTest() {
 	}
 	suite.apiServiceSubsetData = proto.Clone(suite.apiServiceData).(*pbcatalog.Service)
 	suite.apiServiceSubsetData.Workloads.Filter = "(zim in metadata) and (metadata.zim matches `^g.`)"
-}
-
-func (suite *reconciliationDataSuite) TestGetServiceData_NotFound() {
-	// This test's purposes is to ensure that NotFound errors when retrieving
-	// the service data are ignored properly.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		data, err := getServiceData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceType, "not-found").WithTenancy(tenancy).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",
-	}
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		data, err := getServiceData(suite.ctx, suite.rt, rtest.Resource(badType, "foo").WithTenancy(tenancy).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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		data, err := getServiceData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceEndpointsType, "api").WithTenancy(tenancy).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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		data, err := getEndpointsData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceEndpointsType, "not-found").WithTenancy(tenancy).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",
-	}
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		data, err := getEndpointsData(suite.ctx, suite.rt, rtest.Resource(badType, "foo").WithTenancy(tenancy).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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		data, err := getEndpointsData(suite.ctx, suite.rt, rtest.Resource(pbcatalog.ServiceType, "api").WithTenancy(tenancy).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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		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.
-
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		require.NotNil(suite.T(), suite.apiService)
-
-		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 (suite *reconciliationDataSuite) TestGetWorkloadDataWithFilter() {
-	// This is like TestGetWorkloadData except it exercises the post-read
-	// filter on the selector.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		require.NotNil(suite.T(), suite.apiServiceSubset)
-
-		data, err := getWorkloadData(suite.ctx, suite.rt, &serviceData{
-			resource: suite.apiServiceSubset,
-			service:  suite.apiServiceSubsetData,
-		})
-
-		require.NoError(suite.T(), err)
-		require.Len(suite.T(), data, 2)
-		prototest.AssertDeepEqual(suite.T(), suite.api123Workload, data[0].resource)
-		prototest.AssertDeepEqual(suite.T(), suite.web1Workload, data[1].resource)
-	})
-}
-
-func TestReconciliationData(t *testing.T) {
-	suite.Run(t, new(reconciliationDataSuite))
-}
-
-func (suite *reconciliationDataSuite) setupResourcesWithTenancy(tenancy *pbresource.Tenancy) {
 	suite.apiService = rtest.Resource(pbcatalog.ServiceType, "api").
-		WithTenancy(tenancy).
 		WithData(suite.T(), suite.apiServiceData).
 		Write(suite.T(), suite.client)
 
 	suite.apiServiceSubset = rtest.Resource(pbcatalog.ServiceType, "api-subset").
-		WithTenancy(tenancy).
 		WithData(suite.T(), suite.apiServiceSubsetData).
 		Write(suite.T(), suite.client)
 
 	suite.api1Workload = rtest.Resource(pbcatalog.WorkloadType, "api-1").
-		WithTenancy(tenancy).
 		WithMeta("zim", "dib").
 		WithData(suite.T(), &pbcatalog.Workload{
 			Addresses: []*pbcatalog.WorkloadAddress{
@@ -257,7 +90,6 @@ func (suite *reconciliationDataSuite) setupResourcesWithTenancy(tenancy *pbresou
 		Write(suite.T(), suite.client)
 
 	suite.api2Workload = rtest.Resource(pbcatalog.WorkloadType, "api-2").
-		WithTenancy(tenancy).
 		WithData(suite.T(), &pbcatalog.Workload{
 			Addresses: []*pbcatalog.WorkloadAddress{
 				{Host: "127.0.0.1"},
@@ -270,7 +102,6 @@ func (suite *reconciliationDataSuite) setupResourcesWithTenancy(tenancy *pbresou
 		Write(suite.T(), suite.client)
 
 	suite.api123Workload = rtest.Resource(pbcatalog.WorkloadType, "api-123").
-		WithTenancy(tenancy).
 		WithMeta("zim", "gir").
 		WithData(suite.T(), &pbcatalog.Workload{
 			Addresses: []*pbcatalog.WorkloadAddress{
@@ -284,7 +115,6 @@ func (suite *reconciliationDataSuite) setupResourcesWithTenancy(tenancy *pbresou
 		Write(suite.T(), suite.client)
 
 	suite.web1Workload = rtest.Resource(pbcatalog.WorkloadType, "web-1").
-		WithTenancy(tenancy).
 		WithMeta("zim", "gaz").
 		WithData(suite.T(), &pbcatalog.Workload{
 			Addresses: []*pbcatalog.WorkloadAddress{
@@ -298,7 +128,6 @@ func (suite *reconciliationDataSuite) setupResourcesWithTenancy(tenancy *pbresou
 		Write(suite.T(), suite.client)
 
 	suite.web2Workload = rtest.Resource(pbcatalog.WorkloadType, "web-2").
-		WithTenancy(tenancy).
 		WithData(suite.T(), &pbcatalog.Workload{
 			Addresses: []*pbcatalog.WorkloadAddress{
 				{Host: "127.0.0.1"},
@@ -311,11 +140,10 @@ func (suite *reconciliationDataSuite) setupResourcesWithTenancy(tenancy *pbresou
 		Write(suite.T(), suite.client)
 
 	suite.apiEndpoints = rtest.Resource(pbcatalog.ServiceEndpointsType, "api").
-		WithTenancy(tenancy).
 		WithData(suite.T(), &pbcatalog.ServiceEndpoints{
 			Endpoints: []*pbcatalog.Endpoint{
 				{
-					TargetRef: rtest.Resource(pbcatalog.WorkloadType, "api-1").WithTenancy(tenancy).ID(),
+					TargetRef: rtest.Resource(pbcatalog.WorkloadType, "api-1").WithTenancy(resource.DefaultNamespacedTenancy()).ID(),
 					Addresses: []*pbcatalog.WorkloadAddress{
 						{
 							Host:  "127.0.0.1",
@@ -332,27 +160,131 @@ func (suite *reconciliationDataSuite) setupResourcesWithTenancy(tenancy *pbresou
 		Write(suite.T(), suite.client)
 }
 
-func (suite *reconciliationDataSuite) cleanupResources() {
-	suite.client.MustDelete(suite.T(), suite.apiService.Id)
-	suite.client.MustDelete(suite.T(), suite.apiServiceSubset.Id)
-	suite.client.MustDelete(suite.T(), suite.api1Workload.Id)
-	suite.client.MustDelete(suite.T(), suite.api2Workload.Id)
-	suite.client.MustDelete(suite.T(), suite.api123Workload.Id)
-	suite.client.MustDelete(suite.T(), suite.web1Workload.Id)
-	suite.client.MustDelete(suite.T(), suite.web2Workload.Id)
-	suite.client.MustDelete(suite.T(), suite.apiEndpoints.Id)
+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) runTestCaseWithTenancies(testFunc func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			suite.setupResourcesWithTenancy(tenancy)
-			testFunc(tenancy)
-			suite.T().Cleanup(suite.cleanupResources)
-		})
+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) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
+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 (suite *reconciliationDataSuite) TestGetWorkloadDataWithFilter() {
+	// This is like TestGetWorkloadData except it exercises the post-read
+	// filter on the selector.
+	data, err := getWorkloadData(suite.ctx, suite.rt, &serviceData{
+		resource: suite.apiServiceSubset,
+		service:  suite.apiServiceSubsetData,
+	})
+
+	require.NoError(suite.T(), err)
+	require.Len(suite.T(), data, 2)
+	prototest.AssertDeepEqual(suite.T(), suite.api123Workload, data[0].resource)
+	prototest.AssertDeepEqual(suite.T(), suite.web1Workload, data[1].resource)
+}
+
+func TestReconciliationData(t *testing.T) {
+	suite.Run(t, new(reconciliationDataSuite))
 }
diff --git a/internal/catalog/internal/controllers/failover/controller_test.go b/internal/catalog/internal/controllers/failover/controller_test.go
index 30e19b4a17fa6..a82a6f0fdee60 100644
--- a/internal/catalog/internal/controllers/failover/controller_test.go
+++ b/internal/catalog/internal/controllers/failover/controller_test.go
@@ -5,7 +5,6 @@ package failover
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/suite"
@@ -17,7 +16,6 @@ import (
 	"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/sdk/testutil"
 )
 
@@ -31,24 +29,18 @@ type controllerSuite struct {
 	failoverMapper FailoverMapper
 
 	ctl failoverPolicyReconciler
-
-	tenancies []*pbresource.Tenancy
 }
 
 func (suite *controllerSuite) SetupTest() {
-	suite.tenancies = rtest.TestTenancies()
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, types.RegisterDNSPolicy).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
-
+	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()
-	suite.ctx = testutil.TestContext(suite.T())
 }
 
 func (suite *controllerSuite) TestController() {
@@ -61,279 +53,216 @@ func (suite *controllerSuite) TestController() {
 	mgr.SetRaftLeader(true)
 	go mgr.Run(suite.ctx)
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Create an advance pointer to some services.
-		apiServiceRef := resource.Reference(rtest.Resource(pbcatalog.ServiceType, "api").WithTenancy(tenancy).ID(), "")
-		otherServiceRef := resource.Reference(rtest.Resource(pbcatalog.ServiceType, "other").WithTenancy(tenancy).ID(), "")
+	// 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{
+	// 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,
+					Ref:  apiServiceRef,
+					Port: "http",
 				}},
 			},
-		}
-		failover := rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-			WithData(suite.T(), failoverData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(failover.Id))
-
-		suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionMissingService)
-
-		// Provide the service.
-		apiServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{Prefixes: []string{"api-"}},
-			Ports: []*pbcatalog.ServicePort{{
+			"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,
-			}},
-		}
-		svc := rtest.Resource(pbcatalog.ServiceType, "api").
-			WithData(suite.T(), apiServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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",
-					}},
-				},
-			},
-		}
-		svc = rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-			WithData(suite.T(), failoverData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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,
-				},
 			},
-		}
-		svc = rtest.Resource(pbcatalog.ServiceType, "api").
-			WithData(suite.T(), apiServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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,
-				},
+			{
+				TargetPort: "admin",
+				Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
 			},
-		}
-		svc = rtest.Resource(pbcatalog.ServiceType, "api").
-			WithData(suite.T(), apiServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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",
-					}},
-				},
-			},
-		}
-		svc = rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-			WithData(suite.T(), failoverData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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{{
+		},
+	}
+	_ = 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,
-			}},
-		}
-		svc = rtest.Resource(pbcatalog.ServiceType, "other").
-			WithData(suite.T(), otherServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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,
-				},
 			},
-		}
-		svc = rtest.Resource(pbcatalog.ServiceType, "other").
-			WithData(suite.T(), otherServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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,
-				},
+			{
+				TargetPort: "admin",
+				Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
 			},
-		}
-		svc = rtest.Resource(pbcatalog.ServiceType, "api").
-			WithData(suite.T(), apiServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		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, "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",
+				}},
 			},
-		}
-		svc = rtest.Resource(pbcatalog.ServiceType, "other").
-			WithData(suite.T(), otherServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		failoverData = &pbcatalog.FailoverPolicy{
-			Config: &pbcatalog.FailoverConfig{
+			"admin": {
 				Destinations: []*pbcatalog.FailoverDestination{{
-					Ref: otherServiceRef,
+					Ref:  otherServiceRef,
+					Port: "admin",
 				}},
 			},
-		}
-		failover = rtest.Resource(pbcatalog.FailoverPolicyType, "api").
-			WithData(suite.T(), failoverData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(failover.Id))
-
-		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.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,
 			},
-		}
-		svc = rtest.Resource(pbcatalog.ServiceType, "api").
-			WithData(suite.T(), apiServiceData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
+			{
+				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)
-	})
+	suite.client.WaitForStatusCondition(suite.T(), failover.Id, StatusKey, ConditionOK)
 }
 
 func TestFailoverController(t *testing.T) {
 	suite.Run(t, new(controllerSuite))
 }
-
-func (suite *controllerSuite) runTestCaseWithTenancies(testCase func(tenancy *pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			testCase(tenancy)
-		})
-	}
-}
-
-func (suite *controllerSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
-
-func (suite *controllerSuite) deleteResourceFunc(id *pbresource.ID) func() {
-	return func() {
-		suite.client.MustDelete(suite.T(), id)
-	}
-}
diff --git a/internal/catalog/internal/controllers/nodehealth/controller.go b/internal/catalog/internal/controllers/nodehealth/controller.go
index f28bb7a134a14..9ef656b6a8bb9 100644
--- a/internal/catalog/internal/controllers/nodehealth/controller.go
+++ b/internal/catalog/internal/controllers/nodehealth/controller.go
@@ -18,7 +18,7 @@ import (
 
 func NodeHealthController() controller.Controller {
 	return controller.ForType(pbcatalog.NodeType).
-		WithWatch(pbcatalog.NodeHealthStatusType, controller.MapOwnerFiltered(pbcatalog.NodeType)).
+		WithWatch(pbcatalog.HealthStatusType, controller.MapOwnerFiltered(pbcatalog.NodeType)).
 		WithReconciler(&nodeHealthReconciler{})
 }
 
@@ -89,8 +89,8 @@ func getNodeHealth(ctx context.Context, rt controller.Runtime, nodeRef *pbresour
 	health := pbcatalog.Health_HEALTH_PASSING
 
 	for _, res := range rsp.Resources {
-		if resource.EqualType(res.Id.Type, pbcatalog.NodeHealthStatusType) {
-			var hs pbcatalog.NodeHealthStatus
+		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
diff --git a/internal/catalog/internal/controllers/nodehealth/controller_test.go b/internal/catalog/internal/controllers/nodehealth/controller_test.go
index 33814b82431f3..b21c52e521f84 100644
--- a/internal/catalog/internal/controllers/nodehealth/controller_test.go
+++ b/internal/catalog/internal/controllers/nodehealth/controller_test.go
@@ -23,7 +23,6 @@ import (
 	"github.com/hashicorp/consul/proto/private/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
-	"github.com/hashicorp/consul/version/versiontest"
 )
 
 var (
@@ -46,18 +45,22 @@ var (
 	}
 )
 
-func resourceID(rtype *pbresource.Type, name string, tenancy *pbresource.Tenancy) *pbresource.ID {
+func resourceID(rtype *pbresource.Type, name string) *pbresource.ID {
 	return &pbresource.ID{
-		Type:    rtype,
-		Tenancy: tenancy,
-		Name:    name,
+		Type: rtype,
+		Tenancy: &pbresource.Tenancy{
+			Partition: "default",
+			Namespace: "default",
+			PeerName:  "local",
+		},
+		Name: name,
 	}
 }
 
 type nodeHealthControllerTestSuite struct {
 	suite.Suite
 
-	resourceClient *resourcetest.Client
+	resourceClient pbresource.ResourceServiceClient
 	runtime        controller.Runtime
 
 	ctl nodeHealthReconciler
@@ -67,144 +70,159 @@ type nodeHealthControllerTestSuite struct {
 	nodeWarning     *pbresource.ID
 	nodeCritical    *pbresource.ID
 	nodeMaintenance *pbresource.ID
-	isEnterprise    bool
-	tenancies       []*pbresource.Tenancy
 }
 
-func (suite *nodeHealthControllerTestSuite) writeNode(name string, tenancy *pbresource.Tenancy) *pbresource.ID {
-	return resourcetest.Resource(pbcatalog.NodeType, name).
+func (suite *nodeHealthControllerTestSuite) SetupTest() {
+	suite.resourceClient = svctest.RunResourceService(suite.T(), types.Register, types.RegisterDNSPolicy)
+	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).
-		WithTenancy(&pbresource.Tenancy{
-			Partition: tenancy.Partition,
-		}).
 		Write(suite.T(), suite.resourceClient).Id
-}
 
-func (suite *nodeHealthControllerTestSuite) SetupTest() {
-	suite.tenancies = resourcetest.TestTenancies()
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, types.RegisterDNSPolicy).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
+	suite.nodePassing = resourcetest.Resource(pbcatalog.NodeType, "test-node-passing").
+		WithData(suite.T(), nodeData).
+		Write(suite.T(), suite.resourceClient).Id
 
-	suite.resourceClient = resourcetest.NewClient(client)
-	suite.runtime = controller.Runtime{Client: suite.resourceClient, Logger: testutil.Logger(suite.T())}
-	suite.isEnterprise = versiontest.IsEnterprise()
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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",
-			tenancy,
-		)
-		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))
-	})
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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", &pbresource.Tenancy{
-			Partition: tenancy.Partition,
-		})
-		ref.Uid = ulid.Make().String()
-		health, err := getNodeHealth(context.Background(), suite.runtime, ref)
+	// 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)
-	})
+	require.NoError(suite.T(), err)
+	require.Equal(suite.T(), pbcatalog.Health_HEALTH_PASSING, health)
 }
 
 func (suite *nodeHealthControllerTestSuite) TestGetNodeHealthNoStatus() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeNoHealth)
-		require.NoError(suite.T(), err)
-		require.Equal(suite.T(), pbcatalog.Health_HEALTH_PASSING, health)
-	})
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodePassing)
-		require.NoError(suite.T(), err)
-		require.Equal(suite.T(), pbcatalog.Health_HEALTH_PASSING, health)
-	})
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeCritical)
-		require.NoError(suite.T(), err)
-		require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-	})
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeWarning)
-		require.NoError(suite.T(), err)
-		require.Equal(suite.T(), pbcatalog.Health_HEALTH_WARNING, health)
-	})
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		health, err := getNodeHealth(context.Background(), suite.runtime, suite.nodeMaintenance)
-		require.NoError(suite.T(), err)
-		require.Equal(suite.T(), pbcatalog.Health_HEALTH_MAINTENANCE, health)
-	})
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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", &pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}),
-		})
-		require.NoError(suite.T(), err)
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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",
-			tenancy,
-		)
-
-		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))
+	// 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 {
@@ -232,75 +250,60 @@ func (suite *nodeHealthControllerTestSuite) testReconcileStatus(id *pbresource.I
 }
 
 func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusPassing() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		suite.testReconcileStatus(suite.nodePassing, &pbresource.Condition{
-			Type:    StatusConditionHealthy,
-			State:   pbresource.Condition_STATE_TRUE,
-			Reason:  "HEALTH_PASSING",
-			Message: NodeHealthyMessage,
-		})
+	suite.testReconcileStatus(suite.nodePassing, &pbresource.Condition{
+		Type:    StatusConditionHealthy,
+		State:   pbresource.Condition_STATE_TRUE,
+		Reason:  "HEALTH_PASSING",
+		Message: NodeHealthyMessage,
 	})
 }
 
 func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusWarning() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		suite.testReconcileStatus(suite.nodeWarning, &pbresource.Condition{
-			Type:    StatusConditionHealthy,
-			State:   pbresource.Condition_STATE_FALSE,
-			Reason:  "HEALTH_WARNING",
-			Message: NodeUnhealthyMessage,
-		})
+	suite.testReconcileStatus(suite.nodeWarning, &pbresource.Condition{
+		Type:    StatusConditionHealthy,
+		State:   pbresource.Condition_STATE_FALSE,
+		Reason:  "HEALTH_WARNING",
+		Message: NodeUnhealthyMessage,
 	})
 }
 
 func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusCritical() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		suite.testReconcileStatus(suite.nodeCritical, &pbresource.Condition{
-			Type:    StatusConditionHealthy,
-			State:   pbresource.Condition_STATE_FALSE,
-			Reason:  "HEALTH_CRITICAL",
-			Message: NodeUnhealthyMessage,
-		})
+	suite.testReconcileStatus(suite.nodeCritical, &pbresource.Condition{
+		Type:    StatusConditionHealthy,
+		State:   pbresource.Condition_STATE_FALSE,
+		Reason:  "HEALTH_CRITICAL",
+		Message: NodeUnhealthyMessage,
 	})
 }
 
 func (suite *nodeHealthControllerTestSuite) TestReconcile_StatusMaintenance() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		suite.testReconcileStatus(suite.nodeMaintenance, &pbresource.Condition{
-			Type:    StatusConditionHealthy,
-			State:   pbresource.Condition_STATE_FALSE,
-			Reason:  "HEALTH_MAINTENANCE",
-			Message: NodeUnhealthyMessage,
-		})
+	suite.testReconcileStatus(suite.nodeMaintenance, &pbresource.Condition{
+		Type:    StatusConditionHealthy,
+		State:   pbresource.Condition_STATE_FALSE,
+		Reason:  "HEALTH_MAINTENANCE",
+		Message: NodeUnhealthyMessage,
 	})
 }
 
 func (suite *nodeHealthControllerTestSuite) TestReconcile_AvoidRereconciliationWrite() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		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,
-		})
+	res1 := 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)
+	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) {
@@ -319,131 +322,45 @@ func (suite *nodeHealthControllerTestSuite) waitForReconciliation(id *pbresource
 		require.Equal(r, reason, nodeHealthStatus.Conditions[0].Reason)
 	})
 }
-
 func (suite *nodeHealthControllerTestSuite) TestController() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		// 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",
-					},
+	// 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",
 				},
-			}).
-			WithTenancy(&pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}).
-			Write(suite.T(), suite.resourceClient)
-
-		// wait for rereconciliation to happen
-		suite.waitForReconciliation(suite.nodePassing, "HEALTH_PASSING")
-
-		resourcetest.Resource(pbcatalog.NodeHealthStatusType, "failure").
-			WithData(suite.T(), &pbcatalog.NodeHealthStatus{Type: "fake", Status: pbcatalog.Health_HEALTH_CRITICAL}).
-			WithOwner(suite.nodePassing).
-			WithTenancy(&pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}).
-			Write(suite.T(), suite.resourceClient)
-
-		suite.waitForReconciliation(suite.nodePassing, "HEALTH_CRITICAL")
-	})
-}
-
-func TestNodeHealthController(t *testing.T) {
-	suite.Run(t, new(nodeHealthControllerTestSuite))
-}
-
-func (suite *nodeHealthControllerTestSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
-
-func (suite *nodeHealthControllerTestSuite) setupNodesWithTenancy(tenancy *pbresource.Tenancy) {
-
-	// The rest of the setup will be to prime the resource service with some data
-	suite.nodeNoHealth = suite.writeNode("test-node-no-health", tenancy)
-	suite.nodePassing = suite.writeNode("test-node-passing", tenancy)
-	suite.nodeWarning = suite.writeNode("test-node-warning", tenancy)
-	suite.nodeCritical = suite.writeNode("test-node-critical", tenancy)
-	suite.nodeMaintenance = suite.writeNode("test-node-maintenance", tenancy)
-
-	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,
-	}
+			},
+		}).
+		Write(suite.T(), suite.resourceClient)
 
-	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.NodeHealthStatusType, fmt.Sprintf("test-check-%s-%d-%s", node.Name, idx, tenancy.Partition)).
-					WithData(suite.T(), &pbcatalog.NodeHealthStatus{Type: "tcp", Status: health}).
-					WithOwner(node).
-					Write(suite.T(), suite.resourceClient)
-			}
-		}
-	}
+	// wait for rereconciliation to happen
+	suite.waitForReconciliation(suite.nodePassing, "HEALTH_PASSING")
 
-	// 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-NodeHealthStatus types appropriately.
-	resourcetest.Resource(pbcatalog.DNSPolicyType, "test-policy-"+tenancy.Partition+"-"+tenancy.Namespace).
-		WithData(suite.T(), dnsPolicyData).
-		WithOwner(suite.nodeNoHealth).
-		WithTenancy(tenancy).
+	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)
-}
 
-func (suite *nodeHealthControllerTestSuite) cleanUpNodes() {
-	suite.resourceClient.MustDelete(suite.T(), suite.nodeNoHealth)
-	suite.resourceClient.MustDelete(suite.T(), suite.nodeCritical)
-	suite.resourceClient.MustDelete(suite.T(), suite.nodeWarning)
-	suite.resourceClient.MustDelete(suite.T(), suite.nodePassing)
-	suite.resourceClient.MustDelete(suite.T(), suite.nodeMaintenance)
+	suite.waitForReconciliation(suite.nodePassing, "HEALTH_CRITICAL")
 }
 
-func (suite *nodeHealthControllerTestSuite) runTestCaseWithTenancies(t func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			suite.setupNodesWithTenancy(tenancy)
-			suite.T().Cleanup(func() {
-				suite.cleanUpNodes()
-			})
-			t(tenancy)
-		})
-	}
+func TestNodeHealthController(t *testing.T) {
+	suite.Run(t, new(nodeHealthControllerTestSuite))
 }
diff --git a/internal/catalog/internal/controllers/workloadhealth/controller_test.go b/internal/catalog/internal/controllers/workloadhealth/controller_test.go
index fd15404cdf824..9a00a940a07e0 100644
--- a/internal/catalog/internal/controllers/workloadhealth/controller_test.go
+++ b/internal/catalog/internal/controllers/workloadhealth/controller_test.go
@@ -6,6 +6,8 @@ package workloadhealth
 import (
 	"context"
 	"fmt"
+	"github.com/hashicorp/consul/internal/resource"
+	"google.golang.org/protobuf/testing/protocmp"
 	"testing"
 	"time"
 
@@ -13,21 +15,18 @@ import (
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"google.golang.org/protobuf/testing/protocmp"
 
 	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"
 	"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"
-	"github.com/hashicorp/consul/version/versiontest"
 )
 
 var (
@@ -46,15 +45,10 @@ var (
 	}
 )
 
-func resourceID(rtype *pbresource.Type, name string, tenancy *pbresource.Tenancy) *pbresource.ID {
-	defaultTenancy := resource.DefaultNamespacedTenancy()
-	if tenancy != nil {
-		defaultTenancy = tenancy
-	}
-
+func resourceID(rtype *pbresource.Type, name string) *pbresource.ID {
 	return &pbresource.ID{
 		Type:    rtype,
-		Tenancy: defaultTenancy,
+		Tenancy: resource.DefaultNamespacedTenancy(),
 		Name:    name,
 	}
 }
@@ -85,26 +79,18 @@ type controllerSuite struct {
 	suite.Suite
 	client  pbresource.ResourceServiceClient
 	runtime controller.Runtime
-
-	isEnterprise bool
-	tenancies    []*pbresource.Tenancy
 }
 
 func (suite *controllerSuite) SetupTest() {
-	suite.tenancies = resourcetest.TestTenancies()
-	suite.client = svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
+	suite.client = svctest.RunResourceService(suite.T(), types.Register)
 	suite.runtime = controller.Runtime{Client: suite.client, Logger: testutil.Logger(suite.T())}
-	suite.isEnterprise = versiontest.IsEnterprise()
 }
 
 // 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, tenancy *pbresource.Tenancy) *pbresource.Resource {
+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 {
@@ -113,9 +99,6 @@ func (suite *controllerSuite) injectNodeWithStatus(name string, health pbcatalog
 
 	return resourcetest.Resource(pbcatalog.NodeType, name).
 		WithData(suite.T(), nodeData).
-		WithTenancy(&pbresource.Tenancy{
-			Partition: tenancy.Partition,
-		}).
 		WithStatus(nodehealth.StatusKey, &pbresource.Status{
 			Conditions: []*pbresource.Condition{
 				{
@@ -159,20 +142,18 @@ func (suite *workloadHealthControllerTestSuite) SetupTest() {
 //
 // * 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, tenancy *pbresource.Tenancy, status *pbresource.Condition) *pbresource.Resource {
+func (suite *workloadHealthControllerTestSuite) testReconcileWithNode(nodeHealth, workloadHealth pbcatalog.Health, status *pbresource.Condition) *pbresource.Resource {
 	suite.T().Helper()
 
-	node := suite.injectNodeWithStatus("test-node", nodeHealth, tenancy)
+	node := suite.injectNodeWithStatus("test-node", nodeHealth)
 
 	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
 		WithData(suite.T(), workloadData(node.Id.Name)).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
 	resourcetest.Resource(pbcatalog.HealthStatusType, "test-status").
 		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: workloadHealth}).
 		WithOwner(workload.Id).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
 	err := suite.reconciler.Reconcile(context.Background(), suite.runtime, controller.Request{
@@ -208,16 +189,14 @@ func (suite *workloadHealthControllerTestSuite) testReconcileWithNode(nodeHealth
 // 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, tenancy *pbresource.Tenancy, status *pbresource.Condition) *pbresource.Resource {
+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("")).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
 	resourcetest.Resource(pbcatalog.HealthStatusType, "test-status").
 		WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: workloadHealth}).
-		WithTenancy(tenancy).
 		WithOwner(workload.Id).
 		Write(suite.T(), suite.client)
 
@@ -377,13 +356,11 @@ func (suite *workloadHealthControllerTestSuite) TestReconcile() {
 
 	for name, tcase := range cases {
 		suite.Run(name, func() {
-			suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-				if tcase.nodeHealth != pbcatalog.Health_HEALTH_ANY {
-					suite.testReconcileWithNode(tcase.nodeHealth, tcase.workloadHealth, tenancy, tcase.expectedStatus)
-				} else {
-					suite.testReconcileWithoutNode(tcase.workloadHealth, tenancy, tcase.expectedStatus)
-				}
-			})
+			if tcase.nodeHealth != pbcatalog.Health_HEALTH_ANY {
+				suite.testReconcileWithNode(tcase.nodeHealth, tcase.workloadHealth, tcase.expectedStatus)
+			} else {
+				suite.testReconcileWithoutNode(tcase.workloadHealth, tcase.expectedStatus)
+			}
 		})
 	}
 }
@@ -395,62 +372,56 @@ func (suite *workloadHealthControllerTestSuite) TestReconcileReadError() {
 	// 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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		id := resourceID(fakeType, "blah", tenancy)
+	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))
-	})
+	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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		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
-			WithTenancy(tenancy).
-			Build()
-
-		node := resourcetest.Resource(pbcatalog.NodeType, "test-node").
-			WithData(suite.T(), nodeData).
-			WithTenancy(&pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}).
-			// 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)
-	})
+
+	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
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		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() {
@@ -463,32 +434,25 @@ func (suite *workloadHealthControllerTestSuite) TestGetNodeHealthError() {
 	// but the exact error isn't very relevant to the core reason this
 	// test exists.
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		node := resourcetest.Resource(pbcatalog.NodeType, "test-node").
-			WithData(suite.T(), nodeData).
-			WithTenancy(&pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}).
-			Write(suite.T(), suite.client)
-
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-			WithData(suite.T(), workloadData(node.Id.Name)).
-			WithTenancy(tenancy).
-			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).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		err := suite.reconciler.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: workload.Id,
-		})
+	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)
 
-		require.Error(suite.T(), err)
-		require.Equal(suite.T(), errNodeUnreconciled, err)
+	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() {
@@ -497,26 +461,24 @@ func (suite *workloadHealthControllerTestSuite) TestReconcile_AvoidReconciliatio
 	// 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)
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		status := &pbresource.Condition{
-			Type:    StatusConditionHealthy,
-			State:   pbresource.Condition_STATE_FALSE,
-			Reason:  "HEALTH_WARNING",
-			Message: WorkloadUnhealthyMessage,
-		}
-		res1 := suite.testReconcileWithoutNode(pbcatalog.Health_HEALTH_WARNING, tenancy, 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)
+	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)
+	// 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)
-	})
+	// 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() {
@@ -536,52 +498,47 @@ func (suite *workloadHealthControllerTestSuite) TestController() {
 	// run the manager
 	go mgr.Run(ctx)
 
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		node := suite.injectNodeWithStatus("test-node", pbcatalog.Health_HEALTH_PASSING, tenancy)
-
-		// create the workload
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-			WithData(suite.T(), workloadData(node.Id.Name)).
-			WithTenancy(tenancy).
-			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 unhealthy
-		suite.injectNodeWithStatus("test-node", pbcatalog.Health_HEALTH_WARNING, tenancy)
-
-		// 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).
-			WithTenancy(tenancy).
-			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).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-		workload = resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
-			WithData(suite.T(), workloadData("")).
-			WithTenancy(tenancy).
-			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")
-	})
+	// 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 unhealthy
+	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
@@ -612,7 +569,7 @@ type getWorkloadHealthTestSuite struct {
 	controllerSuite
 }
 
-func (suite *getWorkloadHealthTestSuite) addHealthStatuses(workload *pbresource.ID, tenancy *pbresource.Tenancy, desiredHealth pbcatalog.Health) {
+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.
@@ -633,7 +590,6 @@ func (suite *getWorkloadHealthTestSuite) addHealthStatuses(workload *pbresource.
 		if desiredHealth >= health {
 			resourcetest.Resource(pbcatalog.HealthStatusType, fmt.Sprintf("check-%s-%d", workload.Name, idx)).
 				WithData(suite.T(), &pbcatalog.HealthStatus{Type: "tcp", Status: health}).
-				WithTenancy(tenancy).
 				WithOwner(workload).
 				Write(suite.T(), suite.client)
 		}
@@ -645,28 +601,23 @@ func (suite *getWorkloadHealthTestSuite) TestListError() {
 	// getWorkloadHealth. When the resource listing fails, we want to
 	// propagate the error which should eventually result in retrying
 	// the operation.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		health, err := getWorkloadHealth(context.Background(), suite.runtime, resourceID(fakeType, "foo", tenancy))
+	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)
-	})
+	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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, "foo").
-			WithData(suite.T(), workloadData("")).
-			WithTenancy(tenancy).
-			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)
-	})
+	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() {
@@ -675,27 +626,24 @@ func (suite *getWorkloadHealthTestSuite) TestWithStatuses() {
 	// 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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		for value, status := range pbcatalog.Health_name {
-			health := pbcatalog.Health(value)
-			if health == pbcatalog.Health_HEALTH_ANY {
-				continue
-			}
+	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("")).
-					WithTenancy(tenancy).
-					Write(suite.T(), suite.client)
+		suite.Run(status, func() {
+			workload := resourcetest.Resource(pbcatalog.WorkloadType, "foo").
+				WithData(suite.T(), workloadData("")).
+				Write(suite.T(), suite.client)
 
-				suite.addHealthStatuses(workload.Id, tenancy, health)
+			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)
-			})
-		}
-	})
+			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) {
@@ -711,68 +659,53 @@ func (suite *getNodeHealthTestSuite) TestNotfound() {
 	// 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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		health, err := getNodeHealth(context.Background(), suite.runtime, resourceID(pbcatalog.NodeType, "not-found", &pbresource.Tenancy{
-			Partition: tenancy.Partition,
-		}))
-		require.NoError(suite.T(), err)
-		require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-	})
+	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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		health, err := getNodeHealth(context.Background(), suite.runtime, resourceID(fakeType, "not-found", tenancy))
-		require.Error(suite.T(), err)
-		require.Equal(suite.T(), codes.InvalidArgument, status.Code(err))
-		require.Equal(suite.T(), pbcatalog.Health_HEALTH_CRITICAL, health)
-	})
+	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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		node := resourcetest.Resource(pbcatalog.NodeType, "unreconciled").
-			WithData(suite.T(), nodeData).
-			WithTenancy(&pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}).
-			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)
-	})
+	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 deemed critical. This should never happen
+	// 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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		node := resourcetest.Resource(pbcatalog.NodeType, "no-conditions").
-			WithData(suite.T(), nodeData).
-			WithTenancy(&pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}).
-			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)
-	})
+	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() {
@@ -783,67 +716,48 @@ func (suite *getNodeHealthTestSuite) TestInvalidReason() {
 	// 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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		node := resourcetest.Resource(pbcatalog.NodeType, "invalid-reason").
-			WithData(suite.T(), nodeData).
-			WithTenancy(&pbresource.Tenancy{
-				Partition: tenancy.Partition,
-			}).
-			WithStatus(nodehealth.StatusKey, &pbresource.Status{
-				Conditions: []*pbresource.Condition{
-					{
-						Type:   nodehealth.StatusConditionHealthy,
-						State:  pbresource.Condition_STATE_FALSE,
-						Reason: "INVALID_REASON",
-					},
+	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)
-	})
+			},
+		}).
+		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.
-	suite.controllerSuite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		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
-			}
+	for value, healthStr := range pbcatalog.Health_name {
+		health := pbcatalog.Health(value)
 
-			suite.T().Run(healthStr, func(t *testing.T) {
-				node := suite.injectNodeWithStatus("test-node", health, tenancy)
-
-				actualHealth, err := getNodeHealth(context.Background(), suite.runtime, node.Id)
-				require.NoError(t, err)
-				require.Equal(t, health, actualHealth)
-			})
+		// this is not a valid health that a health status
+		// may be in.
+		if health == pbcatalog.Health_HEALTH_ANY {
+			continue
 		}
-	})
-}
 
-func TestGetNodeHealth(t *testing.T) {
-	suite.Run(t, new(getNodeHealthTestSuite))
-}
+		suite.T().Run(healthStr, func(t *testing.T) {
+			node := suite.injectNodeWithStatus("test-node", health)
 
-func (suite *controllerSuite) runTestCaseWithTenancies(testFunc func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			testFunc(tenancy)
+			actualHealth, err := getNodeHealth(context.Background(), suite.runtime, node.Id)
+			require.NoError(t, err)
+			require.Equal(t, health, actualHealth)
 		})
 	}
 }
 
-func (suite *controllerSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
+func TestGetNodeHealth(t *testing.T) {
+	suite.Run(t, new(getNodeHealthTestSuite))
 }
diff --git a/internal/catalog/internal/mappers/nodemapper/node_mapper.go b/internal/catalog/internal/mappers/nodemapper/node_mapper.go
index 8c3af927b2f54..9c17478d76390 100644
--- a/internal/catalog/internal/mappers/nodemapper/node_mapper.go
+++ b/internal/catalog/internal/mappers/nodemapper/node_mapper.go
@@ -5,7 +5,6 @@ package nodemapper
 
 import (
 	"context"
-
 	"github.com/hashicorp/consul/internal/controller"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
@@ -27,11 +26,9 @@ func New() *NodeMapper {
 // 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: &pbresource.Tenancy{
-			Partition: workload.Id.Tenancy.GetPartition(),
-		},
-		Name: workloadData.NodeName,
+		Type:    pbcatalog.NodeType,
+		Tenancy: workload.Id.Tenancy,
+		Name:    workloadData.NodeName,
 	}
 }
 
diff --git a/internal/catalog/internal/mappers/nodemapper/node_mapper_test.go b/internal/catalog/internal/mappers/nodemapper/node_mapper_test.go
index 3d4c2b6fd05bf..fda260361fe8d 100644
--- a/internal/catalog/internal/mappers/nodemapper/node_mapper_test.go
+++ b/internal/catalog/internal/mappers/nodemapper/node_mapper_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/hashicorp/consul/internal/controller"
-	"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"
@@ -30,11 +29,9 @@ func TestNodeMapper_NodeIDFromWorkload(t *testing.T) {
 
 	actual := mapper.NodeIDFromWorkload(workload, data)
 	expected := &pbresource.ID{
-		Type: pbcatalog.NodeType,
-		Tenancy: &pbresource.Tenancy{
-			Partition: workload.Id.Tenancy.GetPartition(),
-		},
-		Name: "test-node",
+		Type:    pbcatalog.NodeType,
+		Tenancy: workload.Id.Tenancy,
+		Name:    "test-node",
 	}
 
 	prototest.AssertDeepEqual(t, expected, actual)
@@ -58,12 +55,10 @@ func TestNodeMapper_WorkloadTracking(t *testing.T) {
 	mapper := New()
 
 	node1 := resourcetest.Resource(pbcatalog.NodeType, "node1").
-		WithTenancy(resource.DefaultPartitionedTenancy()).
 		WithData(t, &pbcatalog.Node{Addresses: []*pbcatalog.NodeAddress{{Host: "198.18.0.1"}}}).
 		Build()
 
 	node2 := resourcetest.Resource(pbcatalog.NodeType, "node2").
-		WithTenancy(resource.DefaultPartitionedTenancy()).
 		WithData(t, &pbcatalog.Node{Addresses: []*pbcatalog.NodeAddress{{Host: "198.18.0.2"}}}).
 		Build()
 
diff --git a/internal/catalog/internal/types/acl_hooks.go b/internal/catalog/internal/types/acl_hooks.go
index d9ddcb8e93cc1..8250767f72549 100644
--- a/internal/catalog/internal/types/acl_hooks.go
+++ b/internal/catalog/internal/types/acl_hooks.go
@@ -13,22 +13,31 @@ func aclReadHookResourceWithWorkloadSelector(authorizer acl.Authorizer, authzCon
 	return authorizer.ToAllowAuthorizer().ServiceReadAllowed(id.GetName(), authzContext)
 }
 
-func aclWriteHookResourceWithWorkloadSelector[T WorkloadSelecting](authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, r *resource.DecodedResource[T]) error {
+func aclWriteHookResourceWithWorkloadSelector[T WorkloadSelecting](authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
+	if res == nil {
+		return resource.ErrNeedResource
+	}
+
+	decodedService, err := resource.Decode[T](res)
+	if err != nil {
+		return resource.ErrNeedResource
+	}
+
 	// First check service:write on the name.
-	err := authorizer.ToAllowAuthorizer().ServiceWriteAllowed(r.GetId().GetName(), authzContext)
+	err = authorizer.ToAllowAuthorizer().ServiceWriteAllowed(res.GetId().GetName(), authzContext)
 	if err != nil {
 		return err
 	}
 
 	// Then also check whether we're allowed to select a service.
-	for _, name := range r.Data.GetWorkloads().GetNames() {
+	for _, name := range decodedService.GetData().GetWorkloads().GetNames() {
 		err = authorizer.ToAllowAuthorizer().ServiceReadAllowed(name, authzContext)
 		if err != nil {
 			return err
 		}
 	}
 
-	for _, prefix := range r.Data.GetWorkloads().GetPrefixes() {
+	for _, prefix := range decodedService.GetData().GetWorkloads().GetPrefixes() {
 		err = authorizer.ToAllowAuthorizer().ServiceReadPrefixAllowed(prefix, authzContext)
 		if err != nil {
 			return err
@@ -41,7 +50,7 @@ func aclWriteHookResourceWithWorkloadSelector[T WorkloadSelecting](authorizer ac
 func ACLHooksForWorkloadSelectingType[T WorkloadSelecting]() *resource.ACLHooks {
 	return &resource.ACLHooks{
 		Read:  aclReadHookResourceWithWorkloadSelector,
-		Write: resource.DecodeAndAuthorizeWrite(aclWriteHookResourceWithWorkloadSelector[T]),
+		Write: aclWriteHookResourceWithWorkloadSelector[T],
 		List:  resource.NoOpACLListHook,
 	}
 }
diff --git a/internal/catalog/internal/types/dns_policy.go b/internal/catalog/internal/types/dns_policy.go
index 91dd2615455ca..8e9dd864a9573 100644
--- a/internal/catalog/internal/types/dns_policy.go
+++ b/internal/catalog/internal/types/dns_policy.go
@@ -10,10 +10,9 @@ import (
 
 	"github.com/hashicorp/consul/internal/resource"
 	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedDNSPolicy = resource.DecodedResource[*pbcatalog.DNSPolicy]
-
 func RegisterDNSPolicy(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.DNSPolicyType,
@@ -24,13 +23,17 @@ func RegisterDNSPolicy(r resource.Registry) {
 	})
 }
 
-var ValidateDNSPolicy = resource.DecodeAndValidate(validateDNSPolicy)
+func ValidateDNSPolicy(res *pbresource.Resource) error {
+	var policy pbcatalog.DNSPolicy
+
+	if err := res.Data.UnmarshalTo(&policy); err != nil {
+		return resource.NewErrDataParse(&policy, err)
+	}
 
-func validateDNSPolicy(res *DecodedDNSPolicy) error {
 	var err error
 	// Ensure that this resource isn't useless and is attempting to
 	// select at least one workload.
-	if selErr := ValidateSelector(res.Data.Workloads, false); selErr != nil {
+	if selErr := ValidateSelector(policy.Workloads, false); selErr != nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "workloads",
 			Wrapped: selErr,
@@ -38,7 +41,7 @@ func validateDNSPolicy(res *DecodedDNSPolicy) error {
 	}
 
 	// Validate the weights
-	if weightErr := validateDNSPolicyWeights(res.Data.Weights); weightErr != nil {
+	if weightErr := validateDNSPolicyWeights(policy.Weights); weightErr != nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "weights",
 			Wrapped: weightErr,
diff --git a/internal/catalog/internal/types/failover_policy.go b/internal/catalog/internal/types/failover_policy.go
index 012150fc046dc..047bb9a95b050 100644
--- a/internal/catalog/internal/types/failover_policy.go
+++ b/internal/catalog/internal/types/failover_policy.go
@@ -15,8 +15,6 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedFailoverPolicy = resource.DecodedResource[*pbcatalog.FailoverPolicy]
-
 func RegisterFailoverPolicy(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.FailoverPolicyType,
@@ -26,32 +24,36 @@ func RegisterFailoverPolicy(r resource.Registry) {
 		Validate: ValidateFailoverPolicy,
 		ACLs: &resource.ACLHooks{
 			Read:  aclReadHookFailoverPolicy,
-			Write: resource.DecodeAndAuthorizeWrite(aclWriteHookFailoverPolicy),
+			Write: aclWriteHookFailoverPolicy,
 			List:  resource.NoOpACLListHook,
 		},
 	})
 }
 
-var MutateFailoverPolicy = resource.DecodeAndMutate(mutateFailoverPolicy)
+func MutateFailoverPolicy(res *pbresource.Resource) error {
+	var failover pbcatalog.FailoverPolicy
+
+	if err := res.Data.UnmarshalTo(&failover); err != nil {
+		return resource.NewErrDataParse(&failover, err)
+	}
 
-func mutateFailoverPolicy(res *DecodedFailoverPolicy) (bool, error) {
 	changed := false
 
 	// Handle eliding empty configs.
-	if res.Data.Config != nil && res.Data.Config.IsEmpty() {
-		res.Data.Config = nil
+	if failover.Config != nil && failover.Config.IsEmpty() {
+		failover.Config = nil
 		changed = true
 	}
 
-	if res.Data.Config != nil {
-		if mutateFailoverConfig(res.Id.Tenancy, res.Data.Config) {
+	if failover.Config != nil {
+		if mutateFailoverConfig(res.Id.Tenancy, failover.Config) {
 			changed = true
 		}
 	}
 
-	for port, pc := range res.Data.PortConfigs {
+	for port, pc := range failover.PortConfigs {
 		if pc.IsEmpty() {
-			delete(res.Data.PortConfigs, port)
+			delete(failover.PortConfigs, port)
 			changed = true
 		} else {
 			if mutateFailoverConfig(res.Id.Tenancy, pc) {
@@ -59,12 +61,16 @@ func mutateFailoverPolicy(res *DecodedFailoverPolicy) (bool, error) {
 			}
 		}
 	}
-	if len(res.Data.PortConfigs) == 0 {
-		res.Data.PortConfigs = nil
+	if len(failover.PortConfigs) == 0 {
+		failover.PortConfigs = nil
 		changed = true
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&failover)
 }
 
 func mutateFailoverConfig(policyTenancy *pbresource.Tenancy, config *pbcatalog.FailoverConfig) (changed bool) {
@@ -103,31 +109,35 @@ func isLocalPeer(p string) bool {
 	return p == "local" || p == ""
 }
 
-var ValidateFailoverPolicy = resource.DecodeAndValidate(validateFailoverPolicy)
+func ValidateFailoverPolicy(res *pbresource.Resource) error {
+	var failover pbcatalog.FailoverPolicy
+
+	if err := res.Data.UnmarshalTo(&failover); err != nil {
+		return resource.NewErrDataParse(&failover, err)
+	}
 
-func validateFailoverPolicy(res *DecodedFailoverPolicy) error {
 	var merr error
 
-	if res.Data.Config == nil && len(res.Data.PortConfigs) == 0 {
+	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 res.Data.Config != nil {
+	if failover.Config != nil {
 		wrapConfigErr := func(err error) error {
 			return resource.ErrInvalidField{
 				Name:    "config",
 				Wrapped: err,
 			}
 		}
-		if cfgErr := validateFailoverConfig(res.Data.Config, false, wrapConfigErr); cfgErr != nil {
+		if cfgErr := validateFailoverConfig(failover.Config, false, wrapConfigErr); cfgErr != nil {
 			merr = multierror.Append(merr, cfgErr)
 		}
 	}
 
-	for portName, pc := range res.Data.PortConfigs {
+	for portName, pc := range failover.PortConfigs {
 		wrapConfigErr := func(err error) error {
 			return resource.ErrInvalidMapValue{
 				Map:     "port_configs",
@@ -323,7 +333,7 @@ func aclReadHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.Auth
 	return authorizer.ToAllowAuthorizer().ServiceReadAllowed(serviceName, authzContext)
 }
 
-func aclWriteHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *DecodedFailoverPolicy) error {
+func aclWriteHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
 	// FailoverPolicy is name-aligned with Service
 	serviceName := res.Id.Name
 
@@ -332,10 +342,15 @@ func aclWriteHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.Aut
 		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 res.Data.Config != nil {
-		for _, dest := range res.Data.Config.Destinations {
+	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 {
@@ -343,7 +358,7 @@ func aclWriteHookFailoverPolicy(authorizer acl.Authorizer, authzContext *acl.Aut
 			}
 		}
 	}
-	for _, pc := range res.Data.PortConfigs {
+	for _, pc := range dec.Data.PortConfigs {
 		for _, dest := range pc.Destinations {
 			destAuthzContext := resource.AuthorizerContext(dest.Ref.GetTenancy())
 			destServiceName := dest.Ref.GetName()
diff --git a/internal/catalog/internal/types/health_checks.go b/internal/catalog/internal/types/health_checks.go
index 3d819e12885aa..1333e2368d882 100644
--- a/internal/catalog/internal/types/health_checks.go
+++ b/internal/catalog/internal/types/health_checks.go
@@ -8,10 +8,9 @@ import (
 
 	"github.com/hashicorp/consul/internal/resource"
 	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedHealthChecks = resource.DecodedResource[*pbcatalog.HealthChecks]
-
 func RegisterHealthChecks(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.HealthChecksType,
@@ -22,13 +21,17 @@ func RegisterHealthChecks(r resource.Registry) {
 	})
 }
 
-var ValidateHealthChecks = resource.DecodeAndValidate(validateHealthChecks)
+func ValidateHealthChecks(res *pbresource.Resource) error {
+	var checks pbcatalog.HealthChecks
+
+	if err := res.Data.UnmarshalTo(&checks); err != nil {
+		return resource.NewErrDataParse(&checks, err)
+	}
 
-func validateHealthChecks(res *DecodedHealthChecks) error {
 	var err error
 
 	// Validate the workload selector
-	if selErr := ValidateSelector(res.Data.Workloads, false); selErr != nil {
+	if selErr := ValidateSelector(checks.Workloads, false); selErr != nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "workloads",
 			Wrapped: selErr,
@@ -36,7 +39,7 @@ func validateHealthChecks(res *DecodedHealthChecks) error {
 	}
 
 	// Validate each check
-	for idx, check := range res.Data.HealthChecks {
+	for idx, check := range checks.HealthChecks {
 		if checkErr := validateCheck(check); checkErr != nil {
 			err = multierror.Append(err, resource.ErrInvalidListElement{
 				Name:    "checks",
diff --git a/internal/catalog/internal/types/health_status.go b/internal/catalog/internal/types/health_status.go
index 9acb4a3fb9ce4..fe92e858b025e 100644
--- a/internal/catalog/internal/types/health_status.go
+++ b/internal/catalog/internal/types/health_status.go
@@ -12,8 +12,6 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedHealthStatus = resource.DecodedResource[*pbcatalog.HealthStatus]
-
 func RegisterHealthStatus(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.HealthStatusType,
@@ -21,29 +19,33 @@ func RegisterHealthStatus(r resource.Registry) {
 		Scope:    resource.ScopeNamespace,
 		Validate: ValidateHealthStatus,
 		ACLs: &resource.ACLHooks{
-			Read:  resource.AuthorizeReadWithResource(aclReadHookHealthStatus),
+			Read:  aclReadHookHealthStatus,
 			Write: aclWriteHookHealthStatus,
 			List:  resource.NoOpACLListHook,
 		},
 	})
 }
 
-var ValidateHealthStatus = resource.DecodeAndValidate(validateHealthStatus)
+func ValidateHealthStatus(res *pbresource.Resource) error {
+	var hs pbcatalog.HealthStatus
+
+	if err := res.Data.UnmarshalTo(&hs); err != nil {
+		return resource.NewErrDataParse(&hs, err)
+	}
 
-func validateHealthStatus(res *DecodedHealthStatus) error {
 	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 res.Data.Type == "" {
+	if hs.Type == "" {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "type",
 			Wrapped: resource.ErrMissing,
 		})
 	}
 
-	switch res.Data.Status {
+	switch hs.Status {
 	case pbcatalog.Health_HEALTH_PASSING,
 		pbcatalog.Health_HEALTH_WARNING,
 		pbcatalog.Health_HEALTH_CRITICAL,
@@ -59,24 +61,31 @@ func validateHealthStatus(res *DecodedHealthStatus) error {
 	// 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.Resource.Owner == nil {
+	if res.Owner == nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "owner",
 			Wrapped: resource.ErrMissing,
 		})
-	} else if !resource.EqualType(res.Owner.Type, pbcatalog.WorkloadType) {
+	} 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
 }
 
-func aclReadHookHealthStatus(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
+func aclReadHookHealthStatus(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
+	if res == nil {
+		return resource.ErrNeedResource
+	}
 	// For a health status of a workload we need to check service:read perms.
 	if res.GetOwner() != nil && resource.EqualType(res.GetOwner().GetType(), pbcatalog.WorkloadType) {
 		return authorizer.ToAllowAuthorizer().ServiceReadAllowed(res.GetOwner().GetName(), authzContext)
 	}
 
+	if res.GetOwner() != nil && resource.EqualType(res.GetOwner().GetType(), pbcatalog.NodeType) {
+		return authorizer.ToAllowAuthorizer().NodeReadAllowed(res.GetOwner().GetName(), authzContext)
+	}
+
 	return acl.PermissionDenied("cannot read catalog.HealthStatus because there is no owner")
 }
 
@@ -86,5 +95,9 @@ func aclWriteHookHealthStatus(authorizer acl.Authorizer, authzContext *acl.Autho
 		return authorizer.ToAllowAuthorizer().ServiceWriteAllowed(res.GetOwner().GetName(), authzContext)
 	}
 
+	if res.GetOwner() != nil && resource.EqualType(res.GetOwner().GetType(), pbcatalog.NodeType) {
+		return authorizer.ToAllowAuthorizer().NodeWriteAllowed(res.GetOwner().GetName(), authzContext)
+	}
+
 	return acl.PermissionDenied("cannot write catalog.HealthStatus because there is no owner")
 }
diff --git a/internal/catalog/internal/types/health_status_test.go b/internal/catalog/internal/types/health_status_test.go
index 58c22fd720f31..9482e4770e40a 100644
--- a/internal/catalog/internal/types/health_status_test.go
+++ b/internal/catalog/internal/types/health_status_test.go
@@ -70,6 +70,13 @@ func TestValidateHealthStatus_Ok(t *testing.T) {
 				Name:    "foo-workload",
 			},
 		},
+		"node-owned": {
+			owner: &pbresource.ID{
+				Type:    pbcatalog.NodeType,
+				Tenancy: defaultHealthStatusOwnerTenancy,
+				Name:    "bar-node",
+			},
+		},
 	}
 
 	for name, tcase := range cases {
@@ -214,6 +221,7 @@ func TestHealthStatusACLs(t *testing.T) {
 	Register(registry)
 
 	workload := resourcetest.Resource(pbcatalog.WorkloadType, "test").ID()
+	node := resourcetest.Resource(pbcatalog.NodeType, "test").ID()
 
 	healthStatusData := &pbcatalog.HealthStatus{
 		Type:   "tcp",
@@ -248,6 +256,42 @@ func TestHealthStatusACLs(t *testing.T) {
 			WriteOK: resourcetest.ALLOW,
 			ListOK:  resourcetest.DEFAULT,
 		},
+		"service test read with node owner": {
+			Rules:   `service "test" { policy = "read" }`,
+			Data:    healthStatusData,
+			Owner:   node,
+			Typ:     pbcatalog.HealthStatusType,
+			ReadOK:  resourcetest.DENY,
+			WriteOK: resourcetest.DENY,
+			ListOK:  resourcetest.DEFAULT,
+		},
+		"service test write with node owner": {
+			Rules:   `service "test" { policy = "write" }`,
+			Data:    healthStatusData,
+			Owner:   node,
+			Typ:     pbcatalog.HealthStatusType,
+			ReadOK:  resourcetest.DENY,
+			WriteOK: resourcetest.DENY,
+			ListOK:  resourcetest.DEFAULT,
+		},
+		"node test read with node owner": {
+			Rules:   `node "test" { policy = "read" }`,
+			Data:    healthStatusData,
+			Owner:   node,
+			Typ:     pbcatalog.HealthStatusType,
+			ReadOK:  resourcetest.ALLOW,
+			WriteOK: resourcetest.DENY,
+			ListOK:  resourcetest.DEFAULT,
+		},
+		"node test write with node owner": {
+			Rules:   `node "test" { policy = "write" }`,
+			Data:    healthStatusData,
+			Owner:   node,
+			Typ:     pbcatalog.HealthStatusType,
+			ReadOK:  resourcetest.ALLOW,
+			WriteOK: resourcetest.ALLOW,
+			ListOK:  resourcetest.DEFAULT,
+		},
 		"node test read with workload owner": {
 			Rules:   `node "test" { policy = "read" }`,
 			Data:    healthStatusData,
diff --git a/internal/catalog/internal/types/node.go b/internal/catalog/internal/types/node.go
index 7b2ea7f36fd8d..42ac833c6e7d8 100644
--- a/internal/catalog/internal/types/node.go
+++ b/internal/catalog/internal/types/node.go
@@ -12,13 +12,16 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedNode = resource.DecodedResource[*pbcatalog.Node]
-
 func RegisterNode(r resource.Registry) {
 	r.Register(resource.Registration{
-		Type:     pbcatalog.NodeType,
-		Proto:    &pbcatalog.Node{},
-		Scope:    resource.ScopePartition,
+		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,
 		ACLs: &resource.ACLHooks{
 			Read:  aclReadHookNode,
@@ -28,12 +31,16 @@ func RegisterNode(r resource.Registry) {
 	})
 }
 
-var ValidateNode = resource.DecodeAndValidate(validateNode)
+func ValidateNode(res *pbresource.Resource) error {
+	var node pbcatalog.Node
+
+	if err := res.Data.UnmarshalTo(&node); err != nil {
+		return resource.NewErrDataParse(&node, err)
+	}
 
-func validateNode(res *DecodedNode) error {
 	var err error
 	// Validate that the node has at least 1 address
-	if len(res.Data.Addresses) < 1 {
+	if len(node.Addresses) < 1 {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "addresses",
 			Wrapped: resource.ErrEmpty,
@@ -41,7 +48,7 @@ func validateNode(res *DecodedNode) error {
 	}
 
 	// Validate each node address
-	for idx, addr := range res.Data.Addresses {
+	for idx, addr := range node.Addresses {
 		if addrErr := validateNodeAddress(addr); addrErr != nil {
 			err = multierror.Append(err, resource.ErrInvalidListElement{
 				Name:    "addresses",
diff --git a/internal/catalog/internal/types/node_health_status.go b/internal/catalog/internal/types/node_health_status.go
deleted file mode 100644
index 89d3344029275..0000000000000
--- a/internal/catalog/internal/types/node_health_status.go
+++ /dev/null
@@ -1,90 +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"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-type DecodedNodeHealthStatus = resource.DecodedResource[*pbcatalog.NodeHealthStatus]
-
-func RegisterNodeHealthStatus(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbcatalog.NodeHealthStatusType,
-		Proto:    &pbcatalog.NodeHealthStatus{},
-		Scope:    resource.ScopePartition,
-		Validate: ValidateNodeHealthStatus,
-		ACLs: &resource.ACLHooks{
-			Read:  resource.AuthorizeReadWithResource(aclReadHookNodeHealthStatus),
-			Write: aclWriteHookNodeHealthStatus,
-			List:  resource.NoOpACLListHook,
-		},
-	})
-}
-
-var ValidateNodeHealthStatus = resource.DecodeAndValidate(validateNodeHealthStatus)
-
-func validateNodeHealthStatus(res *DecodedNodeHealthStatus) error {
-	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 res.Data.Type == "" {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "type",
-			Wrapped: resource.ErrMissing,
-		})
-	}
-
-	switch res.Data.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 NodeHealthStatus' owner is a type that we want to allow. The
-	// owner is currently the resource that this NodeHealthStatus applies to. If we
-	// change this to be a parent reference within the NodeHealthStatus.Data then
-	// we could allow for other owners.
-	if res.Resource.Owner == nil {
-		err = multierror.Append(err, resource.ErrInvalidField{
-			Name:    "owner",
-			Wrapped: resource.ErrMissing,
-		})
-	} else if !resource.EqualType(res.Owner.Type, pbcatalog.NodeType) {
-		err = multierror.Append(err, resource.ErrOwnerTypeInvalid{ResourceType: res.Id.Type, OwnerType: res.Owner.Type})
-	}
-
-	return err
-}
-
-func aclReadHookNodeHealthStatus(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	// For a health status of a node we need to check node:read perms.
-	if res.GetOwner() != nil && resource.EqualType(res.GetOwner().GetType(), pbcatalog.NodeType) {
-		return authorizer.ToAllowAuthorizer().NodeReadAllowed(res.GetOwner().GetName(), authzContext)
-	}
-
-	return acl.PermissionDenied("cannot read catalog.NodeHealthStatus because there is no owner")
-}
-
-func aclWriteHookNodeHealthStatus(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	// For a health status of a node we need to check node:write perms.
-	if res.GetOwner() != nil && resource.EqualType(res.GetOwner().GetType(), pbcatalog.NodeType) {
-		return authorizer.ToAllowAuthorizer().NodeWriteAllowed(res.GetOwner().GetName(), authzContext)
-	}
-
-	return acl.PermissionDenied("cannot write catalog.NodeHealthStatus because there is no owner")
-}
diff --git a/internal/catalog/internal/types/node_health_status_test.go b/internal/catalog/internal/types/node_health_status_test.go
deleted file mode 100644
index a612114765122..0000000000000
--- a/internal/catalog/internal/types/node_health_status_test.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"testing"
-
-	"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/stretchr/testify/require"
-	"google.golang.org/protobuf/reflect/protoreflect"
-	"google.golang.org/protobuf/types/known/anypb"
-)
-
-var (
-	defaultNodeHealthStatusOwnerTenancy = &pbresource.Tenancy{
-		Partition: "default",
-		PeerName:  "local",
-	}
-
-	defaultNodeHealthStatusOwner = &pbresource.ID{
-		Type:    pbcatalog.NodeType,
-		Tenancy: defaultNodeHealthStatusOwnerTenancy,
-		Name:    "foo",
-	}
-)
-
-func createNodeHealthStatusResource(t *testing.T, data protoreflect.ProtoMessage, owner *pbresource.ID) *pbresource.Resource {
-	res := &pbresource.Resource{
-		Id: &pbresource.ID{
-			Type: pbcatalog.NodeHealthStatusType,
-			Tenancy: &pbresource.Tenancy{
-				Partition: "default",
-				PeerName:  "local",
-			},
-			Name: "test-status",
-		},
-		Owner: owner,
-	}
-
-	var err error
-	res.Data, err = anypb.New(data)
-	require.NoError(t, err)
-	return res
-}
-
-func TestValidateNodeHealthStatus_Ok(t *testing.T) {
-	data := &pbcatalog.NodeHealthStatus{
-		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{
-		"node-owned": {
-			owner: &pbresource.ID{
-				Type:    pbcatalog.NodeType,
-				Tenancy: defaultNodeHealthStatusOwnerTenancy,
-				Name:    "bar-node",
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			res := createNodeHealthStatusResource(t, data, tcase.owner)
-			err := ValidateNodeHealthStatus(res)
-			require.NoError(t, err)
-		})
-	}
-}
-
-func TestValidateNodeHealthStatus_ParseError(t *testing.T) {
-	// Any type other than the NodeHealthStatus type would work
-	// to cause the error we are expecting
-	data := &pbcatalog.IP{Address: "198.18.0.1"}
-
-	res := createNodeHealthStatusResource(t, data, defaultNodeHealthStatusOwner)
-
-	err := ValidateNodeHealthStatus(res)
-	require.Error(t, err)
-	require.ErrorAs(t, err, &resource.ErrDataParse{})
-}
-
-func TestValidateNodeHealthStatus_InvalidHealth(t *testing.T) {
-	// while this is a valid enum value it is not allowed to be used
-	// as the Status field.
-	data := &pbcatalog.NodeHealthStatus{
-		Type:   "tcp",
-		Status: pbcatalog.Health_HEALTH_ANY,
-	}
-
-	res := createNodeHealthStatusResource(t, data, defaultNodeHealthStatusOwner)
-
-	err := ValidateNodeHealthStatus(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 TestValidateNodeHealthStatus_MissingType(t *testing.T) {
-	data := &pbcatalog.NodeHealthStatus{
-		Status: pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	res := createNodeHealthStatusResource(t, data, defaultNodeHealthStatusOwner)
-
-	err := ValidateNodeHealthStatus(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 TestValidateNodeHealthStatus_MissingOwner(t *testing.T) {
-	data := &pbcatalog.NodeHealthStatus{
-		Type:   "tcp",
-		Status: pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	res := createNodeHealthStatusResource(t, data, nil)
-
-	err := ValidateNodeHealthStatus(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 TestValidateNodeHealthStatus_InvalidOwner(t *testing.T) {
-	data := &pbcatalog.NodeHealthStatus{
-		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.NodeKind,
-				},
-				Tenancy: defaultNodeHealthStatusOwnerTenancy,
-				Name:    "baz",
-			},
-		},
-		"group-version-mismatch": {
-			owner: &pbresource.ID{
-				Type: &pbresource.Type{
-					Group:        pbcatalog.GroupName,
-					GroupVersion: "v99",
-					Kind:         pbcatalog.NodeKind,
-				},
-				Tenancy: defaultNodeHealthStatusOwnerTenancy,
-				Name:    "baz",
-			},
-		},
-		"kind-mismatch": {
-			owner: &pbresource.ID{
-				Type:    pbcatalog.ServiceType,
-				Tenancy: defaultNodeHealthStatusOwnerTenancy,
-				Name:    "baz",
-			},
-		},
-	}
-
-	for name, tcase := range cases {
-		t.Run(name, func(t *testing.T) {
-			res := createNodeHealthStatusResource(t, data, tcase.owner)
-			err := ValidateNodeHealthStatus(res)
-			require.Error(t, err)
-			expected := resource.ErrOwnerTypeInvalid{
-				ResourceType: pbcatalog.NodeHealthStatusType,
-				OwnerType:    tcase.owner.Type,
-			}
-			var actual resource.ErrOwnerTypeInvalid
-			require.ErrorAs(t, err, &actual)
-			require.Equal(t, expected, actual)
-		})
-	}
-}
-
-func TestNodeHealthStatusACLs(t *testing.T) {
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	node := resourcetest.Resource(pbcatalog.NodeType, "test").ID()
-
-	nodehealthStatusData := &pbcatalog.NodeHealthStatus{
-		Type:   "tcp",
-		Status: pbcatalog.Health_HEALTH_PASSING,
-	}
-
-	cases := map[string]resourcetest.ACLTestCase{
-		"no rules": {
-			Rules:   ``,
-			Data:    nodehealthStatusData,
-			Owner:   node,
-			Typ:     pbcatalog.NodeHealthStatusType,
-			ReadOK:  resourcetest.DENY,
-			WriteOK: resourcetest.DENY,
-			ListOK:  resourcetest.DEFAULT,
-		},
-		"service test read with node owner": {
-			Rules:   `service "test" { policy = "read" }`,
-			Data:    nodehealthStatusData,
-			Owner:   node,
-			Typ:     pbcatalog.NodeHealthStatusType,
-			ReadOK:  resourcetest.DENY,
-			WriteOK: resourcetest.DENY,
-			ListOK:  resourcetest.DEFAULT,
-		},
-		"service test write with node owner": {
-			Rules:   `service "test" { policy = "write" }`,
-			Data:    nodehealthStatusData,
-			Owner:   node,
-			Typ:     pbcatalog.NodeHealthStatusType,
-			ReadOK:  resourcetest.DENY,
-			WriteOK: resourcetest.DENY,
-			ListOK:  resourcetest.DEFAULT,
-		},
-		"node test read with node owner": {
-			Rules:   `node "test" { policy = "read" }`,
-			Data:    nodehealthStatusData,
-			Owner:   node,
-			Typ:     pbcatalog.NodeHealthStatusType,
-			ReadOK:  resourcetest.ALLOW,
-			WriteOK: resourcetest.DENY,
-			ListOK:  resourcetest.DEFAULT,
-		},
-		"node test write with node owner": {
-			Rules:   `node "test" { policy = "write" }`,
-			Data:    nodehealthStatusData,
-			Owner:   node,
-			Typ:     pbcatalog.NodeHealthStatusType,
-			ReadOK:  resourcetest.ALLOW,
-			WriteOK: resourcetest.ALLOW,
-			ListOK:  resourcetest.DEFAULT,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			resourcetest.RunACLTestCase(t, tc, registry)
-		})
-	}
-}
diff --git a/internal/catalog/internal/types/service.go b/internal/catalog/internal/types/service.go
index bb56fe10a5710..a91f3a7c51801 100644
--- a/internal/catalog/internal/types/service.go
+++ b/internal/catalog/internal/types/service.go
@@ -10,10 +10,9 @@ import (
 
 	"github.com/hashicorp/consul/internal/resource"
 	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedService = resource.DecodedResource[*pbcatalog.Service]
-
 func RegisterService(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.ServiceType,
@@ -25,25 +24,37 @@ func RegisterService(r resource.Registry) {
 	})
 }
 
-var MutateService = resource.DecodeAndMutate(mutateService)
+func MutateService(res *pbresource.Resource) error {
+	var service pbcatalog.Service
+
+	if err := res.Data.UnmarshalTo(&service); err != nil {
+		return err
+	}
 
-func mutateService(res *DecodedService) (bool, error) {
 	changed := false
 
 	// Default service port protocols.
-	for _, port := range res.Data.Ports {
+	for _, port := range service.Ports {
 		if port.Protocol == pbcatalog.Protocol_PROTOCOL_UNSPECIFIED {
 			port.Protocol = pbcatalog.Protocol_PROTOCOL_TCP
 			changed = true
 		}
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&service)
 }
 
-var ValidateService = resource.DecodeAndValidate(validateService)
+func ValidateService(res *pbresource.Resource) error {
+	var service pbcatalog.Service
+
+	if err := res.Data.UnmarshalTo(&service); err != nil {
+		return resource.NewErrDataParse(&service, err)
+	}
 
-func validateService(res *DecodedService) error {
 	var err error
 
 	// Validate the workload selector. We are allowing selectors with no
@@ -51,7 +62,7 @@ func validateService(res *DecodedService) error {
 	// 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(res.Data.Workloads, true); selErr != nil {
+	if selErr := ValidateSelector(service.Workloads, true); selErr != nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "workloads",
 			Wrapped: selErr,
@@ -61,7 +72,7 @@ func validateService(res *DecodedService) error {
 	usedVirtualPorts := make(map[uint32]int)
 
 	// Validate each port
-	for idx, port := range res.Data.Ports {
+	for idx, port := range service.Ports {
 		if usedIdx, found := usedVirtualPorts[port.VirtualPort]; found {
 			err = multierror.Append(err, resource.ErrInvalidListElement{
 				Name:  "ports",
@@ -119,7 +130,7 @@ func validateService(res *DecodedService) error {
 	}
 
 	// Validate that the Virtual IPs are all IP addresses
-	for idx, vip := range res.Data.VirtualIps {
+	for idx, vip := range service.VirtualIps {
 		if vipErr := validateIPAddress(vip); vipErr != nil {
 			err = multierror.Append(err, resource.ErrInvalidListElement{
 				Name:    "virtual_ips",
diff --git a/internal/catalog/internal/types/service_endpoints.go b/internal/catalog/internal/types/service_endpoints.go
index b78a1bc705fa5..1991c455ad901 100644
--- a/internal/catalog/internal/types/service_endpoints.go
+++ b/internal/catalog/internal/types/service_endpoints.go
@@ -14,8 +14,6 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedServiceEndpoints = resource.DecodedResource[*pbcatalog.ServiceEndpoints]
-
 func RegisterServiceEndpoints(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.ServiceEndpointsType,
@@ -47,9 +45,13 @@ func MutateServiceEndpoints(res *pbresource.Resource) error {
 	return nil
 }
 
-var ValidateServiceEndpoints = resource.DecodeAndValidate[*pbcatalog.ServiceEndpoints](validateServiceEndpoints)
+func ValidateServiceEndpoints(res *pbresource.Resource) error {
+	var svcEndpoints pbcatalog.ServiceEndpoints
+
+	if err := res.Data.UnmarshalTo(&svcEndpoints); err != nil {
+		return resource.NewErrDataParse(&svcEndpoints, err)
+	}
 
-func validateServiceEndpoints(res *DecodedServiceEndpoints) error {
 	var err error
 	if !resource.EqualType(res.Owner.Type, pbcatalog.ServiceType) {
 		err = multierror.Append(err, resource.ErrOwnerTypeInvalid{
@@ -76,8 +78,8 @@ func validateServiceEndpoints(res *DecodedServiceEndpoints) error {
 		})
 	}
 
-	for idx, endpoint := range res.Data.Endpoints {
-		if endpointErr := validateEndpoint(endpoint, res.Resource); endpointErr != nil {
+	for idx, endpoint := range svcEndpoints.Endpoints {
+		if endpointErr := validateEndpoint(endpoint, res); endpointErr != nil {
 			err = multierror.Append(err, resource.ErrInvalidListElement{
 				Name:    "endpoints",
 				Index:   idx,
diff --git a/internal/catalog/internal/types/types.go b/internal/catalog/internal/types/types.go
index 936f2d63ce6b5..15ed6b148de76 100644
--- a/internal/catalog/internal/types/types.go
+++ b/internal/catalog/internal/types/types.go
@@ -14,7 +14,7 @@ func Register(r resource.Registry) {
 	RegisterNode(r)
 	RegisterHealthStatus(r)
 	RegisterFailoverPolicy(r)
-	RegisterNodeHealthStatus(r)
+
 	// todo (v2): re-register once these resources are implemented.
 	//RegisterHealthChecks(r)
 	//RegisterDNSPolicy(r)
diff --git a/internal/catalog/internal/types/virtual_ips.go b/internal/catalog/internal/types/virtual_ips.go
index be692f63ed65a..9c7a065474059 100644
--- a/internal/catalog/internal/types/virtual_ips.go
+++ b/internal/catalog/internal/types/virtual_ips.go
@@ -12,8 +12,6 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedVirtualIPs = resource.DecodedResource[*pbcatalog.VirtualIPs]
-
 func RegisterVirtualIPs(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.VirtualIPsType,
@@ -32,11 +30,15 @@ func RegisterVirtualIPs(r resource.Registry) {
 	})
 }
 
-var ValidateVirtualIPs = resource.DecodeAndValidate(validateVirtualIPs)
+func ValidateVirtualIPs(res *pbresource.Resource) error {
+	var vips pbcatalog.VirtualIPs
+
+	if err := res.Data.UnmarshalTo(&vips); err != nil {
+		return resource.NewErrDataParse(&vips, err)
+	}
 
-func validateVirtualIPs(res *DecodedVirtualIPs) error {
 	var err error
-	for idx, ip := range res.Data.Ips {
+	for idx, ip := range vips.Ips {
 		if vipErr := validateIPAddress(ip.Address); vipErr != nil {
 			err = multierror.Append(err, resource.ErrInvalidListElement{
 				Name:  "ips",
diff --git a/internal/catalog/internal/types/workload.go b/internal/catalog/internal/types/workload.go
index 8535a6250491d..c09513a4a5b3d 100644
--- a/internal/catalog/internal/types/workload.go
+++ b/internal/catalog/internal/types/workload.go
@@ -15,8 +15,6 @@ import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
-type DecodedWorkload = resource.DecodedResource[*pbcatalog.Workload]
-
 func RegisterWorkload(r resource.Registry) {
 	r.Register(resource.Registration{
 		Type:     pbcatalog.WorkloadType,
@@ -25,19 +23,23 @@ func RegisterWorkload(r resource.Registry) {
 		Validate: ValidateWorkload,
 		ACLs: &resource.ACLHooks{
 			Read:  aclReadHookWorkload,
-			Write: resource.DecodeAndAuthorizeWrite(aclWriteHookWorkload),
+			Write: aclWriteHookWorkload,
 			List:  resource.NoOpACLListHook,
 		},
 	})
 }
 
-var ValidateWorkload = resource.DecodeAndValidate(validateWorkload)
+func ValidateWorkload(res *pbresource.Resource) error {
+	var workload pbcatalog.Workload
+
+	if err := res.Data.UnmarshalTo(&workload); err != nil {
+		return resource.NewErrDataParse(&workload, err)
+	}
 
-func validateWorkload(res *DecodedWorkload) error {
 	var err error
 
 	// Validate that the workload has at least one port
-	if len(res.Data.Ports) < 1 {
+	if len(workload.Ports) < 1 {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "ports",
 			Wrapped: resource.ErrEmpty,
@@ -47,7 +49,7 @@ func validateWorkload(res *DecodedWorkload) error {
 	var meshPorts []string
 
 	// Validate the Workload Ports
-	for portName, port := range res.Data.Ports {
+	for portName, port := range workload.Ports {
 		if portNameErr := ValidatePortName(portName); portNameErr != nil {
 			err = multierror.Append(err, resource.ErrInvalidMapKey{
 				Map:     "ports",
@@ -98,12 +100,12 @@ func validateWorkload(res *DecodedWorkload) error {
 	// 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 && res.Data.Identity == "" {
+	if len(meshPorts) > 0 && workload.Identity == "" {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "identity",
 			Wrapped: resource.ErrMissing,
 		})
-	} else if res.Data.Identity != "" && !isValidDNSLabel(res.Data.Identity) {
+	} else if workload.Identity != "" && !isValidDNSLabel(workload.Identity) {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "identity",
 			Wrapped: errNotDNSLabel,
@@ -111,7 +113,7 @@ func validateWorkload(res *DecodedWorkload) error {
 	}
 
 	// Validate workload locality
-	if res.Data.Locality != nil && res.Data.Locality.Region == "" && res.Data.Locality.Zone != "" {
+	if workload.Locality != nil && workload.Locality.Region == "" && workload.Locality.Zone != "" {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "locality",
 			Wrapped: errLocalityZoneNoRegion,
@@ -120,8 +122,8 @@ func validateWorkload(res *DecodedWorkload) error {
 
 	// Node associations are optional but if present the name should
 	// be a valid DNS label.
-	if res.Data.NodeName != "" {
-		if !isValidDNSLabel(res.Data.NodeName) {
+	if workload.NodeName != "" {
+		if !isValidDNSLabel(workload.NodeName) {
 			err = multierror.Append(err, resource.ErrInvalidField{
 				Name:    "node_name",
 				Wrapped: errNotDNSLabel,
@@ -129,7 +131,7 @@ func validateWorkload(res *DecodedWorkload) error {
 		}
 	}
 
-	if len(res.Data.Addresses) < 1 {
+	if len(workload.Addresses) < 1 {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "addresses",
 			Wrapped: resource.ErrEmpty,
@@ -137,8 +139,8 @@ func validateWorkload(res *DecodedWorkload) error {
 	}
 
 	// Validate Workload Addresses
-	for idx, addr := range res.Data.Addresses {
-		if addrErr := validateWorkloadAddress(addr, res.Data.Ports); addrErr != nil {
+	for idx, addr := range workload.Addresses {
+		if addrErr := validateWorkloadAddress(addr, workload.Ports); addrErr != nil {
 			err = multierror.Append(err, resource.ErrInvalidListElement{
 				Name:    "addresses",
 				Index:   idx,
@@ -154,21 +156,26 @@ func aclReadHookWorkload(authorizer acl.Authorizer, authzContext *acl.Authorizer
 	return authorizer.ToAllowAuthorizer().ServiceReadAllowed(id.GetName(), authzContext)
 }
 
-func aclWriteHookWorkload(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *DecodedWorkload) error {
+func aclWriteHookWorkload(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
+	decodedWorkload, err := resource.Decode[*pbcatalog.Workload](res)
+	if err != nil {
+		return resource.ErrNeedResource
+	}
+
 	// First check service:write on the workload name.
-	err := authorizer.ToAllowAuthorizer().ServiceWriteAllowed(res.GetId().GetName(), authzContext)
+	err = authorizer.ToAllowAuthorizer().ServiceWriteAllowed(res.GetId().GetName(), authzContext)
 	if err != nil {
 		return err
 	}
 
 	// Check node:read permissions if node is specified.
-	if res.Data.GetNodeName() != "" {
-		return authorizer.ToAllowAuthorizer().NodeReadAllowed(res.Data.GetNodeName(), authzContext)
+	if decodedWorkload.GetData().GetNodeName() != "" {
+		return authorizer.ToAllowAuthorizer().NodeReadAllowed(decodedWorkload.GetData().GetNodeName(), authzContext)
 	}
 
 	// Check identity:read permissions if identity is specified.
-	if res.Data.GetIdentity() != "" {
-		return authorizer.ToAllowAuthorizer().IdentityReadAllowed(res.Data.GetIdentity(), authzContext)
+	if decodedWorkload.GetData().GetIdentity() != "" {
+		return authorizer.ToAllowAuthorizer().IdentityReadAllowed(decodedWorkload.GetData().GetIdentity(), authzContext)
 	}
 
 	return nil
diff --git a/internal/controller/api_test.go b/internal/controller/api_test.go
index e6d2b8a034460..40d3ec99bebdb 100644
--- a/internal/controller/api_test.go
+++ b/internal/controller/api_test.go
@@ -23,9 +23,7 @@ func TestController_API(t *testing.T) {
 	t.Parallel()
 
 	rec := newTestReconciler()
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
+	client := svctest.RunResourceService(t, demo.RegisterTypes)
 
 	concertsChan := make(chan controller.Event)
 	defer close(concertsChan)
@@ -166,9 +164,7 @@ func TestController_Placement(t *testing.T) {
 
 	t.Run("singleton", func(t *testing.T) {
 		rec := newTestReconciler()
-		client := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(demo.RegisterTypes).
-			Run(t)
+		client := svctest.RunResourceService(t, demo.RegisterTypes)
 
 		ctrl := controller.
 			ForType(demo.TypeV2Artist).
@@ -201,9 +197,7 @@ func TestController_Placement(t *testing.T) {
 
 	t.Run("each server", func(t *testing.T) {
 		rec := newTestReconciler()
-		client := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(demo.RegisterTypes).
-			Run(t)
+		client := svctest.RunResourceService(t, demo.RegisterTypes)
 
 		ctrl := controller.
 			ForType(demo.TypeV2Artist).
@@ -239,10 +233,7 @@ func TestController_String(t *testing.T) {
 }
 
 func TestController_NoReconciler(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
-
+	client := svctest.RunResourceService(t, demo.RegisterTypes)
 	mgr := controller.NewManager(client, testutil.Logger(t))
 
 	ctrl := controller.ForType(demo.TypeV2Artist)
@@ -251,92 +242,6 @@ func TestController_NoReconciler(t *testing.T) {
 		func() { mgr.Register(ctrl) })
 }
 
-func TestController_Watch(t *testing.T) {
-	t.Parallel()
-
-	t.Run("partitioned scoped resources", func(t *testing.T) {
-		rec := newTestReconciler()
-
-		client := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(demo.RegisterTypes).
-			Run(t)
-
-		ctrl := controller.
-			ForType(demo.TypeV1RecordLabel).
-			WithReconciler(rec)
-
-		mgr := controller.NewManager(client, testutil.Logger(t))
-		mgr.SetRaftLeader(true)
-		mgr.Register(ctrl)
-
-		ctx := testContext(t)
-		go mgr.Run(ctx)
-
-		res, err := demo.GenerateV1RecordLabel("test")
-		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("cluster scoped resources", func(t *testing.T) {
-		rec := newTestReconciler()
-
-		client := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(demo.RegisterTypes).
-			Run(t)
-
-		ctrl := controller.
-			ForType(demo.TypeV1Executive).
-			WithReconciler(rec)
-
-		mgr := controller.NewManager(client, testutil.Logger(t))
-		mgr.SetRaftLeader(true)
-		mgr.Register(ctrl)
-
-		go mgr.Run(testContext(t))
-
-		exec, err := demo.GenerateV1Executive("test", "CEO")
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: exec})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-	})
-
-	t.Run("namespace scoped resources", func(t *testing.T) {
-		rec := newTestReconciler()
-
-		client := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(demo.RegisterTypes).
-			Run(t)
-
-		ctrl := controller.
-			ForType(demo.TypeV2Artist).
-			WithReconciler(rec)
-
-		mgr := controller.NewManager(client, testutil.Logger(t))
-		mgr.SetRaftLeader(true)
-		mgr.Register(ctrl)
-
-		go mgr.Run(testContext(t))
-
-		artist, err := demo.GenerateV2Artist()
-		require.NoError(t, err)
-
-		rsp, err := client.Write(testContext(t), &pbresource.WriteRequest{Resource: artist})
-		require.NoError(t, err)
-
-		req := rec.wait(t)
-		prototest.AssertDeepEqual(t, rsp.Resource.Id, req.ID)
-	})
-}
-
 func newTestReconciler() *testReconciler {
 	return &testReconciler{
 		calls:  make(chan controller.Request),
diff --git a/internal/controller/controller.go b/internal/controller/controller.go
index 97955db6a3c15..ac901d355b6e3 100644
--- a/internal/controller/controller.go
+++ b/internal/controller/controller.go
@@ -14,6 +14,7 @@ import (
 
 	"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"
 )
 
@@ -91,6 +92,11 @@ func runQueue[T queue.ItemType](ctx context.Context, ctrl Controller) queue.Work
 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)
diff --git a/internal/controller/dependencies.go b/internal/controller/dependencies.go
deleted file mode 100644
index 6a91d91ff7b72..0000000000000
--- a/internal/controller/dependencies.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/hashicorp/go-multierror"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func (m *Manager) ValidateDependencies(registrations []resource.Registration) error {
-	deps := m.CalculateDependencies(registrations)
-
-	return deps.validate()
-}
-
-type Dependencies map[string][]string
-
-func (deps Dependencies) validate() error {
-	var merr error
-	seen := make(map[string]map[string]struct{})
-
-	mkErr := func(src, dst string) error {
-		vals := []string{src, dst}
-		sort.Strings(vals)
-		return fmt.Errorf("circular dependency between %q and %q", vals[0], vals[1])
-	}
-
-	for src, dsts := range deps {
-		seenDsts := seen[src]
-		if len(seenDsts) == 0 {
-			seen[src] = make(map[string]struct{})
-		}
-
-		for _, dst := range dsts {
-			if _, ok := seenDsts[dst]; ok {
-				merr = multierror.Append(merr, mkErr(src, dst))
-			}
-
-			if inverseDsts := seen[dst]; len(inverseDsts) > 0 {
-				if _, ok := inverseDsts[src]; ok {
-					merr = multierror.Append(merr, mkErr(src, dst))
-				}
-			}
-			seen[src][dst] = struct{}{}
-		}
-	}
-
-	return merr
-}
-
-func (m *Manager) CalculateDependencies(registrations []resource.Registration) Dependencies {
-	typeToString := func(t *pbresource.Type) string {
-		return strings.ToLower(fmt.Sprintf("%s/%s/%s", t.Group, t.GroupVersion, t.Kind))
-	}
-
-	out := make(map[string][]string)
-	for _, r := range registrations {
-		out[typeToString(r.Type)] = nil
-	}
-
-	for _, c := range m.controllers {
-		watches := make([]string, 0, len(c.watches))
-		for _, w := range c.watches {
-			watches = append(watches, typeToString(w.watchedType))
-		}
-
-		out[typeToString(c.managedType)] = watches
-	}
-
-	return out
-}
-
-func (deps Dependencies) ToMermaid() string {
-	depStrings := make([]string, 0, len(deps))
-
-	for src, dsts := range deps {
-		if len(dsts) == 0 {
-			depStrings = append(depStrings, fmt.Sprintf("  %s", src))
-			continue
-		}
-
-		for _, dst := range dsts {
-			depStrings = append(depStrings, fmt.Sprintf("  %s --> %s", src, dst))
-		}
-	}
-
-	sort.Slice(depStrings, func(a, b int) bool {
-		return depStrings[a] < depStrings[b]
-	})
-	out := "flowchart TD\n" + strings.Join(depStrings, "\n")
-
-	return out
-}
diff --git a/internal/controller/dependencies_test.go b/internal/controller/dependencies_test.go
deleted file mode 100644
index 18db58a2853ae..0000000000000
--- a/internal/controller/dependencies_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controller
-
-import (
-	"testing"
-
-	"github.com/hashicorp/consul/internal/testing/golden"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDependenciesGolden(t *testing.T) {
-	deps := Dependencies{
-		"t1": []string{"t2", "t3"},
-		"t2": []string{"t4"},
-		"t4": []string{"t1"},
-	}
-	mermaid := deps.ToMermaid()
-	expected := golden.Get(t, mermaid, "dependencies.golden")
-	require.Equal(t, expected, mermaid)
-}
-
-func TestValidateDependencies(t *testing.T) {
-	type testCase struct {
-		dependencies Dependencies
-		expectErr    string
-	}
-
-	run := func(t *testing.T, tc testCase) {
-		err := tc.dependencies.validate()
-		if len(tc.expectErr) > 0 {
-			require.Contains(t, err.Error(), tc.expectErr)
-		} else {
-			require.NoError(t, err)
-		}
-
-	}
-
-	cases := map[string]testCase{
-		"empty": {
-			dependencies: nil,
-		},
-		"no circular dependencies": {
-			dependencies: Dependencies{
-				"t1": []string{"t2", "t3"},
-				"t2": []string{"t3"},
-				"t3": []string{"t4"},
-				"t4": nil,
-			},
-		},
-		"with circular dependency": {
-			dependencies: Dependencies{
-				"t1": []string{"t2", "t3"},
-				"t2": []string{"t1"},
-			},
-			expectErr: `circular dependency between "t1" and "t2"`,
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/controller/manager.go b/internal/controller/manager.go
index 2e46b21400837..1e7e910210616 100644
--- a/internal/controller/manager.go
+++ b/internal/controller/manager.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/hashicorp/go-hclog"
 
+	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
@@ -67,7 +68,7 @@ func (m *Manager) Run(ctx context.Context) {
 	for _, desc := range m.controllers {
 		logger := desc.logger
 		if logger == nil {
-			logger = m.logger.With("managed_type", desc.managedType.Kind)
+			logger = m.logger.With("managed_type", resource.ToGVK(desc.managedType))
 		}
 
 		runner := &controllerRunner{
diff --git a/internal/controller/testdata/dependencies.golden b/internal/controller/testdata/dependencies.golden
deleted file mode 100644
index f0ff372a1634f..0000000000000
--- a/internal/controller/testdata/dependencies.golden
+++ /dev/null
@@ -1,5 +0,0 @@
-flowchart TD
-  t1 --> t2
-  t1 --> t3
-  t2 --> t4
-  t4 --> t1
\ No newline at end of file
diff --git a/internal/go-sso/oidcauth/config.go b/internal/go-sso/oidcauth/config.go
index a5e0e8bcb681d..84bbac9e0cbe5 100644
--- a/internal/go-sso/oidcauth/config.go
+++ b/internal/go-sso/oidcauth/config.go
@@ -45,6 +45,7 @@ type Config struct {
 
 	// Comma-separated list of 'aud' claims that are valid for login; any match
 	// is sufficient
+	// TODO(sso): actually just send these down as string claims?
 	BoundAudiences []string
 
 	// Mappings of claims (key) that will be copied to a metadata field
diff --git a/internal/go-sso/oidcauth/oidc.go b/internal/go-sso/oidcauth/oidc.go
index cd78762510952..df00dfcc25f60 100644
--- a/internal/go-sso/oidcauth/oidc.go
+++ b/internal/go-sso/oidcauth/oidc.go
@@ -235,8 +235,7 @@ func (a *Authenticator) verifyOIDCToken(ctx context.Context, rawToken string) (m
 	if err := idToken.Claims(&allClaims); err != nil {
 		return nil, fmt.Errorf("unable to successfully parse all claims from token: %v", err)
 	}
-	// Follows behavior of hashicorp/vault-plugin-auth-jwt (non-strict validation).
-	// See https://developer.hashicorp.com/consul/docs/security/acl/auth-methods/oidc#oidc-configuration-troubleshooting.
+	// TODO(sso): why isn't this strict for OIDC?
 	if err := validateAudience(a.config.BoundAudiences, idToken.Audience, false); err != nil {
 		return nil, fmt.Errorf("error validating claims: %v", err)
 	}
diff --git a/internal/mesh/internal/controllers/explicitdestinations/controller_test.go b/internal/mesh/internal/controllers/explicitdestinations/controller_test.go
index e21041e818ddf..72004eecbadb8 100644
--- a/internal/mesh/internal/controllers/explicitdestinations/controller_test.go
+++ b/internal/mesh/internal/controllers/explicitdestinations/controller_test.go
@@ -5,7 +5,6 @@ package explicitdestinations
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -58,150 +57,135 @@ type controllerTestSuite struct {
 	destService3Routes *pbmesh.ComputedRoutes
 
 	expComputedDest *pbmesh.ComputedExplicitDestinations
-	tenancies       []*pbresource.Tenancy
 }
 
 func TestFindDuplicates(t *testing.T) {
 	// Create some conflicting destinations.
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest1 := &pbmesh.Destinations{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Names: []string{"foo"},
-			},
-			Destinations: []*pbmesh.Destination{
-				{
-					ListenAddr: &pbmesh.Destination_IpPort{
-						IpPort: &pbmesh.IPPortAddress{
-							Ip:   "127.0.0.1",
-							Port: 1000,
-						},
+	dest1 := &pbmesh.Destinations{
+		Workloads: &pbcatalog.WorkloadSelector{
+			Names: []string{"foo"},
+		},
+		Destinations: []*pbmesh.Destination{
+			{
+				ListenAddr: &pbmesh.Destination_IpPort{
+					IpPort: &pbmesh.IPPortAddress{
+						Ip:   "127.0.0.1",
+						Port: 1000,
 					},
 				},
-				{
-					ListenAddr: &pbmesh.Destination_IpPort{
-						IpPort: &pbmesh.IPPortAddress{
-							Ip:   "127.0.0.1",
-							Port: 2000,
-						},
+			},
+			{
+				ListenAddr: &pbmesh.Destination_IpPort{
+					IpPort: &pbmesh.IPPortAddress{
+						Ip:   "127.0.0.1",
+						Port: 2000,
 					},
 				},
 			},
-		}
-		dest2 := &pbmesh.Destinations{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Names: []string{"foo"},
-			},
-			Destinations: []*pbmesh.Destination{
-				{
-					ListenAddr: &pbmesh.Destination_IpPort{
-						IpPort: &pbmesh.IPPortAddress{
-							Ip:   "127.0.0.1",
-							Port: 1000,
-						},
+		},
+	}
+	dest2 := &pbmesh.Destinations{
+		Workloads: &pbcatalog.WorkloadSelector{
+			Names: []string{"foo"},
+		},
+		Destinations: []*pbmesh.Destination{
+			{
+				ListenAddr: &pbmesh.Destination_IpPort{
+					IpPort: &pbmesh.IPPortAddress{
+						Ip:   "127.0.0.1",
+						Port: 1000,
 					},
 				},
 			},
-		}
-		dest3 := &pbmesh.Destinations{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Names: []string{"foo"},
-			},
-			Destinations: []*pbmesh.Destination{
-				{
-					ListenAddr: &pbmesh.Destination_Unix{
-						Unix: &pbmesh.UnixSocketAddress{
-							Path: "/foo/bar",
-						},
+		},
+	}
+	dest3 := &pbmesh.Destinations{
+		Workloads: &pbcatalog.WorkloadSelector{
+			Names: []string{"foo"},
+		},
+		Destinations: []*pbmesh.Destination{
+			{
+				ListenAddr: &pbmesh.Destination_Unix{
+					Unix: &pbmesh.UnixSocketAddress{
+						Path: "/foo/bar",
 					},
 				},
 			},
-		}
-		dest4 := &pbmesh.Destinations{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Names: []string{"foo"},
-			},
-			Destinations: []*pbmesh.Destination{
-				{
-					ListenAddr: &pbmesh.Destination_Unix{
-						Unix: &pbmesh.UnixSocketAddress{
-							Path: "/foo/bar",
-						},
+		},
+	}
+	dest4 := &pbmesh.Destinations{
+		Workloads: &pbcatalog.WorkloadSelector{
+			Names: []string{"foo"},
+		},
+		Destinations: []*pbmesh.Destination{
+			{
+				ListenAddr: &pbmesh.Destination_Unix{
+					Unix: &pbmesh.UnixSocketAddress{
+						Path: "/foo/bar",
 					},
 				},
 			},
-		}
-		destNonConflicting := &pbmesh.Destinations{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Names: []string{"foo"},
-			},
-			Destinations: []*pbmesh.Destination{
-				{
-					ListenAddr: &pbmesh.Destination_IpPort{
-						IpPort: &pbmesh.IPPortAddress{
-							Ip:   "127.0.0.1",
-							Port: 3000,
-						},
+		},
+	}
+	destNonConflicting := &pbmesh.Destinations{
+		Workloads: &pbcatalog.WorkloadSelector{
+			Names: []string{"foo"},
+		},
+		Destinations: []*pbmesh.Destination{
+			{
+				ListenAddr: &pbmesh.Destination_IpPort{
+					IpPort: &pbmesh.IPPortAddress{
+						Ip:   "127.0.0.1",
+						Port: 3000,
 					},
 				},
-				{
-					ListenAddr: &pbmesh.Destination_Unix{
-						Unix: &pbmesh.UnixSocketAddress{
-							Path: "/baz/bar",
-						},
+			},
+			{
+				ListenAddr: &pbmesh.Destination_Unix{
+					Unix: &pbmesh.UnixSocketAddress{
+						Path: "/baz/bar",
 					},
 				},
 			},
-		}
+		},
+	}
 
-		var destinations []*types.DecodedDestinations
-		dest1Res := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
-			WithData(t, dest1).
-			WithTenancy(tenancy).
-			Build()
-		destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest1Res))
-		dest2Res := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
-			WithData(t, dest2).
-			WithTenancy(tenancy).
-			Build()
-		destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest2Res))
-		dest3Res := resourcetest.Resource(pbmesh.DestinationsType, "dest3").
-			WithData(t, dest3).
-			WithTenancy(tenancy).
-			Build()
-		destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest3Res))
-		dest4Res := resourcetest.Resource(pbmesh.DestinationsType, "dest4").
-			WithData(t, dest4).
-			WithTenancy(tenancy).
-			Build()
-		destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest4Res))
-		nonConflictingDestRes := resourcetest.Resource(pbmesh.DestinationsType, "nonConflictingDest").
-			WithData(t, destNonConflicting).
-			WithTenancy(tenancy).
-			Build()
-		destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, nonConflictingDestRes))
-
-		duplicates := findConflicts(destinations)
-
-		require.Contains(t, duplicates, resource.NewReferenceKey(dest1Res.Id))
-		require.Contains(t, duplicates, resource.NewReferenceKey(dest2Res.Id))
-		require.Contains(t, duplicates, resource.NewReferenceKey(dest3Res.Id))
-		require.Contains(t, duplicates, resource.NewReferenceKey(dest4Res.Id))
-		require.NotContains(t, duplicates, resource.NewReferenceKey(nonConflictingDestRes.Id))
-	}, t)
+	var destinations []*types.DecodedDestinations
+	dest1Res := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
+		WithData(t, dest1).
+		Build()
+	destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest1Res))
+	dest2Res := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
+		WithData(t, dest2).
+		Build()
+	destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest2Res))
+	dest3Res := resourcetest.Resource(pbmesh.DestinationsType, "dest3").
+		WithData(t, dest3).
+		Build()
+	destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest3Res))
+	dest4Res := resourcetest.Resource(pbmesh.DestinationsType, "dest4").
+		WithData(t, dest4).
+		Build()
+	destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, dest4Res))
+	nonConflictingDestRes := resourcetest.Resource(pbmesh.DestinationsType, "nonConflictingDest").
+		WithData(t, destNonConflicting).
+		Build()
+	destinations = append(destinations, resourcetest.MustDecode[*pbmesh.Destinations](t, nonConflictingDestRes))
+
+	duplicates := findConflicts(destinations)
+
+	require.Contains(t, duplicates, resource.NewReferenceKey(dest1Res.Id))
+	require.Contains(t, duplicates, resource.NewReferenceKey(dest2Res.Id))
+	require.Contains(t, duplicates, resource.NewReferenceKey(dest3Res.Id))
+	require.Contains(t, duplicates, resource.NewReferenceKey(dest4Res.Id))
+	require.NotContains(t, duplicates, resource.NewReferenceKey(nonConflictingDestRes.Id))
 }
 
 func (suite *controllerTestSuite) SetupTest() {
-	suite.tenancies = resourcetest.TestTenancies()
-	resourceClient := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
+	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.client = resourcetest.NewClient(resourceClient)
-}
-
-func (suite *controllerTestSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 
 	suite.ctl = &reconciler{
 		mapper: mapper.New(),
@@ -218,13 +202,8 @@ func (suite *controllerTestSuite) setupWithTenancy(tenancy *pbresource.Tenancy)
 
 	suite.workloadRes = resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
 		WithData(suite.T(), suite.workload).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(func() {
-		suite.client.MustDelete(suite.T(), suite.workloadRes.Id)
-	})
-
 	suite.serviceData = &pbcatalog.Service{
 		Workloads: &pbcatalog.WorkloadSelector{Names: []string{"service-1-workloads"}},
 		Ports: []*pbcatalog.ServicePort{
@@ -243,31 +222,18 @@ func (suite *controllerTestSuite) setupWithTenancy(tenancy *pbresource.Tenancy)
 		},
 	}
 	suite.destService1 = resourcetest.Resource(pbcatalog.ServiceType, "dest-service-1").
-		WithTenancy(tenancy).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
 		WithData(suite.T(), suite.serviceData).
 		Build()
-
-	suite.T().Cleanup(func() {
-		suite.client.MustDelete(suite.T(), suite.destService1.Id)
-	})
-
 	suite.destService2 = resourcetest.Resource(pbcatalog.ServiceType, "dest-service-2").
-		WithTenancy(tenancy).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
 		WithData(suite.T(), suite.serviceData).
 		Build()
-	suite.T().Cleanup(func() {
-		suite.client.MustDelete(suite.T(), suite.destService2.Id)
-	})
-
 	suite.destService3 = resourcetest.Resource(pbcatalog.ServiceType, "dest-service-3").
-		WithTenancy(tenancy).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
 		WithData(suite.T(), suite.serviceData).
 		Build()
 
-	suite.T().Cleanup(func() {
-		suite.client.MustDelete(suite.T(), suite.destService3.Id)
-	})
-
 	suite.destService1Ref = resource.Reference(suite.destService1.Id, "")
 	suite.destService2Ref = resource.Reference(suite.destService2.Id, "")
 	suite.destService3Ref = resource.Reference(suite.destService3.Id, "")
@@ -387,430 +353,373 @@ func (suite *controllerTestSuite) setupWithTenancy(tenancy *pbresource.Tenancy)
 }
 
 func (suite *controllerTestSuite) TestReconcile_NoWorkload() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		id := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, "not-found").WithTenancy(tenancy).ID()
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest1).
-			Build()
-		decDest := resourcetest.MustDecode[*pbmesh.Destinations](suite.T(), dest)
-		suite.ctl.mapper.TrackDestinations(id, []*types.DecodedDestinations{decDest})
-
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: id,
-		})
-		require.NoError(suite.T(), err)
+	id := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, "not-found").ID()
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
+		WithData(suite.T(), suite.dest1).
+		Build()
+	decDest := resourcetest.MustDecode[*pbmesh.Destinations](suite.T(), dest)
+	suite.ctl.mapper.TrackDestinations(id, []*types.DecodedDestinations{decDest})
+
+	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: id,
+	})
+	require.NoError(suite.T(), err)
 
-		suite.client.RequireResourceNotFound(suite.T(), id)
+	suite.client.RequireResourceNotFound(suite.T(), id)
 
-		// Check that we're not tracking services for this workload anymore.
-		reqs, err := suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService1)
-		require.NoError(suite.T(), err)
-		require.Nil(suite.T(), reqs)
+	// Check that we're not tracking services for this workload anymore.
+	reqs, err := suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService1)
+	require.NoError(suite.T(), err)
+	require.Nil(suite.T(), reqs)
 
-		reqs, err = suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService2)
-		require.NoError(suite.T(), err)
-		require.Nil(suite.T(), reqs)
-	})
+	reqs, err = suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService2)
+	require.NoError(suite.T(), err)
+	require.Nil(suite.T(), reqs)
 }
 
 func (suite *controllerTestSuite) TestReconcile_NonMeshWorkload() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		resourcetest.Resource(pbcatalog.WorkloadType, "non-mesh").
-			WithTenancy(tenancy).
-			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)
+	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)
 
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, "non-mesh").
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, "non-mesh").
+		Write(suite.T(), suite.client).Id
 
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest1).
-			Build()
-		decDest := resourcetest.MustDecode[*pbmesh.Destinations](suite.T(), dest)
-		suite.ctl.mapper.TrackDestinations(cdID, []*types.DecodedDestinations{decDest})
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
+		WithData(suite.T(), suite.dest1).
+		Build()
+	decDest := resourcetest.MustDecode[*pbmesh.Destinations](suite.T(), dest)
+	suite.ctl.mapper.TrackDestinations(cdID, []*types.DecodedDestinations{decDest})
 
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
+	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
+	})
+	require.NoError(suite.T(), err)
 
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
 
-		// Check that we're not tracking services for this workload anymore.
-		reqs, err := suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService1)
-		require.NoError(suite.T(), err)
-		require.Nil(suite.T(), reqs)
+	// Check that we're not tracking services for this workload anymore.
+	reqs, err := suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService1)
+	require.NoError(suite.T(), err)
+	require.Nil(suite.T(), reqs)
 
-		reqs, err = suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService2)
-		require.NoError(suite.T(), err)
-		require.Nil(suite.T(), reqs)
-	})
+	reqs, err = suite.ctl.mapper.MapService(context.TODO(), controller.Runtime{}, suite.destService2)
+	require.NoError(suite.T(), err)
+	require.Nil(suite.T(), reqs)
 }
 
-func (suite *controllerTestSuite) writeServices(t *testing.T, tenancy *pbresource.Tenancy) {
+func (suite *controllerTestSuite) writeServices(t *testing.T) {
 	// Write all services.
 	resourcetest.Resource(pbcatalog.ServiceType, suite.destService1Ref.Name).
-		WithTenancy(tenancy).
 		WithData(t, suite.serviceData).
 		Write(t, suite.client)
 	resourcetest.Resource(pbcatalog.ServiceType, suite.destService2Ref.Name).
-		WithTenancy(tenancy).
 		WithData(t, suite.serviceData).
 		Write(t, suite.client)
 	resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
-		WithTenancy(tenancy).
 		WithData(t, suite.serviceData).
 		Write(t, suite.client)
 }
 
-func (suite *controllerTestSuite) writeComputedRoutes(t *testing.T, tenancy *pbresource.Tenancy) {
+func (suite *controllerTestSuite) writeComputedRoutes(t *testing.T) {
 	// Write computed routes
 	resourcetest.Resource(pbmesh.ComputedRoutesType, suite.destService1Ref.Name).
-		WithTenancy(tenancy).
 		WithData(t, suite.destService1Routes).
 		Write(t, suite.client)
 	resourcetest.Resource(pbmesh.ComputedRoutesType, suite.destService2Ref.Name).
-		WithTenancy(tenancy).
 		WithData(t, suite.destService2Routes).
 		Write(t, suite.client)
 	resourcetest.Resource(pbmesh.ComputedRoutesType, suite.destService3Ref.Name).
-		WithTenancy(tenancy).
 		WithData(t, suite.destService3Routes).
 		Write(t, suite.client)
 }
 
 func (suite *controllerTestSuite) TestReconcile_HappyPath() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Add configs in reverse alphabetical order.
-		d2 := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, d2)
-		require.NoError(suite.T(), err)
+	// Add configs in reverse alphabetical order.
+	d2 := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, d2)
+	require.NoError(suite.T(), err)
 
-		d1 := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest1).
-			Write(suite.T(), suite.client)
-		_, err = suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, d1)
-		require.NoError(suite.T(), err)
+	d1 := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
+		WithData(suite.T(), suite.dest1).
+		Write(suite.T(), suite.client)
+	_, err = suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, d1)
+	require.NoError(suite.T(), err)
 
-		suite.writeServices(suite.T(), tenancy)
-		suite.writeComputedRoutes(suite.T(), tenancy)
+	suite.writeServices(suite.T())
+	suite.writeComputedRoutes(suite.T())
 
-		cdID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id)
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
+	cdID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id)
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
+	})
 
-		require.NoError(suite.T(), err)
+	require.NoError(suite.T(), err)
 
-		suite.requireComputedDestinations(suite.T(), cdID)
-		suite.client.RequireStatusCondition(suite.T(), d1.Id, ControllerName, ConditionDestinationsAccepted())
-	})
+	suite.requireComputedDestinations(suite.T(), cdID)
+	suite.client.RequireStatusCondition(suite.T(), d1.Id, ControllerName, ConditionDestinationsAccepted())
 }
 
 func (suite *controllerTestSuite) TestReconcile_NoDestinations() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest1).
-			Build()
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
-		require.NoError(suite.T(), err)
-
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-
-		require.NoError(suite.T(), err)
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
+		WithData(suite.T(), suite.dest1).
+		Build()
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
+	require.NoError(suite.T(), err)
 
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+
+	require.NoError(suite.T(), err)
+
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
 }
 
 func (suite *controllerTestSuite) TestReconcile_AllDestinationsInvalid() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// We add a destination with services refs that don't exist which should result
-		// in computed mapper being deleted because all mapper are invalid.
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest1).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
-		require.NoError(suite.T(), err)
-
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-
-		require.NoError(suite.T(), err)
+	// We add a destination with services refs that don't exist which should result
+	// in computed mapper being deleted because all mapper are invalid.
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
+		WithData(suite.T(), suite.dest1).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
+	require.NoError(suite.T(), err)
 
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+
+	require.NoError(suite.T(), err)
+
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
 }
 
 func (suite *controllerTestSuite) TestReconcile_StatusUpdate_ConflictingDestination() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest1 := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest1).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest1)
-		require.NoError(suite.T(), err)
+	dest1 := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
+		WithData(suite.T(), suite.dest1).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest1)
+	require.NoError(suite.T(), err)
 
-		// Write a conflicting destinations resource.
-		destData := proto.Clone(suite.dest2).(*pbmesh.Destinations)
-		destData.Destinations[0] = suite.dest1.Destinations[0]
+	// Write a conflicting destinations resource.
+	destData := proto.Clone(suite.dest2).(*pbmesh.Destinations)
+	destData.Destinations[0] = suite.dest1.Destinations[0]
 
-		dest2 := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), destData).
-			Write(suite.T(), suite.client)
-		_, err = suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest2)
-		require.NoError(suite.T(), err)
-
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
-
-		// Expect that the status on both resource is updated showing conflict.
-		suite.client.RequireStatusCondition(suite.T(), dest1.Id, ControllerName,
-			ConditionConflictFound(suite.workloadRes.Id))
-		suite.client.RequireStatusCondition(suite.T(), dest2.Id, ControllerName,
-			ConditionConflictFound(suite.workloadRes.Id))
-
-		// Update dest2 back to have non-conflicting data.
-		dest2 = resourcetest.Resource(pbmesh.DestinationsType, "dest2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
-		_, err = suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest2)
-		require.NoError(suite.T(), err)
+	dest2 := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
+		WithData(suite.T(), destData).
+		Write(suite.T(), suite.client)
+	_, err = suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest2)
+	require.NoError(suite.T(), err)
 
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
+	})
+	require.NoError(suite.T(), err)
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
+
+	// Expect that the status on both resource is updated showing conflict.
+	suite.client.RequireStatusCondition(suite.T(), dest1.Id, ControllerName,
+		ConditionConflictFound(suite.workloadRes.Id))
+	suite.client.RequireStatusCondition(suite.T(), dest2.Id, ControllerName,
+		ConditionConflictFound(suite.workloadRes.Id))
+
+	// Update dest2 back to have non-conflicting data.
+	dest2 = resourcetest.Resource(pbmesh.DestinationsType, "dest2").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
+	_, err = suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest2)
+	require.NoError(suite.T(), err)
 
-		// Expect status on both to be updated to say that there's no conflict.
-		suite.client.RequireStatusCondition(suite.T(), dest1.Id, ControllerName,
-			ConditionConflictNotFound)
-		suite.client.RequireStatusCondition(suite.T(), dest2.Id, ControllerName,
-			ConditionConflictNotFound)
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+	require.NoError(suite.T(), err)
+
+	// Expect status on both to be updated to say that there's no conflict.
+	suite.client.RequireStatusCondition(suite.T(), dest1.Id, ControllerName,
+		ConditionConflictNotFound)
+	suite.client.RequireStatusCondition(suite.T(), dest2.Id, ControllerName,
+		ConditionConflictNotFound)
 }
 
 func (suite *controllerTestSuite) TestReconcile_StatusUpdate_NoService() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
-		require.NoError(suite.T(), err)
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
-
-		suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
-			ConditionDestinationServiceNotFound(resource.ReferenceToString(suite.destService3Ref)))
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
+	require.NoError(suite.T(), err)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+	require.NoError(suite.T(), err)
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
+
+	suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
+		ConditionDestinationServiceNotFound(resource.ReferenceToString(suite.destService3Ref)))
 }
 
 func (suite *controllerTestSuite) TestReconcile_StatusUpdate_ServiceNotOnMesh() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
-		require.NoError(suite.T(), err)
-
-		resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
-				Ports: []*pbcatalog.ServicePort{
-					{
-						TargetPort: "tcp",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
-					},
-				},
-			}).
-			Write(suite.T(), suite.client)
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
+	require.NoError(suite.T(), err)
 
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
+	resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
+		WithData(suite.T(), &pbcatalog.Service{
+			Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
+			Ports: []*pbcatalog.ServicePort{
+				{
+					TargetPort: "tcp",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
+				},
+			},
+		}).
+		Write(suite.T(), suite.client)
 
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
 
-		suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
-			ConditionMeshProtocolNotFound(resource.ReferenceToString(suite.destService3Ref)))
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+	require.NoError(suite.T(), err)
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
+
+	suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
+		ConditionMeshProtocolNotFound(resource.ReferenceToString(suite.destService3Ref)))
 }
 
 func (suite *controllerTestSuite) TestReconcile_StatusUpdate_DestinationPortIsMesh() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
-		require.NoError(suite.T(), err)
-
-		resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
-				Ports: []*pbcatalog.ServicePort{
-					{
-						TargetPort: "tcp",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-			}).
-			Write(suite.T(), suite.client)
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
+	require.NoError(suite.T(), err)
 
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
+	resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
+		WithData(suite.T(), &pbcatalog.Service{
+			Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
+			Ports: []*pbcatalog.ServicePort{
+				{
+					TargetPort: "tcp",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
+				},
+			},
+		}).
+		Write(suite.T(), suite.client)
 
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
 
-		suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
-			ConditionMeshProtocolDestinationPort(resource.ReferenceToString(suite.destService3Ref), "tcp"))
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+	require.NoError(suite.T(), err)
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
+
+	suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
+		ConditionMeshProtocolDestinationPort(resource.ReferenceToString(suite.destService3Ref), "tcp"))
 }
 
 func (suite *controllerTestSuite) TestReconcile_StatusUpdate_ComputedRoutesNotFound() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
-		require.NoError(suite.T(), err)
-
-		resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
-				Ports: []*pbcatalog.ServicePort{
-					{
-						TargetPort: "tcp",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
-					},
-					{
-						TargetPort: "mesh",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
-					},
-				},
-			}).
-			Write(suite.T(), suite.client)
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
+	require.NoError(suite.T(), err)
 
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
+	resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
+		WithData(suite.T(), &pbcatalog.Service{
+			Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
+			Ports: []*pbcatalog.ServicePort{
+				{
+					TargetPort: "tcp",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
+				},
+				{
+					TargetPort: "mesh",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
+				},
+			},
+		}).
+		Write(suite.T(), suite.client)
 
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
 
-		suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
-			ConditionDestinationComputedRoutesNotFound(resource.ReferenceToString(suite.destService3Ref)))
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+	require.NoError(suite.T(), err)
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
+
+	suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
+		ConditionDestinationComputedRoutesNotFound(resource.ReferenceToString(suite.destService3Ref)))
 }
 
 func (suite *controllerTestSuite) TestReconcile_StatusUpdate_ComputedRoutesPortNotFound() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
-		require.NoError(suite.T(), err)
-
-		destService := resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
-				Ports: []*pbcatalog.ServicePort{
-					{
-						TargetPort: "tcp",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
-					},
-					{
-						TargetPort: "mesh",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
-					},
+	dest := resourcetest.Resource(pbmesh.DestinationsType, "dest").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
+	_, err := suite.ctl.mapper.MapDestinations(suite.ctx, suite.runtime, dest)
+	require.NoError(suite.T(), err)
+
+	destService := resourcetest.Resource(pbcatalog.ServiceType, suite.destService3Ref.Name).
+		WithData(suite.T(), &pbcatalog.Service{
+			Workloads: &pbcatalog.WorkloadSelector{Names: []string{suite.workloadRes.Id.Name}},
+			Ports: []*pbcatalog.ServicePort{
+				{
+					TargetPort: "tcp",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
 				},
-			}).
-			Write(suite.T(), suite.client)
+				{
+					TargetPort: "mesh",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
+				},
+			},
+		}).
+		Write(suite.T(), suite.client)
 
-		resourcetest.Resource(pbmesh.ComputedRoutesType, destService.Id.Name).
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbmesh.ComputedRoutes{
-				PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-					"some-other-port": {
-						Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
-						Config: &pbmesh.ComputedPortRoutes_Http{
-							Http: &pbmesh.ComputedHTTPRoute{},
-						},
+	resourcetest.Resource(pbmesh.ComputedRoutesType, destService.Id.Name).
+		WithData(suite.T(), &pbmesh.ComputedRoutes{
+			PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
+				"some-other-port": {
+					Protocol: pbcatalog.Protocol_PROTOCOL_HTTP,
+					Config: &pbmesh.ComputedPortRoutes_Http{
+						Http: &pbmesh.ComputedHTTPRoute{},
 					},
 				},
-			}).
-			Write(suite.T(), suite.client)
-
-		cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client).Id
+			},
+		}).
+		Write(suite.T(), suite.client)
 
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: cdID,
-		})
-		require.NoError(suite.T(), err)
-		suite.client.RequireResourceNotFound(suite.T(), cdID)
+	cdID := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id.Name).
+		Write(suite.T(), suite.client).Id
 
-		suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
-			ConditionDestinationComputedRoutesPortNotFound(resource.ReferenceToString(suite.destService3Ref), "tcp"))
+	err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: cdID,
 	})
+	require.NoError(suite.T(), err)
+	suite.client.RequireResourceNotFound(suite.T(), cdID)
+
+	suite.client.RequireStatusCondition(suite.T(), dest.Id, ControllerName,
+		ConditionDestinationComputedRoutesPortNotFound(resource.ReferenceToString(suite.destService3Ref), "tcp"))
 }
 
 func (suite *controllerTestSuite) TestController() {
@@ -821,113 +730,106 @@ func (suite *controllerTestSuite) TestController() {
 	mgr.SetRaftLeader(true)
 	go mgr.Run(suite.ctx)
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		cdID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id)
+	cdID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, suite.workloadRes.Id)
 
-		dest1 := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest1).
-			Write(suite.T(), suite.client)
+	dest1 := resourcetest.Resource(pbmesh.DestinationsType, "dest1").
+		WithData(suite.T(), suite.dest1).
+		Write(suite.T(), suite.client)
 
-		// At this point, none of the services or routes yet exist and so we should see the status of the destinations
-		// resource to reflect that. The CED resource should not be created in this case.
-		testutil.RunStep(suite.T(), "check that destinations status is updated", func(t *testing.T) {
-			retry.Run(t, func(r *retry.R) {
-				serviceRef := resource.IDToString(suite.destService1.Id)
-				suite.client.WaitForStatusCondition(r, dest1.Id, ControllerName, ConditionDestinationServiceNotFound(serviceRef))
+	// At this point, none of the services or routes yet exist and so we should see the status of the destinations
+	// resource to reflect that. The CED resource should not be created in this case.
+	testutil.RunStep(suite.T(), "check that destinations status is updated", func(t *testing.T) {
+		retry.Run(t, func(r *retry.R) {
+			serviceRef := resource.IDToString(suite.destService1.Id)
+			suite.client.WaitForStatusCondition(r, dest1.Id, ControllerName, ConditionDestinationServiceNotFound(serviceRef))
 
-				suite.client.RequireResourceNotFound(r, cdID)
-			})
+			suite.client.RequireResourceNotFound(r, cdID)
 		})
+	})
 
-		dest2 := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.dest2).
-			Write(suite.T(), suite.client)
+	dest2 := resourcetest.Resource(pbmesh.DestinationsType, "dest2").
+		WithData(suite.T(), suite.dest2).
+		Write(suite.T(), suite.client)
 
-		suite.writeServices(suite.T(), tenancy)
+	suite.writeServices(suite.T())
 
-		// After we write services, we expect another reconciliation to be kicked off to validate and find that there are no computed routes.
-		testutil.RunStep(suite.T(), "check that destinations status says that there are no computed routes", func(t *testing.T) {
-			retry.Run(t, func(r *retry.R) {
-				suite.client.WaitForStatusCondition(r, dest1.Id, ControllerName,
-					ConditionDestinationComputedRoutesNotFound(resource.IDToString(suite.destService1.Id)))
-				suite.client.WaitForStatusCondition(r, dest2.Id, ControllerName,
-					ConditionDestinationComputedRoutesNotFound(resource.IDToString(suite.destService3.Id)))
+	// After we write services, we expect another reconciliation to be kicked off to validate and find that there are no computed routes.
+	testutil.RunStep(suite.T(), "check that destinations status says that there are no computed routes", func(t *testing.T) {
+		retry.Run(t, func(r *retry.R) {
+			suite.client.WaitForStatusCondition(r, dest1.Id, ControllerName,
+				ConditionDestinationComputedRoutesNotFound(resource.IDToString(suite.destService1.Id)))
+			suite.client.WaitForStatusCondition(r, dest2.Id, ControllerName,
+				ConditionDestinationComputedRoutesNotFound(resource.IDToString(suite.destService3.Id)))
 
-				suite.client.RequireResourceNotFound(r, cdID)
-			})
+			suite.client.RequireResourceNotFound(r, cdID)
 		})
+	})
 
-		// Now write computed routes to get a computed resource.
-		suite.writeComputedRoutes(suite.T(), tenancy)
+	// Now write computed routes to get a computed resource.
+	suite.writeComputedRoutes(suite.T())
 
-		testutil.RunStep(suite.T(), "computed destinations generation", func(t *testing.T) {
-			retry.Run(t, func(r *retry.R) {
-				suite.client.RequireResourceExists(r, cdID)
-				suite.requireComputedDestinations(r, cdID)
-			})
+	testutil.RunStep(suite.T(), "computed destinations generation", func(t *testing.T) {
+		retry.Run(t, func(r *retry.R) {
+			suite.client.RequireResourceExists(r, cdID)
+			suite.requireComputedDestinations(r, cdID)
 		})
+	})
+
+	testutil.RunStep(suite.T(), "add another workload", func(t *testing.T) {
+		// Create another workload that will match only dest2.
+		matchingWorkload := resourcetest.Resource(pbcatalog.WorkloadType, "test-extra-workload").
+			WithData(t, suite.workload).
+			Write(t, suite.client)
+		matchingWorkloadCDID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, matchingWorkload.Id)
+
+		retry.Run(t, func(r *retry.R) {
+			suite.client.RequireResourceExists(r, cdID)
+			suite.requireComputedDestinations(r, cdID)
 
-		testutil.RunStep(suite.T(), "add another workload", func(t *testing.T) {
-			// Create another workload that will match only dest2.
-			matchingWorkload := resourcetest.Resource(pbcatalog.WorkloadType, "test-extra-workload").
-				WithTenancy(tenancy).
-				WithData(t, suite.workload).
-				Write(t, suite.client)
-			matchingWorkloadCDID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, matchingWorkload.Id)
-
-			retry.Run(t, func(r *retry.R) {
-				suite.client.RequireResourceExists(r, cdID)
-				suite.requireComputedDestinations(r, cdID)
-
-				matchingWorkloadCD := suite.client.RequireResourceExists(r, matchingWorkloadCDID)
-				dec := resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](r, matchingWorkloadCD)
-				prototest.AssertDeepEqual(r, suite.dest2.GetDestinations(), dec.GetData().GetDestinations())
-			})
+			matchingWorkloadCD := suite.client.RequireResourceExists(r, matchingWorkloadCDID)
+			dec := resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](r, matchingWorkloadCD)
+			prototest.AssertDeepEqual(r, suite.dest2.GetDestinations(), dec.GetData().GetDestinations())
 		})
+	})
+
+	testutil.RunStep(suite.T(), "update workload selector", func(t *testing.T) {
+		// Update workload selector to no point to some non-existing workload
+		updatedDestinations := proto.Clone(suite.dest2).(*pbmesh.Destinations)
+		updatedDestinations.Workloads = &pbcatalog.WorkloadSelector{
+			Names: []string{"other-workload"},
+		}
 
-		testutil.RunStep(suite.T(), "update workload selector", func(t *testing.T) {
-			// Update workload selector to no point to some non-existing workload
-			updatedDestinations := proto.Clone(suite.dest2).(*pbmesh.Destinations)
-			updatedDestinations.Workloads = &pbcatalog.WorkloadSelector{
-				Names: []string{"other-workload"},
+		matchingWorkload := resourcetest.Resource(pbcatalog.WorkloadType, "other-workload").
+			WithData(t, suite.workload).
+			Write(t, suite.client)
+		matchingWorkloadCDID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, matchingWorkload.Id)
+		resourcetest.Resource(pbmesh.DestinationsType, "dest2").
+			WithData(suite.T(), updatedDestinations).
+			Write(suite.T(), suite.client)
+
+		retry.Run(t, func(r *retry.R) {
+			res := suite.client.RequireResourceExists(r, cdID)
+
+			// The "test-workload" computed destinations should now be updated to use only proxy dest1.
+			expDest := &pbmesh.ComputedExplicitDestinations{
+				Destinations: suite.dest1.Destinations,
 			}
+			dec := resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, res)
+			prototest.AssertDeepEqual(r, expDest.GetDestinations(), dec.GetData().GetDestinations())
 
-			matchingWorkload := resourcetest.Resource(pbcatalog.WorkloadType, "other-workload").
-				WithData(t, suite.workload).
-				WithTenancy(tenancy).
-				Write(t, suite.client)
-			matchingWorkloadCDID := resource.ReplaceType(pbmesh.ComputedExplicitDestinationsType, matchingWorkload.Id)
-			resourcetest.Resource(pbmesh.DestinationsType, "dest2").
-				WithTenancy(tenancy).
-				WithData(suite.T(), updatedDestinations).
-				Write(suite.T(), suite.client)
-
-			retry.Run(t, func(r *retry.R) {
-				res := suite.client.RequireResourceExists(r, cdID)
-
-				// The "test-workload" computed destinations should now be updated to use only proxy dest1.
-				expDest := &pbmesh.ComputedExplicitDestinations{
-					Destinations: suite.dest1.Destinations,
-				}
-				dec := resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](r, res)
-				prototest.AssertDeepEqual(r, expDest.GetDestinations(), dec.GetData().GetDestinations())
-
-				matchingWorkloadCD := suite.client.RequireResourceExists(r, matchingWorkloadCDID)
-				dec = resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](r, matchingWorkloadCD)
-				prototest.AssertDeepEqual(r, suite.dest2.GetDestinations(), dec.GetData().GetDestinations())
-			})
+			matchingWorkloadCD := suite.client.RequireResourceExists(r, matchingWorkloadCDID)
+			dec = resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](r, matchingWorkloadCD)
+			prototest.AssertDeepEqual(r, suite.dest2.GetDestinations(), dec.GetData().GetDestinations())
 		})
+	})
 
-		// Delete all destinations.
-		suite.client.MustDelete(suite.T(), dest1.Id)
-		suite.client.MustDelete(suite.T(), dest2.Id)
+	// Delete all destinations.
+	suite.client.MustDelete(suite.T(), dest1.Id)
+	suite.client.MustDelete(suite.T(), dest2.Id)
 
-		testutil.RunStep(suite.T(), "all destinations are deleted", func(t *testing.T) {
-			retry.Run(t, func(r *retry.R) {
-				suite.client.RequireResourceNotFound(r, cdID)
-			})
+	testutil.RunStep(suite.T(), "all destinations are deleted", func(t *testing.T) {
+		retry.Run(t, func(r *retry.R) {
+			suite.client.RequireResourceNotFound(r, cdID)
 		})
 	})
 }
@@ -942,16 +844,3 @@ func (suite *controllerTestSuite) requireComputedDestinations(t resourcetest.T,
 	prototest.AssertElementsMatch(t, suite.expComputedDest.GetDestinations(), decCD.Data.GetDestinations())
 	resourcetest.RequireOwner(t, cdRes, resource.ReplaceType(pbcatalog.WorkloadType, id), true)
 }
-
-func (suite *controllerTestSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
-
-func (suite *controllerTestSuite) runTestCaseWithTenancies(t func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			suite.setupWithTenancy(tenancy)
-			t(tenancy)
-		})
-	}
-}
diff --git a/internal/mesh/internal/controllers/meshconfiguration/controller.go b/internal/mesh/internal/controllers/meshconfiguration/controller.go
deleted file mode 100644
index 93c0cb0d5f0db..0000000000000
--- a/internal/mesh/internal/controllers/meshconfiguration/controller.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package meshconfiguration
-
-import (
-	"context"
-	"errors"
-
-	"github.com/hashicorp/consul/internal/controller"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-// Controller instantiates a new Controller for managing MeshConfiguration resources.
-func Controller() controller.Controller {
-	r := &reconciler{}
-
-	return controller.ForType(pbmesh.MeshConfigurationType).WithReconciler(r)
-}
-
-// reconciler implements the Reconciler interface to modify runtime state based
-// on requests passed into it.
-type reconciler struct{}
-
-// Reconcile takes in the current controller request and updates the runtime state based on
-// the request received.
-func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	return errors.New("not implemented")
-}
diff --git a/internal/mesh/internal/controllers/meshconfiguration/controller_test.go b/internal/mesh/internal/controllers/meshconfiguration/controller_test.go
deleted file mode 100644
index 900d654cbc37a..0000000000000
--- a/internal/mesh/internal/controllers/meshconfiguration/controller_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package meshconfiguration
-
-import (
-	"context"
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/stretchr/testify/require"
-	"testing"
-)
-
-// TestReconciliation ensures that the Reconcile method for the Controller
-// correctly updates the runtime state based on the given request.
-func TestReconcile(t *testing.T) {
-	// This test should be continually updated as we build out the MeshConfiguration controller.
-	// At time of writing, it simply returns a not-implemented error.
-
-	ctx := context.Background()
-	rt := controller.Runtime{
-		Client: nil,
-		Logger: nil,
-	}
-	req := controller.Request{}
-
-	rec := reconciler{}
-
-	err := rec.Reconcile(ctx, rt, req)
-	require.Error(t, err)
-}
diff --git a/internal/mesh/internal/controllers/meshgateways/controller.go b/internal/mesh/internal/controllers/meshgateways/controller.go
deleted file mode 100644
index 76cd44748cfec..0000000000000
--- a/internal/mesh/internal/controllers/meshgateways/controller.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package meshgateways
-
-import (
-	"context"
-	"errors"
-
-	"github.com/hashicorp/consul/internal/controller"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-func Controller() controller.Controller {
-	r := &reconciler{}
-
-	return controller.ForType(pbmesh.MeshGatewayType).
-		WithReconciler(r)
-}
-
-type reconciler struct{}
-
-func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	// TODO NET-6426, NET-6427, NET-6428, NET-6429, NET-6430, NET-6431, NET-6432
-	return errors.New("not implemented")
-}
diff --git a/internal/mesh/internal/controllers/proxyconfiguration/controller_test.go b/internal/mesh/internal/controllers/proxyconfiguration/controller_test.go
index 425a23dd987a8..554f57ab5a068 100644
--- a/internal/mesh/internal/controllers/proxyconfiguration/controller_test.go
+++ b/internal/mesh/internal/controllers/proxyconfiguration/controller_test.go
@@ -5,7 +5,6 @@ package proxyconfiguration
 
 import (
 	"context"
-	"fmt"
 	"testing"
 	"time"
 
@@ -47,16 +46,10 @@ type controllerTestSuite struct {
 	proxyCfg3 *pbmesh.ProxyConfiguration
 
 	expComputedProxyCfg *pbmesh.ComputedProxyConfiguration
-
-	tenancies []*pbresource.Tenancy
 }
 
 func (suite *controllerTestSuite) SetupTest() {
-	suite.tenancies = resourcetest.TestTenancies()
-	resourceClient := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
+	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())
@@ -64,223 +57,7 @@ func (suite *controllerTestSuite) SetupTest() {
 	suite.ctl = &reconciler{
 		proxyConfigMapper: workloadselectionmapper.New[*pbmesh.ProxyConfiguration](pbmesh.ComputedProxyConfigurationType),
 	}
-}
-
-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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		id := resourcetest.Resource(pbmesh.ComputedProxyConfigurationType, "not-found").WithTenancy(tenancy).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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		resourcetest.Resource(pbcatalog.WorkloadType, "non-mesh").
-			WithTenancy(tenancy).
-			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").
-			WithTenancy(tenancy).
-			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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		pCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.proxyCfg1).
-			Write(suite.T(), suite.client)
-		_, err := suite.ctl.proxyConfigMapper.MapToComputedType(suite.ctx, suite.runtime, pCfg1)
-		require.NoError(suite.T(), err)
-
-		pCfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.proxyCfg2).
-			Write(suite.T(), suite.client)
-		_, err = suite.ctl.proxyConfigMapper.MapToComputedType(suite.ctx, suite.runtime, pCfg2)
-		require.NoError(suite.T(), err)
-
-		pCfg3 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg3").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.proxyCfg3).
-			Write(suite.T(), suite.client)
-		_, err = suite.ctl.proxyConfigMapper.MapToComputedType(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.
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		pCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.proxyCfg1).
-			Build()
-		_, err := suite.ctl.proxyConfigMapper.MapToComputedType(suite.ctx, suite.runtime, pCfg1)
-		require.NoError(suite.T(), err)
-
-		cpcID := resourcetest.Resource(pbmesh.ComputedProxyConfigurationType, suite.workloadRes.Id.Name).
-			WithTenancy(tenancy).
-			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 := workloadselectionmapper.New[*pbmesh.ProxyConfiguration](pbmesh.ComputedProxyConfigurationType)
-	mgr.Register(Controller(m))
-	mgr.SetRaftLeader(true)
-	go mgr.Run(suite.ctx)
-
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Write proxy configs.
-		pCfg1 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg1").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.proxyCfg1).
-			Write(suite.T(), suite.client)
-
-		pCfg2 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.proxyCfg2).
-			Write(suite.T(), suite.client)
-
-		pCfg3 := resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg3").
-			WithTenancy(tenancy).
-			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").WithTenancy(tenancy).
-				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) {
-			// 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").
-				WithTenancy(tenancy).
-				WithData(t, suite.workload).
-				Write(t, suite.client)
-			matchingWorkloadCPCID := resource.ReplaceType(pbmesh.ComputedProxyConfigurationType, matchingWorkload.Id)
-			resourcetest.Resource(pbmesh.ProxyConfigurationType, "cfg2").
-				WithTenancy(tenancy).
-				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 proxy configurations should now be updated to use only proxy cfg 1 and 3.
-				expProxyCfg := &pbmesh.ComputedProxyConfiguration{
-					DynamicConfig: &pbmesh.DynamicConfig{
-						Mode:             pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-						TransparentProxy: &pbmesh.TransparentProxy{OutboundListenerPort: iptables.DefaultTProxyOutboundPort},
-					},
-					BootstrapConfig: &pbmesh.BootstrapConfig{
-						PrometheusBindAddr: "0.0.0.0:9000",
-					},
-				}
-				dec := resourcetest.MustDecode[*pbmesh.ComputedProxyConfiguration](r, 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)
-}
-
-func (suite *controllerTestSuite) setupResourcesWithTenancy(tenancy *pbresource.Tenancy) {
 	suite.workload = &pbcatalog.Workload{
 		Addresses: []*pbcatalog.WorkloadAddress{{Host: "1.1.1.1"}},
 		Ports: map[string]*pbcatalog.WorkloadPort{
@@ -292,7 +69,6 @@ func (suite *controllerTestSuite) setupResourcesWithTenancy(tenancy *pbresource.
 
 	suite.workloadRes = resourcetest.Resource(pbcatalog.WorkloadType, "test-workload").
 		WithData(suite.T(), suite.workload).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
 	suite.proxyCfg1 = &pbmesh.ProxyConfiguration{
@@ -339,20 +115,194 @@ func (suite *controllerTestSuite) setupResourcesWithTenancy(tenancy *pbresource.
 	}
 }
 
-func (suite *controllerTestSuite) cleanupResources() {
-	suite.client.MustDelete(suite.T(), suite.workloadRes.Id)
+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) runTestCaseWithTenancies(testFunc func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			suite.setupResourcesWithTenancy(tenancy)
-			testFunc(tenancy)
-			suite.T().Cleanup(suite.cleanupResources)
+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.MapToComputedType(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.MapToComputedType(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.MapToComputedType(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.MapToComputedType(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 := workloadselectionmapper.New[*pbmesh.ProxyConfiguration](pbmesh.ComputedProxyConfigurationType)
+	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) {
+		// 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 proxy configurations should now be updated to use only proxy cfg 1 and 3.
+			expProxyCfg := &pbmesh.ComputedProxyConfiguration{
+				DynamicConfig: &pbmesh.DynamicConfig{
+					Mode:             pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
+					TransparentProxy: &pbmesh.TransparentProxy{OutboundListenerPort: iptables.DefaultTProxyOutboundPort},
+				},
+				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 (suite *controllerTestSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
+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/sort_test.go b/internal/mesh/internal/controllers/proxyconfiguration/sort_test.go
index 4345443b18505..1fbf8254ee609 100644
--- a/internal/mesh/internal/controllers/proxyconfiguration/sort_test.go
+++ b/internal/mesh/internal/controllers/proxyconfiguration/sort_test.go
@@ -94,9 +94,7 @@ func TestSortProxyConfigurations(t *testing.T) {
 
 	for name, c := range cases {
 		t.Run(name, func(t *testing.T) {
-			resourceClient := svctest.NewResourceServiceBuilder().
-				WithRegisterFns(types.Register).
-				Run(t)
+			resourceClient := svctest.RunResourceService(t, types.Register)
 
 			var decProxyCfgs []*types.DecodedProxyConfiguration
 			for i, ws := range c.selectors {
diff --git a/internal/mesh/internal/controllers/register.go b/internal/mesh/internal/controllers/register.go
index 2416c5615fd23..fec92dba1b304 100644
--- a/internal/mesh/internal/controllers/register.go
+++ b/internal/mesh/internal/controllers/register.go
@@ -5,13 +5,11 @@ package controllers
 
 import (
 	"context"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/meshconfiguration"
 
 	"github.com/hashicorp/consul/agent/leafcert"
 	"github.com/hashicorp/consul/internal/controller"
 	"github.com/hashicorp/consul/internal/mesh/internal/controllers/explicitdestinations"
 	"github.com/hashicorp/consul/internal/mesh/internal/controllers/explicitdestinations/mapper"
-	"github.com/hashicorp/consul/internal/mesh/internal/controllers/meshgateways"
 	"github.com/hashicorp/consul/internal/mesh/internal/controllers/proxyconfiguration"
 	"github.com/hashicorp/consul/internal/mesh/internal/controllers/routes"
 	"github.com/hashicorp/consul/internal/mesh/internal/controllers/sidecarproxy"
@@ -50,7 +48,4 @@ func Register(mgr *controller.Manager, deps Dependencies) {
 
 	mgr.Register(proxyconfiguration.Controller(workloadselectionmapper.New[*pbmesh.ProxyConfiguration](pbmesh.ComputedProxyConfigurationType)))
 	mgr.Register(explicitdestinations.Controller(mapper.New()))
-
-	mgr.Register(meshgateways.Controller())
-	mgr.Register(meshconfiguration.Controller())
 }
diff --git a/internal/mesh/internal/controllers/routes/controller_test.go b/internal/mesh/internal/controllers/routes/controller_test.go
index e8cb1d64c2a57..653eac28ed153 100644
--- a/internal/mesh/internal/controllers/routes/controller_test.go
+++ b/internal/mesh/internal/controllers/routes/controller_test.go
@@ -28,20 +28,14 @@ import (
 type controllerSuite struct {
 	suite.Suite
 
-	ctx       context.Context
-	client    *rtest.Client
-	rt        controller.Runtime
-	tenancies []*pbresource.Tenancy
+	ctx    context.Context
+	client *rtest.Client
+	rt     controller.Runtime
 }
 
 func (suite *controllerSuite) SetupTest() {
 	suite.ctx = testutil.TestContext(suite.T())
-	suite.tenancies = rtest.TestTenancies()
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
-
+	client := svctest.RunResourceService(suite.T(), types.Register, catalog.RegisterTypes)
 	suite.rt = controller.Runtime{
 		Client: client,
 		Logger: testutil.Logger(suite.T()),
@@ -55,1271 +49,1252 @@ func (suite *controllerSuite) TestController() {
 	mgr.SetRaftLeader(true)
 	go mgr.Run(suite.ctx)
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
+	backendName := func(name, port string) string {
+		return fmt.Sprintf("catalog.v2beta1.Service/default.local.default/%s?port=%s", name, port)
+	}
 
-		backendName := func(name, port string) string {
-			return fmt.Sprintf("catalog.v2beta1.Service/%s.local.%s/%s?port=%s", tenancy.Partition, tenancy.Namespace, 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},
+		},
+	}
 
-		var (
-			apiServiceRef = rtest.Resource(pbcatalog.ServiceType, "api").
-					WithTenancy(tenancy).
-					Reference("")
-			fooServiceRef = rtest.Resource(pbcatalog.ServiceType, "foo").
-					WithTenancy(tenancy).
-					Reference("")
-			barServiceRef = rtest.Resource(pbcatalog.ServiceType, "bar").
-					WithTenancy(tenancy).
-					Reference("")
-
-			computedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "api").
-						WithTenancy(tenancy).
-						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,
 			},
-		}
-
-		_ = rtest.Resource(pbcatalog.ServiceType, "api").
-			WithTenancy(tenancy).
-			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"),
-									}},
+			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(),
-							},
+					},
+					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(tenancy).
-			WithData(suite.T(), apiServiceData).
-			Write(suite.T(), suite.client)
+		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, "", expect)
+	})
 
-		// 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},
-			},
-		}
+	// 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},
+		},
+	}
 
-		fooService := rtest.Resource(pbcatalog.ServiceType, "foo").
-			WithTenancy(tenancy).
-			WithData(suite.T(), fooServiceData).
-			Write(suite.T(), suite.client)
+	_ = 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},
+		},
+	}
 
-		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"),
-									}},
+	_ = 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(),
-							},
+					},
+					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"),
-									}},
+				},
+				"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(),
-							},
+					},
+					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"),
-									}},
+				},
+				"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(),
-							},
+					},
+					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"),
-									}},
+				},
+				"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(),
-							},
+					},
+					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)
-		})
+		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, lastVersion, expect)
+	})
 
-		// Customize each route type.
+	// Customize each route type.
 
-		tcpRoute1 := &pbmesh.TCPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "tcp"),
-			},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
+	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(tenancy).
-			WithData(suite.T(), tcpRoute1).
-			Write(suite.T(), suite.client).
-			Id
-
-		httpRoute1 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "http"),
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "http2"),
-			},
-			Rules: []*pbmesh.HTTPRouteRule{{
-				BackendRefs: []*pbmesh.HTTPBackendRef{{
-					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(tenancy).
-			WithData(suite.T(), httpRoute1).
-			Write(suite.T(), suite.client).
-			Id
-
-		grpcRoute1 := &pbmesh.GRPCRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "grpc"),
-			},
-			Rules: []*pbmesh.GRPCRouteRule{{
-				BackendRefs: []*pbmesh.GRPCBackendRef{{
-					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(tenancy).
-			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"),
-									}},
+		}},
+	}
+	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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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)
+		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, tcpRoute1ID, StatusKey, ConditionXRouteOK)
+		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
+		suite.client.WaitForStatusCondition(t, grpcRoute1ID, StatusKey, ConditionXRouteOK)
+	})
 
-		// Add another route, with a bad mapping.
+	// Add another route, with a bad mapping.
 
-		tcpRoute2 := &pbmesh.TCPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "tcp"),
-			},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{{
-					BackendRef: newBackendRef(barServiceRef, "", ""),
-				}},
+	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(tenancy).
-			WithData(suite.T(), tcpRoute2).
-			Write(suite.T(), suite.client).
-			Id
-
-		httpRoute2 := &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "http"),
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "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, "", ""),
-				}},
+		}},
+	}
+	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",
+				},
 			}},
-		}
-		httpRoute2ID := rtest.Resource(pbmesh.HTTPRouteType, "api-http-route2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), httpRoute2).
-			Write(suite.T(), suite.client).
-			Id
-
-		grpcRoute2 := &pbmesh.GRPCRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "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, "", ""),
-				}},
+			BackendRefs: []*pbmesh.HTTPBackendRef{{
+				BackendRef: newBackendRef(barServiceRef, "", ""),
 			}},
-		}
-		grpcRoute2ID := rtest.Resource(pbmesh.GRPCRouteType, "api-grpc-route2").
-			WithTenancy(tenancy).
-			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, ""),
+		}},
+	}
+	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",
 				},
-				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,
-										}},
-									},
+			}},
+			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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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", tenancy)))
-			suite.client.WaitForStatusCondition(t, httpRoute2ID, StatusKey,
-				ConditionMissingBackendRef(newRef(pbcatalog.ServiceType, "bar", tenancy)))
-			suite.client.WaitForStatusCondition(t, grpcRoute2ID, StatusKey,
-				ConditionMissingBackendRef(newRef(pbcatalog.ServiceType, "bar", tenancy)))
-		})
-
-		// 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", tenancy), "http"),
 			},
-			Rules: []*pbmesh.TCPRouteRule{{
-				BackendRefs: []*pbmesh.TCPBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
 		}
-		rtest.ResourceID(tcpRoute2ID).
-			WithTenancy(tenancy).
-			WithData(suite.T(), tcpRoute2).
-			Write(suite.T(), suite.client)
 
-		httpRoute2 = &pbmesh.HTTPRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "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(tenancy).
-			WithData(suite.T(), httpRoute2).
-			Write(suite.T(), suite.client)
+		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, lastVersion, expect)
 
-		grpcRoute2 = &pbmesh.GRPCRoute{
-			ParentRefs: []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "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(tenancy).
-			WithData(suite.T(), grpcRoute2).
-			Write(suite.T(), suite.client)
+		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")))
+	})
 
-		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, ""),
+	// 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",
 				},
-				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.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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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", tenancy), "http", pbmesh.HTTPRouteType))
-			suite.client.WaitForStatusCondition(t, httpRoute2ID, StatusKey,
-				ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "grpc", pbmesh.GRPCRouteType))
-			suite.client.WaitForStatusCondition(t, grpcRoute2ID, StatusKey,
-				ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "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", tenancy), ""),
 			},
-			Rules: []*pbmesh.GRPCRouteRule{{
-				BackendRefs: []*pbmesh.GRPCBackendRef{{
-					BackendRef: newBackendRef(fooServiceRef, "", ""),
-				}},
-			}},
 		}
-		grpcRoute1ID = rtest.Resource(pbmesh.GRPCRouteType, "zzz-bad-route").
-			WithTenancy(tenancy).
-			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"),
-									}},
+
+		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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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,
-										}},
-									},
+				},
+				"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(),
-							},
+					},
+					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", tenancy), "http", pbmesh.HTTPRouteType),
-				ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "http2", pbmesh.HTTPRouteType),
-				ConditionConflictNotBoundToParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "tcp", pbmesh.TCPRouteType))
+		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)
+		lastVersion = requireNewComputedRoutesVersion(t, suite.client, computedRoutesID, "" /*no change*/, expect)
 
-			suite.client.WaitForStatusCondition(t, tcpRoute1ID, StatusKey, ConditionXRouteOK)
-			suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
+		suite.client.WaitForStatusCondition(t, tcpRoute1ID, StatusKey, ConditionXRouteOK)
+		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
 
-		})
+	})
 
-		// Remove the mesh port from api service.
+	// 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},
+		},
+	}
 
-		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)
 
-		apiService := rtest.Resource(pbcatalog.ServiceType, "api").
-			WithTenancy(tenancy).
-			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)
 
-		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", tenancy)))
-			suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey,
-				ConditionParentRefOutsideMesh(newRef(pbcatalog.ServiceType, "api", tenancy)))
-			suite.client.WaitForStatusCondition(t, grpcRoute1ID, StatusKey,
-				ConditionParentRefOutsideMesh(newRef(pbcatalog.ServiceType, "api", tenancy)))
-		})
-
-		// Get down to just 2 ports for all relevant services.
-		for _, name := range []string{"foo", "bar", "api"} {
-			_ = rtest.Resource(pbcatalog.ServiceType, name).
-				WithTenancy(tenancy).
-				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)
-		}
+		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")))
+	})
 
-		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(tenancy).
-			WithData(suite.T(), httpRoute1).
-			Write(suite.T(), suite.client).
-			Id
-
-		var (
-			fooLastVersion string
-			barLastVersion string
-
-			fooComputedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "foo").
-						WithTenancy(tenancy).
-						ID()
-			barComputedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "bar").
-						WithTenancy(tenancy).
-						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, ""),
+	// 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 + "-"},
 				},
-				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,
-										}},
-									},
+				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(),
-							},
+					},
+					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,
-										}},
-									},
+			},
+		}
+		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(),
-							},
+					},
+					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)
+		fooLastVersion = requireNewComputedRoutesVersion(t, suite.client, fooComputedRoutesID, fooLastVersion, expectFoo)
+		barLastVersion = requireNewComputedRoutesVersion(t, suite.client, barComputedRoutesID, barLastVersion, expectBar)
 
-			suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
-		})
+		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, "", ""),
-				}},
+	// 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(tenancy).
-			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"),
-										}},
-									},
+		}},
+	}
+	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(),
-							},
+					},
+					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)
-
-			resourcesToDelete := []*pbresource.ID{
-				apiService.Id,
-				fooService.Id,
-				tcpRoute1ID,
-				tcpRoute2ID,
-				grpcRoute1ID,
-				grpcRoute2ID,
-				httpRoute1ID,
-				httpRoute2ID,
-			}
-
-			for _, id := range resourcesToDelete {
-				suite.client.MustDelete(t, id)
-				suite.client.WaitForDeletion(t, id)
-			}
-		})
+			},
+		}
+
+		barLastVersion = requireNewComputedRoutesVersion(t, suite.client, barComputedRoutesID, barLastVersion, expectBar)
+
+		suite.client.WaitForStatusCondition(t, httpRoute1ID, StatusKey, ConditionXRouteOK)
 	})
 }
 
@@ -1363,15 +1338,3 @@ func requireNewComputedRoutesVersion(
 func TestController(t *testing.T) {
 	suite.Run(t, new(controllerSuite))
 }
-
-func (suite *controllerSuite) runTestCaseWithTenancies(testFunc func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			testFunc(tenancy)
-		})
-	}
-}
-
-func (suite *controllerSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
diff --git a/internal/mesh/internal/controllers/routes/generate_test.go b/internal/mesh/internal/controllers/routes/generate_test.go
index 02ae0e0d435d2..4dc4a9c0793e7 100644
--- a/internal/mesh/internal/controllers/routes/generate_test.go
+++ b/internal/mesh/internal/controllers/routes/generate_test.go
@@ -29,282 +29,223 @@ func TestGenerateComputedRoutes(t *testing.T) {
 	types.Register(registry)
 	catalog.RegisterTypes(registry)
 
-	for _, tenancy := range rtest.TestTenancies() {
-		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,
-			)
+	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)
-				}
+		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(tenancy).
-				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(tenancy).
-				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(tenancy).
-				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(tenancy).
-				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(tenancy).
-				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(tenancy).
-				WithData(t, data).Build()
-			rtest.ValidateAndNormalize(t, registry, policy)
-			return rtest.MustDecode[*pbcatalog.FailoverPolicy](t, policy)
-		}
+	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)
+	}
 
-		backendName := func(name, port string) string {
-			return fmt.Sprintf("catalog.v2beta1.Service/%s.local.%s/%s?port=%s", tenancy.Partition, tenancy.Namespace, name, port)
-		}
+	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)
+	}
 
-		var (
-			apiServiceID = rtest.Resource(pbcatalog.ServiceType, "api").
-					WithTenancy(tenancy).
-					ID()
-			apiServiceRef       = resource.Reference(apiServiceID, "")
-			apiComputedRoutesID = rtest.Resource(pbmesh.ComputedRoutesType, "api").
-						WithTenancy(tenancy).
-						ID()
+	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)
+	}
 
-			fooServiceID = rtest.Resource(pbcatalog.ServiceType, "foo").
-					WithTenancy(tenancy).
-					ID()
-			fooServiceRef = resource.Reference(fooServiceID, "")
+	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)
+	}
 
-			barServiceID = rtest.Resource(pbcatalog.ServiceType, "bar").
-					WithTenancy(tenancy).
-					ID()
-			barServiceRef = resource.Reference(barServiceID, "")
+	backendName := func(name, port string) string {
+		return fmt.Sprintf("catalog.v2beta1.Service/default.local.default/%s?port=%s", name, port)
+	}
 
-			deadServiceID = rtest.Resource(pbcatalog.ServiceType, "dead").
-					WithTenancy(tenancy).
+	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()
-			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{{
+		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)
-		})
+			},
+		}
+		run(t, related, expect, nil)
+	})
 
-		t.Run("tcp service with default route", func(t *testing.T) {
-			apiServiceData := &pbcatalog.Service{
+	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},
 				},
-			}
-
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID).
-				AddResources(newService("api", apiServiceData))
+			}))
+		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},
+			},
+		}
 
-			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"),
-										}},
+		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(),
-									},
-								},
+						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)
-			})
+				},
+			}},
 		}
-
-		t.Run("grpc service with default route", func(t *testing.T) {
+		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: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
+					{TargetPort: protoName, Protocol: protocol},
 					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
 				},
 			}
@@ -321,25 +262,30 @@ func TestGenerateComputedRoutes(t *testing.T) {
 						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"),
+						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, "grpc"),
-							Protocol:           pbcatalog.Protocol_PROTOCOL_GRPC,
+							ParentRef:          newParentRef(apiServiceRef, protoName),
+							Protocol:           protocol,
 							Targets: map[string]*pbmesh.BackendTargetDetails{
-								backendName("api", "grpc"): {
+								backendName("api", protoName): {
 									Type:              pbmesh.BackendTargetDetailsType_BACKEND_TARGET_DETAILS_TYPE_DIRECT,
 									MeshPort:          "mesh",
-									BackendRef:        newBackendRef(apiServiceRef, "grpc", ""),
+									BackendRef:        newBackendRef(apiServiceRef, protoName, ""),
 									DestinationConfig: defaultDestConfig(),
 								},
 							},
@@ -349,1031 +295,894 @@ func TestGenerateComputedRoutes(t *testing.T) {
 			}}
 			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},
-				},
-			}
+	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},
+			},
+		}
 
-			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},
+		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},
+			},
+		}
 
-			tcpRoute1 := &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "tcp"),
-				},
-				Rules: []*pbmesh.TCPRouteRule{{
-					BackendRefs: []*pbmesh.TCPBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "", ""),
-					}},
+		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", tenancy), "http"),
-					newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "http2"),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						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", tenancy), "grpc"),
-				},
-				Rules: []*pbmesh.GRPCRouteRule{{
-					BackendRefs: []*pbmesh.GRPCBackendRef{{
-						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),
-				)
+		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", tenancy),
-						newRef(pbmesh.HTTPRouteType, "api-http-route1", tenancy),
-						newRef(pbmesh.TCPRouteType, "api-tcp-route1", tenancy),
+		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(),
+							},
+						},
 					},
-					PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-						"tcp": {
-							Config: &pbmesh.ComputedPortRoutes_Tcp{
-								Tcp: &pbmesh.ComputedTCPRoute{
-									Rules: []*pbmesh.ComputedTCPRouteRule{{
-										BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
-											BackendTarget: backendName("foo", "tcp"),
+					"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, "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(),
-								},
+						},
+						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(),
 							},
 						},
-						"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,
-											}},
-										},
+					},
+					"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, "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(),
+						},
+						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,
+										}},
+									},
 								},
 							},
 						},
-						"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(),
-								},
+						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(),
 							},
 						},
-						"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,
-											}},
-										},
-									},
-								},
+					},
+				},
+			},
+		}}
+		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),
+								}},
 							},
-							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(),
-								},
+							{
+								Matches: defaultHTTPRouteMatches(),
+								BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
+									BackendTarget: types.NullRouteBackend,
+								}},
 							},
 						},
 					},
 				},
-			}}
-			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},
+				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(),
+					},
 				},
 			}
+		}
 
-			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},
-				},
-			}
+		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},
+			},
+		}
 
-			httpRoute1 := &pbmesh.HTTPRoute{
-				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "", ""),
-					}},
+		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, "", ""),
 				}},
-			}
+			}},
+		}
 
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID).
-				AddResources(
-					newService("api", apiServiceData),
-					newService("foo", fooServiceData),
-					newHTTPRoute("api-http-route1", httpRoute1),
-				)
+		apiSvc := newService("api", apiServiceData)
+		fooSvc := newService("foo", fooServiceData)
+		apiHTTPRoute1 := 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),
+		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: "/",
+										},
 									}},
-								},
-								{
-									Matches: defaultHTTPRouteMatches(),
 									BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-										BackendTarget: types.NullRouteBackend,
+										BackendTarget: backendName("api", "http"),
 									}},
-								},
+								}},
 							},
 						},
-					},
-					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(),
+						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(),
+							},
 						},
 					},
-				}
-			}
-
-			expect := []*ComputedRoutesResult{{
-				ID:      apiComputedRoutesID,
-				OwnerID: apiServiceID,
-				Data: &pbmesh.ComputedRoutes{
-					BoundReferences: []*pbresource.Reference{
-						apiServiceRef,
-						fooServiceRef,
-						newRef(pbmesh.HTTPRouteType, "api-http-route1", tenancy),
-					},
-					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},
-				},
-			}
+			},
+		}}
+		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},
-				},
-			}
+		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", tenancy), ""),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "", ""),
-					}},
+		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", ""),
 				}},
-			}
+			}},
+		}
 
-			apiSvc := newService("api", apiServiceData)
-			fooSvc := newService("foo", fooServiceData)
-			apiHTTPRoute1 := newHTTPRoute("api-http-route1", httpRoute1)
+		related := loader.NewRelatedResources().
+			AddComputedRoutesIDs(apiComputedRoutesID).
+			AddResources(
+				newService("api", apiServiceData),
+				newService("foo", fooServiceData),
+				newHTTPRoute("api-http-route1", httpRoute1),
+			)
 
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID). // deliberately skip adding 'foo' here to exercise the bug
-				AddResources(apiSvc, fooSvc, apiHTTPRoute1)
+		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},
+			},
+		}
 
-			// Update this after the fact, but don't update the inner indexing in
-			// the 'related' struct.
-			{
-				httpRoute1.ParentRefs[0] = newParentRef(newRef(pbcatalog.ServiceType, "foo", tenancy), "")
-				apiHTTPRoute1.Data = httpRoute1
+		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},
+			},
+		}
 
-				anyData, err := anypb.New(httpRoute1)
-				require.NoError(t, err)
-				apiHTTPRoute1.Resource.Data = anyData
-			}
+		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,
-					},
-					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: "/",
-											},
+		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: backendName("api", "http"),
+											BackendTarget: types.NullRouteBackend,
 										}},
-									}},
+									},
 								},
 							},
-							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(),
-								},
+						},
+						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)
-		})
+			},
+		}}
+
+		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,
+				),
+			},
+		}
 
-		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},
-				},
-			}
+		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},
-				},
-			}
+		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", tenancy), "www"),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "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},
+			},
+		}
 
-			related := loader.NewRelatedResources().
-				AddComputedRoutesIDs(apiComputedRoutesID).
-				AddResources(
-					newService("api", apiServiceData),
-					newService("foo", fooServiceData),
-					newHTTPRoute("api-http-route1", httpRoute1),
-				)
+		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, "", ""),
+				}},
+			}},
+		}
 
-			expect := []*ComputedRoutesResult{{
-				ID:      apiComputedRoutesID,
-				OwnerID: apiServiceID,
-				Data: &pbmesh.ComputedRoutes{
-					BoundReferences: []*pbresource.Reference{
-						apiServiceRef,
+		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",
 					},
-					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", tenancy), "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", tenancy), "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", tenancy), "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", tenancy), "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", tenancy),
-						newRef(pbmesh.HTTPRouteType, "api-http-route2", tenancy),
-					},
-					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", tenancy), "http"),
-				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: nil,
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
-						BackendRef: newBackendRef(fooServiceRef, "", ""),
-					}},
+				BackendRefs: []*pbmesh.HTTPBackendRef{{
+					BackendRef: newBackendRef(barServiceRef, "", ""),
 				}},
-			}
-
-			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", tenancy),
-					},
-					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", tenancy), "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", tenancy),
-						},
-						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},
-					},
-				}
+		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),
+			)
 
-				grpcRoute1 := &pbmesh.GRPCRoute{
-					ParentRefs: []*pbmesh.ParentReference{
-						newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "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", tenancy),
-						},
-						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,
-												}},
+		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",
 											},
-											{
-												Matches: defaultGRPCRouteMatches(),
-												BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
-													BackendTarget: types.NullRouteBackend,
-												}},
+										}},
+										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("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},
-					},
-				}
+				},
+			},
+		}}
+		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},
+			},
+		}
 
-				tcpRoute1 := &pbmesh.TCPRoute{
-					ParentRefs: []*pbmesh.ParentReference{
-						newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "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", tenancy),
-						},
-						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,
-												}},
-											},
-										},
+		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)
-			})
-		})
+				},
+			},
+		}}
+		run(t, related, expect, nil)
+	})
 
-		t.Run("stale-weird: http destination with service not in mesh", func(t *testing.T) {
+	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-"},
@@ -1384,18 +1193,9 @@ func TestGenerateComputedRoutes(t *testing.T) {
 				},
 			}
 
-			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", tenancy), "http"),
+					newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
 				},
 				Rules: []*pbmesh.HTTPRouteRule{{
 					BackendRefs: []*pbmesh.HTTPBackendRef{{
@@ -1408,7 +1208,6 @@ func TestGenerateComputedRoutes(t *testing.T) {
 				AddComputedRoutesIDs(apiComputedRoutesID).
 				AddResources(
 					newService("api", apiServiceData),
-					newService("foo", fooServiceData),
 					newHTTPRoute("api-http-route1", httpRoute1),
 				)
 
@@ -1418,8 +1217,7 @@ func TestGenerateComputedRoutes(t *testing.T) {
 				Data: &pbmesh.ComputedRoutes{
 					BoundReferences: []*pbresource.Reference{
 						apiServiceRef,
-						fooServiceRef,
-						newRef(pbmesh.HTTPRouteType, "api-http-route1", tenancy),
+						newRef(pbmesh.HTTPRouteType, "api-http-route1"),
 					},
 					PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
 						"http": {
@@ -1449,63 +1247,33 @@ func TestGenerateComputedRoutes(t *testing.T) {
 			}}
 			run(t, related, expect, nil)
 		})
-
-		t.Run("http route with dest policy", func(t *testing.T) {
+		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: "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},
+					{TargetPort: "grpc", Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
 				},
 			}
 
-			httpRoute1 := &pbmesh.HTTPRoute{
+			grpcRoute1 := &pbmesh.GRPCRoute{
 				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "http"),
+					newParentRef(newRef(pbcatalog.ServiceType, "api"), "grpc"),
 				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
+				Rules: []*pbmesh.GRPCRouteRule{{
+					BackendRefs: []*pbmesh.GRPCBackendRef{{
 						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),
+					newGRPCRoute("api-grpc-route1", grpcRoute1),
 				)
 
 			expect := []*ComputedRoutesResult{{
@@ -1514,118 +1282,63 @@ func TestGenerateComputedRoutes(t *testing.T) {
 				Data: &pbmesh.ComputedRoutes{
 					BoundReferences: []*pbresource.Reference{
 						apiServiceRef,
-						fooServiceRef,
-						newRef(pbmesh.DestinationPolicyType, "foo", tenancy),
-						newRef(pbmesh.HTTPRouteType, "api-http-route1", tenancy),
+						newRef(pbmesh.GRPCRouteType, "api-grpc-route1"),
 					},
 					PortedConfigs: map[string]*pbmesh.ComputedPortRoutes{
-						"http": {
-							Config: &pbmesh.ComputedPortRoutes_Http{
-								Http: &pbmesh.ComputedHTTPRoute{
-									Rules: []*pbmesh.ComputedHTTPRouteRule{
+						"grpc": {
+							ParentRef: newParentRef(apiServiceRef, "grpc"),
+							Protocol:  pbcatalog.Protocol_PROTOCOL_GRPC,
+							Config: &pbmesh.ComputedPortRoutes_Grpc{
+								Grpc: &pbmesh.ComputedGRPCRoute{
+									Rules: []*pbmesh.ComputedGRPCRouteRule{
 										{
-											Matches: defaultHTTPRouteMatches(),
-											BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
-												BackendTarget: backendName("foo", "http"),
+											Matches: defaultGRPCRouteMatches(),
+											BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
+												BackendTarget: types.NullRouteBackend,
 											}},
 										},
 										{
-											Matches: defaultHTTPRouteMatches(),
-											BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
+											Matches: defaultGRPCRouteMatches(),
+											BackendRefs: []*pbmesh.ComputedGRPCBackendRef{{
 												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) {
+		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: "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},
+					{TargetPort: "tcp", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
 				},
 			}
 
-			httpRoute1 := &pbmesh.HTTPRoute{
+			tcpRoute1 := &pbmesh.TCPRoute{
 				ParentRefs: []*pbmesh.ParentReference{
-					newParentRef(newRef(pbcatalog.ServiceType, "api", tenancy), "http"),
+					newParentRef(newRef(pbcatalog.ServiceType, "api"), "tcp"),
 				},
-				Rules: []*pbmesh.HTTPRouteRule{{
-					Matches: []*pbmesh.HTTPRouteMatch{{
-						Path: &pbmesh.HTTPPathMatch{
-							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
-							Value: "/",
-						},
-					}},
-					BackendRefs: []*pbmesh.HTTPBackendRef{{
+				Rules: []*pbmesh.TCPRouteRule{{
+					BackendRefs: []*pbmesh.TCPBackendRef{{
 						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),
+					newTCPRoute("api-tcp-route1", tcpRoute1),
 				)
 
 			expect := []*ComputedRoutesResult{{
@@ -1633,54 +1346,339 @@ func TestGenerateComputedRoutes(t *testing.T) {
 				OwnerID: apiServiceID,
 				Data: &pbmesh.ComputedRoutes{
 					BoundReferences: []*pbresource.Reference{
-						newRef(pbcatalog.FailoverPolicyType, "foo", tenancy),
 						apiServiceRef,
-						barServiceRef,
-						fooServiceRef,
-						newRef(pbmesh.HTTPRouteType, "api-http-route1", tenancy),
+						newRef(pbmesh.TCPRouteType, "api-tcp-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"),
-											}},
-										},
+						"tcp": {
+							ParentRef: newParentRef(apiServiceRef, "tcp"),
+							Protocol:  pbcatalog.Protocol_PROTOCOL_TCP,
+							Config: &pbmesh.ComputedPortRoutes_Tcp{
+								Tcp: &pbmesh.ComputedTCPRoute{
+									Rules: []*pbmesh.ComputedTCPRouteRule{
 										{
-											Matches: defaultHTTPRouteMatches(),
-											BackendRefs: []*pbmesh.ComputedHTTPBackendRef{{
+											BackendRefs: []*pbmesh.ComputedTCPBackendRef{{
 												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)
 		})
-	}
+	})
+
+	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/loader/loader_test.go b/internal/mesh/internal/controllers/routes/loader/loader_test.go
index 0db050fee6425..a665635d05f7f 100644
--- a/internal/mesh/internal/controllers/routes/loader/loader_test.go
+++ b/internal/mesh/internal/controllers/routes/loader/loader_test.go
@@ -7,10 +7,11 @@ import (
 	"testing"
 	"time"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/types/known/durationpb"
 
-	"github.com/hashicorp/go-hclog"
+	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"
@@ -20,7 +21,6 @@ import (
 	"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"
@@ -28,9 +28,7 @@ import (
 
 func TestLoadResourcesForComputedRoutes(t *testing.T) {
 	ctx := testutil.TestContext(t)
-	rclient := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		Run(t)
+	rclient := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
 	rt := controller.Runtime{
 		Client: rclient,
 		Logger: testutil.Logger(t),
diff --git a/internal/mesh/internal/controllers/routes/ref_validation_test.go b/internal/mesh/internal/controllers/routes/ref_validation_test.go
index 71933a2a5d935..3f6db4207865b 100644
--- a/internal/mesh/internal/controllers/routes/ref_validation_test.go
+++ b/internal/mesh/internal/controllers/routes/ref_validation_test.go
@@ -52,11 +52,11 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 		t.Run("with no service", func(t *testing.T) {
 			sg := newTestServiceGetter()
 			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), ""),
+				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
 			}, nil)
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionMissingParentRef(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 			))
 		})
 
@@ -65,11 +65,11 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
 			}))
 			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), ""),
+				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
 			}, nil)
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionParentRefOutsideMesh(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 			))
 		})
 
@@ -79,11 +79,11 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "mesh"),
+				newParentRef(newRef(pbcatalog.ServiceType, "api"), "mesh"),
 			}, nil)
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionParentRefUsingMeshPort(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 				"mesh",
 			))
 		})
@@ -94,11 +94,11 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "web"),
+				newParentRef(newRef(pbcatalog.ServiceType, "api"), "web"),
 			}, nil)
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionUnknownParentRefPort(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 				"web",
 			))
 		})
@@ -109,7 +109,7 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), ""),
+				newParentRef(newRef(pbcatalog.ServiceType, "api"), ""),
 			}, nil)
 			require.Empty(t, got)
 		})
@@ -120,7 +120,7 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, []*pbmesh.ParentReference{
-				newParentRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "http"),
+				newParentRef(newRef(pbcatalog.ServiceType, "api"), "http"),
 			}, nil)
 			require.Empty(t, got)
 		})
@@ -130,11 +130,11 @@ func TestComputeNewRouteRefConditions(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", resource.DefaultNamespacedTenancy()), "", ""),
+				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "", ""),
 			})
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionMissingBackendRef(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 			))
 		})
 
@@ -143,11 +143,11 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"http": pbcatalog.Protocol_PROTOCOL_HTTP,
 			}))
 			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "", ""),
+				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "", ""),
 			})
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionBackendRefOutsideMesh(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 			))
 		})
 
@@ -157,11 +157,11 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "mesh", ""),
+				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "mesh", ""),
 			})
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionBackendRefUsingMeshPort(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 				"mesh",
 			))
 		})
@@ -172,11 +172,11 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "web", ""),
+				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "web", ""),
 			})
 			require.Len(t, got, 1)
 			prototest.AssertContainsElement(t, got, ConditionUnknownBackendRefPort(
-				newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()),
+				newRef(pbcatalog.ServiceType, "api"),
 				"web",
 			))
 		})
@@ -187,7 +187,7 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "", ""),
+				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "", ""),
 			})
 			require.Empty(t, got)
 		})
@@ -198,20 +198,16 @@ func TestComputeNewRouteRefConditions(t *testing.T) {
 				"mesh": pbcatalog.Protocol_PROTOCOL_MESH,
 			}))
 			got := computeNewRouteRefConditions(sg, nil, []*pbmesh.BackendReference{
-				newBackendRef(newRef(pbcatalog.ServiceType, "api", resource.DefaultNamespacedTenancy()), "http", ""),
+				newBackendRef(newRef(pbcatalog.ServiceType, "api"), "http", ""),
 			})
 			require.Empty(t, got)
 		})
 	})
 }
 
-func newRef(typ *pbresource.Type, name string, tenancy *pbresource.Tenancy) *pbresource.Reference {
-	if tenancy == nil {
-		tenancy = resource.DefaultNamespacedTenancy()
-	}
-
+func newRef(typ *pbresource.Type, name string) *pbresource.Reference {
 	return rtest.Resource(typ, name).
-		WithTenancy(tenancy).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
 		Reference("")
 }
 
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_multiport_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destination_multiport_test.go
index 5c9098d28ffd0..289c8c76548e1 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/destination_multiport_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/destination_multiport_test.go
@@ -10,6 +10,8 @@ import (
 
 	"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"
@@ -17,247 +19,243 @@ import (
 	"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"
 )
 
 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"
 	)
-
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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.
-		proxyCfg := &pbmesh.ComputedProxyConfiguration{
-			DynamicConfig: &pbmesh.DynamicConfig{
-				Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-				TransparentProxy: &pbmesh.TransparentProxy{
-					OutboundListenerPort: 15001,
-				},
+	proxyCfg := &pbmesh.ComputedProxyConfiguration{
+		DynamicConfig: &pbmesh.DynamicConfig{
+			Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
+			TransparentProxy: &pbmesh.TransparentProxy{
+				OutboundListenerPort: 15001,
 			},
-		}
+		},
+	}
 
-		multiportServiceData := &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,
-				},
+	multiportServiceData := &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,
+			},
+		},
+	}
 
-		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},
-					},
+	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(tenancy).
-			WithData(t, multiportServiceData).
-			Build()
+		},
+	}
+	apiAppService := resourcetest.Resource(pbcatalog.ServiceType, apiApp).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		WithData(t, multiportServiceData).
+		Build()
 
-		apiApp2Service := resourcetest.Resource(pbcatalog.ServiceType, apiApp2).
-			WithTenancy(tenancy).
-			WithData(t, multiportServiceData).
-			Build()
+	apiApp2Service := resourcetest.Resource(pbcatalog.ServiceType, apiApp2).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		WithData(t, multiportServiceData).
+		Build()
 
-		apiAppEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, apiApp).
-			WithOwner(apiAppService.Id).
-			WithData(t, multiportEndpointsData).
-			WithTenancy(tenancy).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(tenancy).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},
-					},
+	mwEndpointsData := &pbcatalog.ServiceEndpoints{ // variant on apiAppEndpoints
+		Endpoints: []*pbcatalog.Endpoint{
+			{
+				Addresses: []*pbcatalog.WorkloadAddress{
+					{Host: "10.0.0.1"},
 				},
-				{
-					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},
-					},
+				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(tenancy).Build()
+			{
+				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,
-		}
+	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,
-		}
+	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)
+	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)
+	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)
+	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
-				}
+		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)
+			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,
 			}
-			return out
+			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"},
-		)
+	apiAppDestinations := newImplicitDestination(
+		apiAppService,
+		apiAppEndpoints,
+		apiAppComputedRoutes,
+		[]*pbresource.Reference{apiAppIdentity},
+		[]string{"1.1.1.1"},
+	)
 
-		mwDestinations := newImplicitDestination(
-			apiAppService,
-			mwEndpoints,
-			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"},
+	)
 
-		twoImplicitDestinations := append(
-			append([]*intermediate.Destination{}, apiAppDestinations...),
-			apiApp2Destinations...,
-		)
+	mwDestinations := newImplicitDestination(
+		apiAppService,
+		mwEndpoints,
+		apiAppComputedRoutes,
+		[]*pbresource.Reference{apiAppIdentity},
+		[]string{"1.1.1.1"},
+	)
 
-		cases := map[string]struct {
-			getDestinations func() []*intermediate.Destination
-		}{
-			// Most basic test that multiport configuration works
-			"destination/multiport-l4-and-l7-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-and-l7-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-and-l7-multiple-implicit-destinations-tproxy": {
-				getDestinations: func() []*intermediate.Destination { return twoImplicitDestinations },
-			},
-		}
+	twoImplicitDestinations := append(
+		append([]*intermediate.Destination{}, apiAppDestinations...),
+		apiApp2Destinations...,
+	)
 
-		for name, c := range cases {
-			t.Run(resourcetest.AppendTenancyInfoSubtest(t.Name(), name, tenancy), func(t *testing.T) {
-				proxyTmpl := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), trustDomain, datacenter, false, proxyCfg).
-					BuildDestinations(c.getDestinations()).
-					Build()
+	cases := map[string]struct {
+		getDestinations func() []*intermediate.Destination
+	}{
+		// Most basic test that multiport configuration works
+		"destination/multiport-l4-and-l7-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-and-l7-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-and-l7-multiple-implicit-destinations-tproxy": {
+			getDestinations: func() []*intermediate.Destination { return twoImplicitDestinations },
+		},
+	}
 
-				// 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()
-				})
+	for name, c := range cases {
+		t.Run(name, func(t *testing.T) {
+			proxyTmpl := New(testProxyStateTemplateID(), testIdentityRef(), trustDomain, datacenter, false, proxyCfg).
+				BuildDestinations(c.getDestinations()).
+				Build()
 
-				actual := protoToJSON(t, proxyTmpl)
-				expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+"-"+tenancy.Partition+"-"+tenancy.Namespace+".golden"))
+			// 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()
+			})
 
-				// 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()
-				})
+			actual := protoToJSON(t, proxyTmpl)
+			expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+".golden"))
 
-				// convert back to json after sorting so that test output does not contain extraneous fields.
-				require.Equal(t, protoToJSON(t, expected), protoToJSON(t, proxyTmpl))
+			// 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()
 			})
-		}
-	}, t)
+
+			// 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/destinations.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go
index c078c3273e439..aea4360b83108 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations.go
@@ -248,7 +248,7 @@ func (b *Builder) buildDestination(
 			panic(fmt.Sprintf("it should not be possible to have a tcp protocol here: %v", effectiveProtocol))
 		}
 
-		rb := lb.addL7Router(routeName, statPrefix, effectiveProtocol)
+		rb := lb.addL7Router(routeName, "", effectiveProtocol)
 		if destination.Explicit == nil {
 			rb.addIPAndPortMatch(destination.VirtualIPs, virtualPortNumber)
 		}
@@ -290,6 +290,7 @@ func (b *Builder) buildDestination(
 		clusterName := fmt.Sprintf("%s.%s", portName, sni)
 
 		egName := ""
+
 		if details.FailoverConfig != nil {
 			egName = fmt.Sprintf("%s%d~%s", xdscommon.FailoverClusterNamePrefix, 0, clusterName)
 		}
@@ -372,7 +373,7 @@ func (b *ListenerBuilder) addL4RouterForDirect(clusterName, statPrefix string) *
 	router := &pbproxystate.Router{}
 
 	if statPrefix == "" {
-		statPrefix = fmt.Sprintf("upstream.%s", clusterName)
+		statPrefix = "upstream."
 	}
 
 	router.Destination = &pbproxystate.Router_L4{
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations_test.go
index a6bfe7e305dca..c6b5a76592549 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/destinations_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/destinations_test.go
@@ -71,167 +71,97 @@ func TestBuildExplicitDestinations(t *testing.T) {
 	types.Register(registry)
 	catalog.RegisterTypes(registry)
 
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		api1Service := resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-			WithTenancy(tenancy).
-			WithData(t, serviceData).
-			Build()
-
-		api2Service := resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-			WithTenancy(tenancy).
-			WithData(t, serviceData).
-			Build()
-
-		api3Service := resourcetest.Resource(pbcatalog.ServiceType, "api-3").
-			WithTenancy(tenancy).
-			WithData(t, serviceData).
-			Build()
-
-		backup1Service := resourcetest.Resource(pbcatalog.ServiceType, "backup-1").
-			WithTenancy(tenancy).
-			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(tenancy).
-			WithData(t, endpointsData).
-			Build()
-
-		api2Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-2").
-			WithTenancy(tenancy).
-			WithData(t, endpointsData).
-			Build()
-
-		backup1Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "backup-1").
-			WithTenancy(tenancy).
-			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"`
-					},
+	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(tenancy).
-			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()
+
+	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",
 						},
-					},
-				},
-			}).
-			Build()
-		resourcetest.ValidateAndNormalize(t, registry, api1HTTPRoute)
-
-		api1FailoverPolicy := resourcetest.Resource(pbcatalog.FailoverPolicyType, "api-1").
-			WithTenancy(tenancy).
-			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(tenancy).
-			WithData(t, &pbmesh.TCPRoute{
-				ParentRefs: []*pbmesh.ParentReference{{
-					Ref:  resource.Reference(api1Service.Id, ""),
-					Port: "tcp",
-				}},
-				Rules: []*pbmesh.TCPRouteRule{{
-					BackendRefs: []*pbmesh.TCPBackendRef{
+					}},
+					BackendRefs: []*pbmesh.HTTPBackendRef{
 						{
 							BackendRef: &pbmesh.BackendReference{
 								Ref: resource.Reference(api2Service.Id, ""),
@@ -251,336 +181,401 @@ func TestBuildExplicitDestinations(t *testing.T) {
 							Weight: 10,
 						},
 					},
-				}},
-			}).
-			Build()
-		resourcetest.ValidateAndNormalize(t, registry, api1TCPRoute)
-
-		api1TCP2Route := resourcetest.Resource(pbmesh.TCPRouteType, "api-1-tcp2-route").
-			WithTenancy(tenancy).
-			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,
+				},
+				{
+					Matches: []*pbmesh.HTTPRouteMatch{{
+						Path: &pbmesh.HTTPPathMatch{
+							Type:  pbmesh.PathMatchType_PATH_MATCH_TYPE_PREFIX,
+							Value: "/",
 						},
-						{
-							BackendRef: &pbmesh.BackendReference{
-								Ref: resource.Reference(api3Service.Id, ""),
-							},
-							Weight: 10,
+					}},
+					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()
-
-		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"},
+		}).
+		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",
+					}},
 				},
 			},
-			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"},
+		}).
+		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,
+					},
 				},
-			},
-			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},
+			}},
+		}).
+		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, "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},
+		},
+		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},
 			},
-			"destination/l4-single-destination-unix-socket-bind-address": {
-				destinations: []*intermediate.Destination{destinationUnix},
+		},
+		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"},
 			},
-			"destination/l4-multi-destination": {
-				destinations: []*intermediate.Destination{destinationIpPort, destinationUnix, destinationIpPort2, destinationUnix2},
+		},
+		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"},
 			},
-			"destination/mixed-multi-destination": {
-				destinations: []*intermediate.Destination{destinationIpPort, destinationUnix, destinationIpPortHTTP},
+		},
+		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
 
-		for name, c := range cases {
-			t.Run(resourcetest.AppendTenancyInfoSubtest(t.Name(), name, tenancy), func(t *testing.T) {
-				proxyTmpl := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", false, nil).
-					BuildDestinations(c.destinations).
-					Build()
+	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},
+		},
+	}
 
-				actual := protoToJSON(t, proxyTmpl)
-				expected := golden.Get(t, actual, name+"-"+tenancy.Partition+"-"+tenancy.Namespace+".golden")
+	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()
 
-				require.JSONEq(t, expected, actual)
-			})
-		}
-	}, t)
+			actual := protoToJSON(t, proxyTmpl)
+			expected := golden.Get(t, actual, name+".golden")
 
+			require.JSONEq(t, expected, actual)
+		})
+	}
 }
 
 func TestBuildImplicitDestinations(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		api1Service := resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-			WithTenancy(tenancy).
-			WithData(t, serviceData).
-			Build()
-
-		api2Service := resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-			WithTenancy(tenancy).
-			WithData(t, serviceData).
-			Build()
-
-		api1Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-1").
-			WithOwner(api1Service.Id).
-			WithTenancy(tenancy).
-			WithData(t, endpointsData).Build()
-
-		api2Endpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-2").
-			WithOwner(api2Service.Id).
-			WithTenancy(tenancy).
-			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.ComputedProxyConfiguration{
-			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},
+	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.ComputedProxyConfiguration{
+		DynamicConfig: &pbmesh.DynamicConfig{
+			Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
+			TransparentProxy: &pbmesh.TransparentProxy{
+				OutboundListenerPort: 15001,
 			},
-			"destination/l4-implicit-and-explicit-destinations-tproxy": {
-				destinations: []*intermediate.Destination{destination2, destination3},
+		},
+	}
+
+	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}
+			}
+		}),
+	}
 
-		for name, c := range cases {
-			t.Run(resourcetest.AppendTenancyInfoSubtest(t.Name(), name, tenancy), func(t *testing.T) {
-				proxyTmpl := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", false, proxyCfg).
-					BuildDestinations(c.destinations).
-					Build()
+	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+"-"+tenancy.Partition+"-"+tenancy.Namespace+".golden")
+			actual := protoToJSON(t, proxyTmpl)
+			expected := golden.Get(t, actual, name+".golden")
 
-				require.JSONEq(t, expected, actual)
-			})
-		}
-	}, t)
+			require.JSONEq(t, expected, actual)
+		})
+	}
 }
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/expose_paths_test.go b/internal/mesh/internal/controllers/sidecarproxy/builder/expose_paths_test.go
index 8bfcc5fbe7f17..c2c9217f40932 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/expose_paths_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/expose_paths_test.go
@@ -4,8 +4,6 @@
 package builder
 
 import (
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -18,94 +16,88 @@ import (
 // This file contains tests only for error and edge cases cases. The happy case is tested in local_app_test.go
 
 func TestBuildExposePaths_NilChecks(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		testutil.RunStep(t, "proxy cfg is nil", func(t *testing.T) {
-			b := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", true, nil)
-			require.NotPanics(t, func() {
-				b.buildExposePaths(nil)
-			})
+	testutil.RunStep(t, "proxy cfg is nil", func(t *testing.T) {
+		b := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", true, nil)
+		require.NotPanics(t, func() {
+			b.buildExposePaths(nil)
 		})
+	})
 
-		testutil.RunStep(t, "dynamic cfg is nil", func(t *testing.T) {
-			b := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", true, &pbmesh.ComputedProxyConfiguration{})
-			require.NotPanics(t, func() {
-				b.buildExposePaths(nil)
-			})
+	testutil.RunStep(t, "dynamic cfg is nil", func(t *testing.T) {
+		b := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", true, &pbmesh.ComputedProxyConfiguration{})
+		require.NotPanics(t, func() {
+			b.buildExposePaths(nil)
 		})
+	})
 
-		testutil.RunStep(t, "expose cfg is nil", func(t *testing.T) {
-			b := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", true, &pbmesh.ComputedProxyConfiguration{
-				DynamicConfig: &pbmesh.DynamicConfig{},
-			})
-			require.NotPanics(t, func() {
-				b.buildExposePaths(nil)
-			})
+	testutil.RunStep(t, "expose cfg is nil", func(t *testing.T) {
+		b := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", true, &pbmesh.ComputedProxyConfiguration{
+			DynamicConfig: &pbmesh.DynamicConfig{},
 		})
-	}, t)
+		require.NotPanics(t, func() {
+			b.buildExposePaths(nil)
+		})
+	})
 }
 
 func TestBuildExposePaths_NoExternalMeshWorkloadAddress(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		workload := &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "1.1.1.1", External: true},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"tcp":  {Port: 8080},
-				"mesh": {Port: 20000},
-			},
-		}
+	workload := &pbcatalog.Workload{
+		Addresses: []*pbcatalog.WorkloadAddress{
+			{Host: "1.1.1.1", External: true},
+		},
+		Ports: map[string]*pbcatalog.WorkloadPort{
+			"tcp":  {Port: 8080},
+			"mesh": {Port: 20000},
+		},
+	}
 
-		proxycfg := &pbmesh.ComputedProxyConfiguration{
-			DynamicConfig: &pbmesh.DynamicConfig{
-				ExposeConfig: &pbmesh.ExposeConfig{
-					ExposePaths: []*pbmesh.ExposePath{
-						{
-							ListenerPort:  1234,
-							LocalPathPort: 9090,
-							Path:          "/health",
-						},
+	proxycfg := &pbmesh.ComputedProxyConfiguration{
+		DynamicConfig: &pbmesh.DynamicConfig{
+			ExposeConfig: &pbmesh.ExposeConfig{
+				ExposePaths: []*pbmesh.ExposePath{
+					{
+						ListenerPort:  1234,
+						LocalPathPort: 9090,
+						Path:          "/health",
 					},
 				},
 			},
-		}
+		},
+	}
 
-		b := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", true, proxycfg)
-		b.buildExposePaths(workload)
-		require.Empty(t, b.proxyStateTemplate.ProxyState.Listeners)
-	}, t)
+	b := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", true, proxycfg)
+	b.buildExposePaths(workload)
+	require.Empty(t, b.proxyStateTemplate.ProxyState.Listeners)
 }
 
 func TestBuildExposePaths_InvalidProtocol(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		workload := &pbcatalog.Workload{
-			Addresses: []*pbcatalog.WorkloadAddress{
-				{Host: "1.1.1.1"},
-			},
-			Ports: map[string]*pbcatalog.WorkloadPort{
-				"tcp":  {Port: 8080},
-				"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-			},
-		}
+	workload := &pbcatalog.Workload{
+		Addresses: []*pbcatalog.WorkloadAddress{
+			{Host: "1.1.1.1"},
+		},
+		Ports: map[string]*pbcatalog.WorkloadPort{
+			"tcp":  {Port: 8080},
+			"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+		},
+	}
 
-		proxycfg := &pbmesh.ComputedProxyConfiguration{
-			DynamicConfig: &pbmesh.DynamicConfig{
-				ExposeConfig: &pbmesh.ExposeConfig{
-					ExposePaths: []*pbmesh.ExposePath{
-						{
-							ListenerPort:  1234,
-							LocalPathPort: 9090,
-							Path:          "/health",
-							Protocol:      3,
-						},
+	proxycfg := &pbmesh.ComputedProxyConfiguration{
+		DynamicConfig: &pbmesh.DynamicConfig{
+			ExposeConfig: &pbmesh.ExposeConfig{
+				ExposePaths: []*pbmesh.ExposePath{
+					{
+						ListenerPort:  1234,
+						LocalPathPort: 9090,
+						Path:          "/health",
+						Protocol:      3,
 					},
 				},
 			},
-		}
+		},
+	}
 
-		b := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", true, proxycfg)
-		require.PanicsWithValue(t, "unsupported expose paths protocol", func() {
-			b.buildExposePaths(workload)
-		})
-	}, t)
+	b := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", true, proxycfg)
+	require.PanicsWithValue(t, "unsupported expose paths protocol", func() {
+		b.buildExposePaths(workload)
+	})
 }
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
index 4a60d0f8b37e9..12cbb387af3a0 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_multiport_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_multiport_test.go
@@ -7,167 +7,164 @@ import (
 	"sort"
 	"testing"
 
+	"github.com/hashicorp/consul/internal/testing/golden"
+
 	"github.com/stretchr/testify/require"
 
-	"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 TestBuildLocalApp_Multiport(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		cases := map[string]struct {
-			workload *pbcatalog.Workload
-		}{
-			"source/multiport-l7-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_HTTP},
-						"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-						"grpc-port":  {Port: 9091, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-						"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+	cases := map[string]struct {
+		workload *pbcatalog.Workload
+	}{
+		"source/multiport-l7-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_HTTP},
+					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
+					"grpc-port":  {Port: 9091, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
+					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+				},
 			},
-			"source/multiport-l7-multiple-workload-addresses-without-ports": {
-				workload: &pbcatalog.Workload{
-					Addresses: []*pbcatalog.WorkloadAddress{
-						{
-							Host: "10.0.0.1",
-						},
-						{
-							Host: "10.0.0.2",
-						},
+		},
+		"source/multiport-l7-multiple-workload-addresses-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_HTTP},
-						"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-						"grpc-port":  {Port: 9091, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-						"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+					{
+						Host: "10.0.0.2",
 					},
 				},
+				Ports: map[string]*pbcatalog.WorkloadPort{
+					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
+					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
+					"grpc-port":  {Port: 9091, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
+					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+				},
 			},
-			"source/multiport-l7-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"},
-						},
+		},
+		"source/multiport-l7-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"},
 					},
-					Ports: map[string]*pbcatalog.WorkloadPort{
-						"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-						"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-						"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+					{
+						Host:  "10.0.0.3",
+						Ports: []string{"mesh"},
 					},
 				},
+				Ports: map[string]*pbcatalog.WorkloadPort{
+					"admin-port": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
+					"api-port":   {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
+					"mesh":       {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+				},
 			},
-			"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-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",
-						},
+		},
+		"source/multiport-l4-multiple-workload-addresses-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},
+					{
+						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"},
-						},
+		},
+		"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"},
 					},
-					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},
+					{
+						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},
+		},
+		"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(resourcetest.AppendTenancyInfoSubtest(t.Name(), name, tenancy), func(t *testing.T) {
-				proxyTmpl := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "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()
-				})
+	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()
 
-				actual := protoToJSON(t, proxyTmpl)
-				expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+"-"+tenancy.Partition+"-"+tenancy.Namespace+".golden"))
+			// 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()
+			})
 
-				// 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()
-				})
+			actual := protoToJSON(t, proxyTmpl)
+			expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+".golden"))
 
-				// convert back to json after sorting so that test output does not contain extraneous fields.
-				require.Equal(t, protoToJSON(t, expected), protoToJSON(t, proxyTmpl))
+			// 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()
 			})
-		}
-	}, t)
+
+			// 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
index 20e99d911566c..33dcab7155228 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/local_app_test.go
@@ -4,13 +4,14 @@
 package builder
 
 import (
+	"google.golang.org/protobuf/types/known/durationpb"
 	"sort"
 	"testing"
 	"time"
 
 	"github.com/stretchr/testify/require"
-	"google.golang.org/protobuf/types/known/durationpb"
 
+	"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"
@@ -22,228 +23,201 @@ import (
 )
 
 func TestBuildLocalApp(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		cases := map[string]struct {
-			workload     *pbcatalog.Workload
-			ctp          *pbauth.ComputedTrafficPermissions
-			defaultAllow bool
-		}{
-			"source/single-workload-address-without-ports": {
-				workload: &pbcatalog.Workload{
-					Addresses: []*pbcatalog.WorkloadAddress{
-						{
-							Host: "10.0.0.1",
-						},
-					},
-					Ports: map[string]*pbcatalog.WorkloadPort{
-						"tcp":   {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-						"http":  {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-						"http2": {Port: 8082, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-						"grpc":  {Port: 8083, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-						"mesh":  {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+	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/multiple-workload-addresses-without-ports": {
-				workload: &pbcatalog.Workload{
-					Addresses: []*pbcatalog.WorkloadAddress{
-						{
-							Host: "10.0.0.1",
-						},
-						{
-							Host: "10.0.0.2",
-						},
+		},
+		"source/l4-multiple-workload-addresses-without-ports": {
+			workload: &pbcatalog.Workload{
+				Addresses: []*pbcatalog.WorkloadAddress{
+					{
+						Host: "10.0.0.1",
 					},
-					Ports: map[string]*pbcatalog.WorkloadPort{
-						"tcp":   {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-						"http":  {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-						"http2": {Port: 8082, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-						"grpc":  {Port: 8083, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-						"mesh":  {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+					{
+						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/multiple-workload-addresses-with-specific-ports": {
-				workload: &pbcatalog.Workload{
-					Addresses: []*pbcatalog.WorkloadAddress{
-						{
-							Host:  "127.0.0.1",
-							Ports: []string{"tcp", "grpc", "mesh"},
-						},
-						{
-							Host:  "10.0.0.2",
-							Ports: []string{"http", "http2", "mesh"},
-						},
+		},
+		"source/l4-multiple-workload-addresses-with-specific-ports": {
+			workload: &pbcatalog.Workload{
+				Addresses: []*pbcatalog.WorkloadAddress{
+					{
+						Host:  "127.0.0.1",
+						Ports: []string{"port1"},
 					},
-					Ports: map[string]*pbcatalog.WorkloadPort{
-						"tcp":   {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-						"http":  {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-						"http2": {Port: 8082, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
-						"grpc":  {Port: 8083, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-						"mesh":  {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+					{
+						Host:  "10.0.0.2",
+						Ports: []string{"port2"},
 					},
 				},
-				ctp: &pbauth.ComputedTrafficPermissions{
-					AllowPermissions: []*pbauth.Permission{
-						{
-							Sources: []*pbauth.Source{
-								{
-									IdentityName: "foo",
-									Namespace:    "default",
-									Partition:    "default",
-								},
+				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(resourcetest.AppendTenancyInfoSubtest(t.Name(), name, tenancy), func(t *testing.T) {
-				proxyTmpl := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", true, 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+"-"+tenancy.Partition+"-"+tenancy.Namespace+".golden"))
+			defaultAllow: true,
+		},
+	}
 
-				// 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()
-				})
+	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")
 
-				// convert back to json after sorting so that test output does not contain extraneous fields.
-				require.Equal(t, protoToJSON(t, expected), protoToJSON(t, proxyTmpl))
-			})
-		}
-	}, t)
+			require.JSONEq(t, expected, actual)
+		})
+	}
 }
 
 func TestBuildLocalApp_WithProxyConfiguration(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		cases := map[string]struct {
-			workload *pbcatalog.Workload
-			proxyCfg *pbmesh.ComputedProxyConfiguration
-		}{
-			"source/l7-expose-paths": {
-				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},
+	cases := map[string]struct {
+		workload *pbcatalog.Workload
+		proxyCfg *pbmesh.ComputedProxyConfiguration
+	}{
+		"source/l7-expose-paths": {
+			workload: &pbcatalog.Workload{
+				Addresses: []*pbcatalog.WorkloadAddress{
+					{
+						Host: "10.0.0.1",
 					},
 				},
-				proxyCfg: &pbmesh.ComputedProxyConfiguration{
-					DynamicConfig: &pbmesh.DynamicConfig{
-						ExposeConfig: &pbmesh.ExposeConfig{
-							ExposePaths: []*pbmesh.ExposePath{
-								{
-									ListenerPort:  1234,
-									Path:          "/health",
-									LocalPathPort: 9090,
-									Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP,
-								},
-								{
-									ListenerPort:  1235,
-									Path:          "GetHealth",
-									LocalPathPort: 9091,
-									Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP2,
-								},
+				Ports: map[string]*pbcatalog.WorkloadPort{
+					"port1": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
+					"port2": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+				},
+			},
+			proxyCfg: &pbmesh.ComputedProxyConfiguration{
+				DynamicConfig: &pbmesh.DynamicConfig{
+					ExposeConfig: &pbmesh.ExposeConfig{
+						ExposePaths: []*pbmesh.ExposePath{
+							{
+								ListenerPort:  1234,
+								Path:          "/health",
+								LocalPathPort: 9090,
+								Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP,
+							},
+							{
+								ListenerPort:  1235,
+								Path:          "GetHealth",
+								LocalPathPort: 9091,
+								Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP2,
 							},
 						},
 					},
 				},
 			},
-			// source/local-and-inbound-connections shows that configuring LocalCOnnection
-			// and InboundConnections in DynamicConfig will set fields on standard clusters and routes,
-			// but will not set fields on exposed path clusters and routes.
-			"source/local-and-inbound-connections": {
-				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},
-						"port3": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
+		},
+		// source/local-and-inbound-connections shows that configuring LocalCOnnection
+		// and InboundConnections in DynamicConfig will set fields on standard clusters and routes,
+		// but will not set fields on exposed path clusters and routes.
+		"source/local-and-inbound-connections": {
+			workload: &pbcatalog.Workload{
+				Addresses: []*pbcatalog.WorkloadAddress{
+					{
+						Host: "10.0.0.1",
 					},
 				},
-				proxyCfg: &pbmesh.ComputedProxyConfiguration{
-					DynamicConfig: &pbmesh.DynamicConfig{
-						LocalConnection: map[string]*pbmesh.ConnectionConfig{
-							"port1": {
-								ConnectTimeout: durationpb.New(6 * time.Second),
-								RequestTimeout: durationpb.New(7 * time.Second)},
-							"port3": {
-								ConnectTimeout: durationpb.New(8 * time.Second),
-								RequestTimeout: durationpb.New(9 * time.Second)},
-						},
-						InboundConnections: &pbmesh.InboundConnectionsConfig{
-							MaxInboundConnections:     123,
-							BalanceInboundConnections: pbmesh.BalanceConnections(pbproxystate.BalanceConnections_BALANCE_CONNECTIONS_EXACT),
-						},
-						ExposeConfig: &pbmesh.ExposeConfig{
-							ExposePaths: []*pbmesh.ExposePath{
-								{
-									ListenerPort:  1234,
-									Path:          "/health",
-									LocalPathPort: 9090,
-									Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP,
-								},
-								{
-									ListenerPort:  1235,
-									Path:          "GetHealth",
-									LocalPathPort: 9091,
-									Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP2,
-								},
+				Ports: map[string]*pbcatalog.WorkloadPort{
+					"port1": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
+					"port2": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+					"port3": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
+				},
+			},
+			proxyCfg: &pbmesh.ComputedProxyConfiguration{
+				DynamicConfig: &pbmesh.DynamicConfig{
+					LocalConnection: map[string]*pbmesh.ConnectionConfig{
+						"port1": {
+							ConnectTimeout: durationpb.New(6 * time.Second),
+							RequestTimeout: durationpb.New(7 * time.Second)},
+						"port3": {
+							ConnectTimeout: durationpb.New(8 * time.Second),
+							RequestTimeout: durationpb.New(9 * time.Second)},
+					},
+					InboundConnections: &pbmesh.InboundConnectionsConfig{
+						MaxInboundConnections:     123,
+						BalanceInboundConnections: pbmesh.BalanceConnections(pbproxystate.BalanceConnections_BALANCE_CONNECTIONS_EXACT),
+					},
+					ExposeConfig: &pbmesh.ExposeConfig{
+						ExposePaths: []*pbmesh.ExposePath{
+							{
+								ListenerPort:  1234,
+								Path:          "/health",
+								LocalPathPort: 9090,
+								Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP,
+							},
+							{
+								ListenerPort:  1235,
+								Path:          "GetHealth",
+								LocalPathPort: 9091,
+								Protocol:      pbmesh.ExposePathProtocol_EXPOSE_PATH_PROTOCOL_HTTP2,
 							},
 						},
 					},
 				},
 			},
-		}
-
-		for name, c := range cases {
-			t.Run(resourcetest.AppendTenancyInfoSubtest(t.Name(), name, tenancy), func(t *testing.T) {
-				proxyTmpl := New(testProxyStateTemplateID(tenancy), testIdentityRef(tenancy), "foo.consul", "dc1", true, c.proxyCfg).
-					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()
-				})
+	for name, c := range cases {
+		t.Run(name, func(t *testing.T) {
+			proxyTmpl := New(testProxyStateTemplateID(), testIdentityRef(), "foo.consul", "dc1", true, c.proxyCfg).
+				BuildLocalApp(c.workload, nil).
+				Build()
 
-				actual := protoToJSON(t, proxyTmpl)
-				expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+"-"+tenancy.Partition+"-"+tenancy.Namespace+".golden"))
+			// 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()
+			})
 
-				// 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()
-				})
+			actual := protoToJSON(t, proxyTmpl)
+			expected := JSONToProxyTemplate(t, golden.GetBytes(t, actual, name+".golden"))
 
-				// convert back to json after sorting so that test output does not contain extraneous fields.
-				require.Equal(t, protoToJSON(t, expected), protoToJSON(t, proxyTmpl))
+			// 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()
 			})
-		}
-	}, t)
+
+			// convert back to json after sorting so that test output does not contain extraneous fields.
+			require.Equal(t, protoToJSON(t, expected), protoToJSON(t, proxyTmpl))
+		})
+	}
 }
 
 func TestBuildL4TrafficPermissions(t *testing.T) {
@@ -566,16 +540,20 @@ func TestBuildL4TrafficPermissions(t *testing.T) {
 	}
 }
 
-func testProxyStateTemplateID(tenancy *pbresource.Tenancy) *pbresource.ID {
+func testProxyStateTemplateID() *pbresource.ID {
 	return resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").
-		WithTenancy(tenancy).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
 		ID()
 }
 
-func testIdentityRef(tenancy *pbresource.Tenancy) *pbresource.Reference {
+func testIdentityRef() *pbresource.Reference {
 	return &pbresource.Reference{
-		Name:    "test-identity",
-		Tenancy: tenancy,
-		Type:    pbauth.WorkloadIdentityType,
+		Name: "test-identity",
+		Tenancy: &pbresource.Tenancy{
+			Namespace: "default",
+			Partition: "default",
+			PeerName:  "local",
+		},
+		Type: pbauth.WorkloadIdentityType,
 	}
 }
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-bar.golden
deleted file mode 100644
index 63166314d217b..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-bar.golden
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-1.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.bar.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.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden
deleted file mode 100644
index 098beac1af9bb..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-default-default.golden
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/default/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-implicit-and-explicit-destinations-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-bar.golden
deleted file mode 100644
index 42829063e0862..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-bar.golden
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.bar.foo.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.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-default.golden
deleted file mode 100644
index 45a3e5cb9ce45..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-implicit-and-explicit-destinations-tproxy-foo-default.golden
+++ /dev/null
@@ -1,194 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/default/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.default.foo.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.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-bar.golden
deleted file mode 100644
index 1e2570b51c7b2..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-bar.golden
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-1.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.bar.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "default/local/bar/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 2345
-        },
-        "name": "default/local/bar/api-1:tcp2:1.1.1.1:2345",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp2.api-1.bar.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp2.api-2.bar.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp2.api-1.bar.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "default/local/bar/api-2:tcp2:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-2.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-2.bar.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-default.golden
deleted file mode 100644
index 1f925e4b5a2b7..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-default-default.golden
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/default/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": "default/local/default/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": "default/local/default/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": "default/local/default/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-multi-destination-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-bar.golden
deleted file mode 100644
index 362d0d150f8af..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-bar.golden
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.bar.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/bar/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 2345
-        },
-        "name": "foo/local/bar/api-1:tcp2:1.1.1.1:2345",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp2.api-1.bar.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp2.api-2.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp2.api-1.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/bar/api-2:tcp2:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-2.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-2.bar.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-default.golden
deleted file mode 100644
index 08abcc6b4d45a..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multi-destination-foo-default.golden
+++ /dev/null
@@ -1,320 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/default/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.default.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/default/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 2345
-        },
-        "name": "foo/local/default/api-1:tcp2:1.1.1.1:2345",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp2.api-1.default.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp2.api-2.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp2.api-1.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/default/api-2:tcp2:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-2.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-2.default.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-bar.golden
deleted file mode 100644
index 2229cda1a8dc2..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-bar.golden
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden
deleted file mode 100644
index e00c9d08e0105..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-default-default.golden
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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-multiple-implicit-destinations-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-bar.golden
deleted file mode 100644
index 36e2a40ace404..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-bar.golden
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-default.golden
deleted file mode 100644
index a00eb8d334c57..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-multiple-implicit-destinations-tproxy-foo-default.golden
+++ /dev/null
@@ -1,193 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-bar.golden
deleted file mode 100644
index f3ab005e066dc..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-bar.golden
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.bar.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden
deleted file mode 100644
index ae2d99c942619..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-default-default.golden
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/default/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-ip-port-bind-address-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-bar.golden
deleted file mode 100644
index 69b47e5e3a8e9..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-bar.golden
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.bar.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-default.golden
deleted file mode 100644
index 35788a96d9b7e..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-ip-port-bind-address-foo-default.golden
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/default/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.default.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-bar.golden
deleted file mode 100644
index a39efdd4b58c4..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-bar.golden
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "tcp.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "default/local/bar/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden
deleted file mode 100644
index 2af48e9f29e31..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-default-default.golden
+++ /dev/null
@@ -1,97 +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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "default/local/default/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-destination-unix-socket-bind-address-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-bar.golden
deleted file mode 100644
index d56ced93a8b9b..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-bar.golden
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/bar/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-default.golden
deleted file mode 100644
index b0768db9b0496..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-destination-unix-socket-bind-address-foo-default.golden
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/default/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-bar.golden
deleted file mode 100644
index c3017193ca8de..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-bar.golden
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden
deleted file mode 100644
index 50e871481174c..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-default-default.golden
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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/l4-single-implicit-destination-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-bar.golden
deleted file mode 100644
index 75d3698d91b75..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-bar.golden
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-default.golden
deleted file mode 100644
index df5c92a34668e..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/l4-single-implicit-destination-tproxy-foo-default.golden
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-1.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ]
-  },
-  "requiredEndpoints": {
-    "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-bar.golden
deleted file mode 100644
index f4c131189c919..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-bar.golden
+++ /dev/null
@@ -1,415 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "http.api-1.bar.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.bar.dc1.internal.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~0~http.api-1.bar.dc1.internal.foo.consul"
-            },
-            {
-              "dynamic": {
-                "config": {
-                  "connectTimeout": "5s",
-                  "disablePanicThreshold": true
-                },
-                "outboundTls": {
-                  "alpnProtocols": [
-                    "consul~http"
-                  ],
-                  "outboundMesh": {
-                    "identityKey": "test-identity",
-                    "sni": "backup-1.bar.dc1.internal.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/default/ns/bar/identity/backup1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~1~http.api-1.bar.dc1.internal.foo.consul"
-            }
-          ]
-        },
-        "name": "http.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "http.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "http.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.bar.default.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.bar.dc1.internal.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.bar.dc1.internal.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "default/local/bar/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.default.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/bar/api-1:http:1.1.1.1:1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "default/local/bar/api-1:http:1.1.1.1:1234"
-              },
-              "statPrefix": "upstream.http.api-1.bar.default.dc1"
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "default/local/bar/api-1:http:1.1.1.1:1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/bar/api-1:http:1.1.1.1:1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "77s"
-                    }
-                  },
-                  "weightedClusters": {
-                    "clusters": [
-                      {
-                        "name": "http.api-2.bar.dc1.internal.foo.consul",
-                        "weight": 60
-                      },
-                      {
-                        "name": "http.api-1.bar.dc1.internal.foo.consul",
-                        "weight": 40
-                      },
-                      {
-                        "name": "null_route_cluster",
-                        "weight": 10
-                      }
-                    ]
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/split"
-                  }
-                }
-              },
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-1.bar.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~1~http.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "backup-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-1.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-default.golden
deleted file mode 100644
index cbd28e7a70a44..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-default-default.golden
+++ /dev/null
@@ -1,415 +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"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~0~http.api-1.default.dc1.internal.foo.consul"
-            },
-            {
-              "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~1~http.api-1.default.dc1.internal.foo.consul"
-            }
-          ]
-        },
-        "name": "http.api-1.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "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",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "default/local/default/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": "default/local/default/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": "default/local/default/api-1:http:1.1.1.1:1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "default/local/default/api-1:http:1.1.1.1:1234"
-              },
-              "statPrefix": "upstream.http.api-1.default.default.dc1"
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "default/local/default/api-1:http:1.1.1.1:1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/default/api-1:http:1.1.1.1:1234",
-            "routeRules": [
-              {
-                "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~1~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/mixed-multi-destination-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-bar.golden
deleted file mode 100644
index 8e69b843d76f5..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-bar.golden
+++ /dev/null
@@ -1,415 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-1.bar.foo.dc1.internal-v1.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.bar.foo.dc1.internal-v1.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~0~http.api-1.bar.foo.dc1.internal-v1.foo.consul"
-            },
-            {
-              "dynamic": {
-                "config": {
-                  "connectTimeout": "5s",
-                  "disablePanicThreshold": true
-                },
-                "outboundTls": {
-                  "alpnProtocols": [
-                    "consul~http"
-                  ],
-                  "outboundMesh": {
-                    "identityKey": "test-identity",
-                    "sni": "backup-1.bar.foo.dc1.internal-v1.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/foo/ns/bar/identity/backup1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~1~http.api-1.bar.foo.dc1.internal-v1.foo.consul"
-            }
-          ]
-        },
-        "name": "http.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "http.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/bar/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.bar.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/bar/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.bar.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/bar/api-1:http:1.1.1.1:1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/bar/api-1:http:1.1.1.1:1234"
-              },
-              "statPrefix": "upstream.http.api-1.bar.foo.dc1"
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/bar/api-1:http:1.1.1.1:1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/bar/api-1:http:1.1.1.1:1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "77s"
-                    }
-                  },
-                  "weightedClusters": {
-                    "clusters": [
-                      {
-                        "name": "http.api-2.bar.foo.dc1.internal-v1.foo.consul",
-                        "weight": 60
-                      },
-                      {
-                        "name": "http.api-1.bar.foo.dc1.internal-v1.foo.consul",
-                        "weight": 40
-                      },
-                      {
-                        "name": "null_route_cluster",
-                        "weight": 10
-                      }
-                    ]
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/split"
-                  }
-                }
-              },
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-1.bar.foo.dc1.internal-v1.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~1~http.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "backup-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-1.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-default.golden
deleted file mode 100644
index 8dd309c84d145..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/mixed-multi-destination-foo-default.golden
+++ /dev/null
@@ -1,415 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-1.default.foo.dc1.internal-v1.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.foo.dc1.internal-v1.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~0~http.api-1.default.foo.dc1.internal-v1.foo.consul"
-            },
-            {
-              "dynamic": {
-                "config": {
-                  "connectTimeout": "5s",
-                  "disablePanicThreshold": true
-                },
-                "outboundTls": {
-                  "alpnProtocols": [
-                    "consul~http"
-                  ],
-                  "outboundMesh": {
-                    "identityKey": "test-identity",
-                    "sni": "backup-1.default.foo.dc1.internal-v1.foo.consul",
-                    "validationContext": {
-                      "spiffeIds": [
-                        "spiffe://foo.consul/ap/foo/ns/default/identity/backup1-identity"
-                      ],
-                      "trustBundlePeerNameKey": "local"
-                    }
-                  }
-                }
-              },
-              "name": "failover-target~1~http.api-1.default.foo.dc1.internal-v1.foo.consul"
-            }
-          ]
-        },
-        "name": "http.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "http.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "null_route_cluster": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "connectTimeout": "10s"
-            }
-          }
-        },
-        "name": "null_route_cluster",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-1.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api1-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/default/api-1:tcp:1.1.1.1:1234",
-        "routers": [
-          {
-            "l4": {
-              "statPrefix": "upstream.tcp.api-1.default.foo.dc1",
-              "weightedClusters": {
-                "clusters": [
-                  {
-                    "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 60
-                  },
-                  {
-                    "name": "tcp.api-1.default.foo.dc1.internal-v1.foo.consul",
-                    "weight": 40
-                  },
-                  {
-                    "name": "null_route_cluster",
-                    "weight": 10
-                  }
-                ]
-              }
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "name": "foo/local/default/api-2:tcp:/path/to/socket",
-        "routers": [
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-2.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-2.default.foo.dc1"
-            }
-          }
-        ],
-        "unixSocket": {
-          "mode": "0666",
-          "path": "/path/to/socket"
-        }
-      },
-      {
-        "direction": "DIRECTION_OUTBOUND",
-        "hostPort": {
-          "host": "1.1.1.1",
-          "port": 1234
-        },
-        "name": "foo/local/default/api-1:http:1.1.1.1:1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/default/api-1:http:1.1.1.1:1234"
-              },
-              "statPrefix": "upstream.http.api-1.default.foo.dc1"
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/default/api-1:http:1.1.1.1:1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/default/api-1:http:1.1.1.1:1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "77s"
-                    }
-                  },
-                  "weightedClusters": {
-                    "clusters": [
-                      {
-                        "name": "http.api-2.default.foo.dc1.internal-v1.foo.consul",
-                        "weight": 60
-                      },
-                      {
-                        "name": "http.api-1.default.foo.dc1.internal-v1.foo.consul",
-                        "weight": 40
-                      },
-                      {
-                        "name": "null_route_cluster",
-                        "weight": 10
-                      }
-                    ]
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/split"
-                  }
-                }
-              },
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-1.default.foo.dc1.internal-v1.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~1~http.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "backup-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-1.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-1",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "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
index cbd28e7a70a44..ca69db7dfcb0d 100644
--- 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
@@ -234,7 +234,7 @@
               "route": {
                 "name": "default/local/default/api-1:http:1.1.1.1:1234"
               },
-              "statPrefix": "upstream.http.api-1.default.default.dc1"
+              "statPrefix": "upstream."
             }
           }
         ]
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden
deleted file mode 100644
index 332d7a1485aaf..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-bar.golden
+++ /dev/null
@@ -1,495 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "http.api-app2.bar.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app2.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app2.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app2.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-app2.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app2.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "default/local/bar/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "default/local/bar/api-app2:http"
-              },
-              "statPrefix": "upstream.http.api-app2.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app2.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app2.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "default/local/bar/api-app2:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/bar/api-app2:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app2.bar.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "default/local/bar/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/bar/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.bar.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-app2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app2.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-and-l7-multiple-implicit-destinations-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden
deleted file mode 100644
index 94e8e1c21577d..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-default-default.golden
+++ /dev/null
@@ -1,495 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "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",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "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",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": {
-              "route": {
-                "name": "default/local/default/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.default.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "default/local/default/api-app2:http"
-              },
-              "statPrefix": "upstream.http.api-app2.default.default.dc1"
-            },
-            "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": {
-      "default/local/default/api-app2:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/default/api-app2:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app2.default.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "default/local/default/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/default/api-app:http",
-            "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"
-    },
-    "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-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden
deleted file mode 100644
index 9cd2ab07228a2..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-bar.golden
+++ /dev/null
@@ -1,495 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "http.api-app2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app2.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app2.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app2.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-app2.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app2.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/bar/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/bar/api-app2:http"
-              },
-              "statPrefix": "upstream.http.api-app2.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app2.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app2.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/bar/api-app2:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/bar/api-app2:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app2.bar.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "foo/local/bar/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/bar/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.bar.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-app2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app2.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden
deleted file mode 100644
index 6345d04a701b1..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy-foo-default.golden
+++ /dev/null
@@ -1,495 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "http.api-app2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app2.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app2.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app2.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app2-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app2.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp.api-app2.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app2.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/default/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/default/api-app2:http"
-              },
-              "statPrefix": "upstream.http.api-app2.default.foo.dc1"
-            },
-            "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.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app2.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app2.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "2.2.2.2",
-                  "prefixLen": 32
-                },
-                {
-                  "addressPrefix": "3.3.3.3",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/default/api-app2:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/default/api-app2:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app2.default.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "foo/local/default/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/default/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.default.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "http.api-app2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app2.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app2",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
index 94e8e1c21577d..3192629710d92 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -1,8 +1,8 @@
 {
   "proxyState": {
     "clusters": {
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.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": {
@@ -11,7 +11,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp2"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -26,11 +26,11 @@
             }
           }
         },
-        "name": "http.api-app.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
+        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_TCP"
       },
-      "http.api-app2.default.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app2.default.dc1.internal.foo.consul",
+      "tcp2.api-app2.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp2.api-app2.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -39,7 +39,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp2"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -54,22 +54,11 @@
             }
           }
         },
-        "name": "http.api-app2.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
+        "name": "tcp2.api-app2.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.default.dc1.internal.foo.consul",
+      "http.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -78,7 +67,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~http"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -93,11 +82,11 @@
             }
           }
         },
-        "name": "tcp.api-app.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
+        "name": "http.api-app.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_HTTP"
       },
-      "tcp.api-app2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app2.default.dc1.internal.foo.consul",
+      "http.api-app2.default.dc1.internal.foo.consul": {
+        "altStatName": "http.api-app2.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -106,7 +95,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~http"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -121,11 +110,22 @@
             }
           }
         },
-        "name": "tcp.api-app2.default.dc1.internal.foo.consul",
+        "name": "http.api-app2.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_HTTP"
+      },
+      "original-destination": {
+        "endpointGroup": {
+          "passthrough": {
+            "config": {
+              "connectTimeout": "5s"
+            }
+          }
+        },
+        "name": "original-destination",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp2.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.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": {
@@ -134,7 +134,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp2"
+                "consul~tcp"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -149,11 +149,11 @@
             }
           }
         },
-        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
+        "name": "tcp.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp2.api-app2.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app2.default.dc1.internal.foo.consul",
+      "tcp.api-app2.default.dc1.internal.foo.consul": {
+        "altStatName": "tcp.api-app2.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -162,7 +162,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp2"
+                "consul~tcp"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -177,7 +177,7 @@
             }
           }
         },
-        "name": "tcp2.api-app2.default.dc1.internal.foo.consul",
+        "name": "tcp.api-app2.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       }
     },
@@ -257,7 +257,7 @@
               "route": {
                 "name": "default/local/default/api-app:http"
               },
-              "statPrefix": "upstream.http.api-app.default.default.dc1"
+              "statPrefix": "upstream."
             },
             "match": {
               "destinationPort": 8080,
@@ -274,7 +274,7 @@
               "route": {
                 "name": "default/local/default/api-app2:http"
               },
-              "statPrefix": "upstream.http.api-app2.default.default.dc1"
+              "statPrefix": "upstream."
             },
             "match": {
               "destinationPort": 8080,
@@ -383,7 +383,7 @@
     }
   },
   "requiredEndpoints": {
-    "http.api-app.default.dc1.internal.foo.consul": {
+    "tcp2.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -399,7 +399,7 @@
       },
       "port": "mesh"
     },
-    "http.api-app2.default.dc1.internal.foo.consul": {
+    "tcp2.api-app2.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app2",
         "tenancy": {
@@ -415,7 +415,7 @@
       },
       "port": "mesh"
     },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
+    "http.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -431,7 +431,7 @@
       },
       "port": "mesh"
     },
-    "tcp.api-app2.default.dc1.internal.foo.consul": {
+    "http.api-app2.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app2",
         "tenancy": {
@@ -447,7 +447,7 @@
       },
       "port": "mesh"
     },
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
+    "tcp.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -463,7 +463,7 @@
       },
       "port": "mesh"
     },
-    "tcp2.api-app2.default.dc1.internal.foo.consul": {
+    "tcp.api-app2.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app2",
         "tenancy": {
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden
deleted file mode 100644
index 137a378492c02..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-bar.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "default/local/bar/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "default/local/bar/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/bar/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.bar.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-and-l7-single-implicit-destination-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden
deleted file mode 100644
index 479a4e7aefd2f..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-default-default.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "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",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": {
-              "route": {
-                "name": "default/local/default/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.default.default.dc1"
-            },
-            "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": {
-      "default/local/default/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/default/api-app:http",
-            "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-and-l7-single-implicit-destination-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden
deleted file mode 100644
index c0e83c41893ba..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-bar.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/bar/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/bar/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/bar/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.bar.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden
deleted file mode 100644
index c6d0c28a34458..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy-foo-default.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/default/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/default/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/default/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.default.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
index 479a4e7aefd2f..2ab840e3da9bd 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -1,8 +1,8 @@
 {
   "proxyState": {
     "clusters": {
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.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": {
@@ -11,7 +11,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp2"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -26,22 +26,11 @@
             }
           }
         },
-        "name": "http.api-app.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
+        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.default.dc1.internal.foo.consul",
+      "http.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -50,7 +39,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~http"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -65,11 +54,22 @@
             }
           }
         },
-        "name": "tcp.api-app.default.dc1.internal.foo.consul",
+        "name": "http.api-app.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_HTTP"
+      },
+      "original-destination": {
+        "endpointGroup": {
+          "passthrough": {
+            "config": {
+              "connectTimeout": "5s"
+            }
+          }
+        },
+        "name": "original-destination",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp2.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.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": {
@@ -78,7 +78,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp2"
+                "consul~tcp"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -93,7 +93,7 @@
             }
           }
         },
-        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
+        "name": "tcp.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       }
     },
@@ -152,7 +152,7 @@
               "route": {
                 "name": "default/local/default/api-app:http"
               },
-              "statPrefix": "upstream.http.api-app.default.default.dc1"
+              "statPrefix": "upstream."
             },
             "match": {
               "destinationPort": 8080,
@@ -212,7 +212,7 @@
     }
   },
   "requiredEndpoints": {
-    "http.api-app.default.dc1.internal.foo.consul": {
+    "tcp2.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -228,7 +228,7 @@
       },
       "port": "mesh"
     },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
+    "http.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -244,7 +244,7 @@
       },
       "port": "mesh"
     },
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
+    "tcp.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden
deleted file mode 100644
index 137a378492c02..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-bar.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "http.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.bar.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.api-app.bar.dc1.internal.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.dc1.internal.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/default/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.bar.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "default/local/bar/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.bar.dc1.internal.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.bar.default.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "default/local/bar/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/bar/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.bar.dc1.internal.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.bar.dc1.internal.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "default",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "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-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden
deleted file mode 100644
index 479a4e7aefd2f..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-default-default.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "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",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "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",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": {
-              "route": {
-                "name": "default/local/default/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.default.default.dc1"
-            },
-            "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": {
-      "default/local/default/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "default/local/default/api-app:http",
-            "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-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden
deleted file mode 100644
index c0e83c41893ba..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-bar.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.bar.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/bar/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/bar/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.bar.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/bar/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/bar/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.bar.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.bar.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "bar",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden
deleted file mode 100644
index c6d0c28a34458..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy-foo-default.golden
+++ /dev/null
@@ -1,276 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "http.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "http.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~http"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "http.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul": {
-        "altStatName": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "endpointGroup": {
-          "dynamic": {
-            "config": {
-              "connectTimeout": "5s",
-              "disablePanicThreshold": true
-            },
-            "outboundTls": {
-              "alpnProtocols": [
-                "consul~tcp2"
-              ],
-              "outboundMesh": {
-                "identityKey": "test-identity",
-                "sni": "api-app.default.foo.dc1.internal-v1.foo.consul",
-                "validationContext": {
-                  "spiffeIds": [
-                    "spiffe://foo.consul/ap/foo/ns/default/identity/api-app-identity"
-                  ],
-                  "trustBundlePeerNameKey": "local"
-                }
-              }
-            }
-          }
-        },
-        "name": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 7070,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l7": {
-              "route": {
-                "name": "foo/local/default/api-app:http"
-              },
-              "statPrefix": "upstream.http.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8080,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          },
-          {
-            "l4": {
-              "cluster": {
-                "name": "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul"
-              },
-              "statPrefix": "upstream.tcp2.api-app.default.foo.dc1"
-            },
-            "match": {
-              "destinationPort": 8081,
-              "prefixRanges": [
-                {
-                  "addressPrefix": "1.1.1.1",
-                  "prefixLen": 32
-                }
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "foo/local/default/api-app:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "foo/local/default/api-app:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "http.api-app.default.foo.dc1.internal-v1.foo.consul"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredEndpoints": {
-    "http.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    },
-    "tcp2.api-app.default.foo.dc1.internal-v1.foo.consul": {
-      "id": {
-        "name": "api-app",
-        "tenancy": {
-          "namespace": "default",
-          "partition": "foo",
-          "peerName": "local"
-        },
-        "type": {
-          "group": "catalog",
-          "groupVersion": "v2beta1",
-          "kind": "ServiceEndpoints"
-        }
-      },
-      "port": "mesh"
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
index 479a4e7aefd2f..2ab840e3da9bd 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -1,8 +1,8 @@
 {
   "proxyState": {
     "clusters": {
-      "http.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "http.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": {
@@ -11,7 +11,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~http"
+                "consul~tcp2"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -26,22 +26,11 @@
             }
           }
         },
-        "name": "http.api-app.default.dc1.internal.foo.consul",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "original-destination": {
-        "endpointGroup": {
-          "passthrough": {
-            "config": {
-              "connectTimeout": "5s"
-            }
-          }
-        },
-        "name": "original-destination",
+        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp.api-app.default.dc1.internal.foo.consul",
+      "http.api-app.default.dc1.internal.foo.consul": {
+        "altStatName": "http.api-app.default.dc1.internal.foo.consul",
         "endpointGroup": {
           "dynamic": {
             "config": {
@@ -50,7 +39,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp"
+                "consul~http"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -65,11 +54,22 @@
             }
           }
         },
-        "name": "tcp.api-app.default.dc1.internal.foo.consul",
+        "name": "http.api-app.default.dc1.internal.foo.consul",
+        "protocol": "PROTOCOL_HTTP"
+      },
+      "original-destination": {
+        "endpointGroup": {
+          "passthrough": {
+            "config": {
+              "connectTimeout": "5s"
+            }
+          }
+        },
+        "name": "original-destination",
         "protocol": "PROTOCOL_TCP"
       },
-      "tcp2.api-app.default.dc1.internal.foo.consul": {
-        "altStatName": "tcp2.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": {
@@ -78,7 +78,7 @@
             },
             "outboundTls": {
               "alpnProtocols": [
-                "consul~tcp2"
+                "consul~tcp"
               ],
               "outboundMesh": {
                 "identityKey": "test-identity",
@@ -93,7 +93,7 @@
             }
           }
         },
-        "name": "tcp2.api-app.default.dc1.internal.foo.consul",
+        "name": "tcp.api-app.default.dc1.internal.foo.consul",
         "protocol": "PROTOCOL_TCP"
       }
     },
@@ -152,7 +152,7 @@
               "route": {
                 "name": "default/local/default/api-app:http"
               },
-              "statPrefix": "upstream.http.api-app.default.default.dc1"
+              "statPrefix": "upstream."
             },
             "match": {
               "destinationPort": 8080,
@@ -212,7 +212,7 @@
     }
   },
   "requiredEndpoints": {
-    "http.api-app.default.dc1.internal.foo.consul": {
+    "tcp2.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -228,7 +228,7 @@
       },
       "port": "mesh"
     },
-    "tcp.api-app.default.dc1.internal.foo.consul": {
+    "http.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
@@ -244,7 +244,7 @@
       },
       "port": "mesh"
     },
-    "tcp2.api-app.default.dc1.internal.foo.consul": {
+    "tcp.api-app.default.dc1.internal.foo.consul": {
       "id": {
         "name": "api-app",
         "tenancy": {
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden
similarity index 57%
rename from internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden
rename to internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden
index 93a69b2bb033a..95ee222f3d26d 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-default.golden
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden
@@ -1,23 +1,16 @@
 {
   "proxyState": {
     "clusters": {
-      "local_app:admin-port": {
+      "local_app:port1": {
         "endpointGroup": {
           "static": {}
         },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
+        "name": "local_app:port1",
         "protocol": "PROTOCOL_TCP"
       }
     },
     "endpoints": {
-      "local_app:admin-port": {
+      "local_app:port1": {
         "endpoints": [
           {
             "hostPort": {
@@ -26,16 +19,6 @@
             }
           }
         ]
-      },
-      "local_app:api-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
       }
     },
     "identity": {
@@ -58,7 +41,7 @@
         ],
         "direction": "DIRECTION_INBOUND",
         "hostPort": {
-          "host": "10.0.0.3",
+          "host": "10.0.0.2",
           "port": 20000
         },
         "name": "public_listener",
@@ -76,38 +59,26 @@
             },
             "l4": {
               "cluster": {
-                "name": "local_app:admin-port"
+                "name": "local_app:port1"
               },
               "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
+              "trafficPermissions": {
+                "allowPermissions": [
+                  {
+                    "principals": [
+                      {
+                        "spiffe": {
+                          "regex": "^spiffe://foo.consul/ap/default/ns/default/identity/foo$"
+                        }
+                      }
+                    ]
+                  }
+                ]
               }
             },
-            "l4": {
-              "cluster": {
-                "name": "local_app:api-port"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
             "match": {
               "alpnProtocols": [
-                "consul~api-port"
+                "consul~port1"
               ]
             }
           }
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-without-ports.golden
similarity index 59%
rename from internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-default.golden
rename to internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-without-ports.golden
index 3831349ccdbd5..0cb52d9921557 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-default.golden
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-multiple-workload-addresses-without-ports.golden
@@ -1,23 +1,16 @@
 {
   "proxyState": {
     "clusters": {
-      "local_app:admin-port": {
+      "local_app:port1": {
         "endpointGroup": {
           "static": {}
         },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
+        "name": "local_app:port1",
         "protocol": "PROTOCOL_TCP"
       }
     },
     "endpoints": {
-      "local_app:admin-port": {
+      "local_app:port1": {
         "endpoints": [
           {
             "hostPort": {
@@ -26,16 +19,6 @@
             }
           }
         ]
-      },
-      "local_app:api-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
       }
     },
     "identity": {
@@ -76,38 +59,14 @@
             },
             "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"
+                "name": "local_app:port1"
               },
               "statPrefix": "public_listener",
               "trafficPermissions": {}
             },
             "match": {
               "alpnProtocols": [
-                "consul~api-port"
+                "consul~port1"
               ]
             }
           }
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-single-workload-address-without-ports.golden
similarity index 59%
rename from internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden
rename to internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-single-workload-address-without-ports.golden
index 3831349ccdbd5..0cb52d9921557 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-default.golden
+++ b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l4-single-workload-address-without-ports.golden
@@ -1,23 +1,16 @@
 {
   "proxyState": {
     "clusters": {
-      "local_app:admin-port": {
+      "local_app:port1": {
         "endpointGroup": {
           "static": {}
         },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
+        "name": "local_app:port1",
         "protocol": "PROTOCOL_TCP"
       }
     },
     "endpoints": {
-      "local_app:admin-port": {
+      "local_app:port1": {
         "endpoints": [
           {
             "hostPort": {
@@ -26,16 +19,6 @@
             }
           }
         ]
-      },
-      "local_app:api-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
       }
     },
     "identity": {
@@ -76,38 +59,14 @@
             },
             "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"
+                "name": "local_app:port1"
               },
               "statPrefix": "public_listener",
               "trafficPermissions": {}
             },
             "match": {
               "alpnProtocols": [
-                "consul~api-port"
+                "consul~port1"
               ]
             }
           }
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-bar.golden
deleted file mode 100644
index 69a9d49fd30f6..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-bar.golden
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-default.golden
deleted file mode 100644
index 2af5ce9c06d43..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-default-default.golden
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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/l7-expose-paths-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-bar.golden
deleted file mode 100644
index 4236759182389..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-bar.golden
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-default.golden
deleted file mode 100644
index 769e098e2cf3f..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/l7-expose-paths-foo-default.golden
+++ /dev/null
@@ -1,212 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-bar.golden
deleted file mode 100644
index cd42af38430d7..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-bar.golden
+++ /dev/null
@@ -1,304 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "6s"
-            }
-          }
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:port3": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "8s"
-            }
-          }
-        },
-        "name": "local_app:port3",
-        "protocol": "PROTOCOL_HTTP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      },
-      "local_app:port3": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "balanceConnections": "BALANCE_CONNECTIONS_EXACT",
-        "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"
-              },
-              "maxInboundConnections": "123",
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port1"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "maxInboundConnections": "123",
-              "route": {
-                "name": "public_listener:port3"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port3"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:port3": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:port3",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:port3"
-                  },
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "9s"
-                    }
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-default.golden
deleted file mode 100644
index 299b051ef69d4..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-default-default.golden
+++ /dev/null
@@ -1,304 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "6s"
-            }
-          }
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:port3": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "8s"
-            }
-          }
-        },
-        "name": "local_app:port3",
-        "protocol": "PROTOCOL_HTTP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      },
-      "local_app:port3": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "balanceConnections": "BALANCE_CONNECTIONS_EXACT",
-        "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"
-              },
-              "maxInboundConnections": "123",
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port1"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "maxInboundConnections": "123",
-              "route": {
-                "name": "public_listener:port3"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port3"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:port3": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:port3",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:port3"
-                  },
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "9s"
-                    }
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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/local-and-inbound-connections-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-bar.golden
deleted file mode 100644
index 401f78db4421e..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-bar.golden
+++ /dev/null
@@ -1,304 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "6s"
-            }
-          }
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:port3": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "8s"
-            }
-          }
-        },
-        "name": "local_app:port3",
-        "protocol": "PROTOCOL_HTTP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      },
-      "local_app:port3": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "balanceConnections": "BALANCE_CONNECTIONS_EXACT",
-        "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"
-              },
-              "maxInboundConnections": "123",
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port1"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "maxInboundConnections": "123",
-              "route": {
-                "name": "public_listener:port3"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port3"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:port3": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:port3",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:port3"
-                  },
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "9s"
-                    }
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-default.golden
deleted file mode 100644
index 208ae29f3f428..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/local-and-inbound-connections-foo-default.golden
+++ /dev/null
@@ -1,304 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "exposed_cluster_9090": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9090",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "exposed_cluster_9091": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "exposed_cluster_9091",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:port1": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "6s"
-            }
-          }
-        },
-        "name": "local_app:port1",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:port3": {
-        "endpointGroup": {
-          "static": {
-            "config": {
-              "circuitBreakers": {
-                "upstreamLimits": {
-                  "maxConnections": 123
-                }
-              },
-              "connectTimeout": "8s"
-            }
-          }
-        },
-        "name": "local_app:port3",
-        "protocol": "PROTOCOL_HTTP"
-      }
-    },
-    "endpoints": {
-      "exposed_cluster_9090": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9090
-            }
-          }
-        ]
-      },
-      "exposed_cluster_9091": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      },
-      "local_app:port1": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      },
-      "local_app:port3": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "balanceConnections": "BALANCE_CONNECTIONS_EXACT",
-        "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"
-              },
-              "maxInboundConnections": "123",
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port1"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "maxInboundConnections": "123",
-              "route": {
-                "name": "public_listener:port3"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~port3"
-              ]
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1234
-        },
-        "name": "exposed_path_health1234",
-        "routers": [
-          {
-            "l7": {
-              "route": {
-                "name": "exposed_path_route_health1234"
-              },
-              "statPrefix": "exposed_path_route_health1234",
-              "staticRoute": true
-            }
-          }
-        ]
-      },
-      {
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "10.0.0.1",
-          "port": 1235
-        },
-        "name": "exposed_path_GetHealth1235",
-        "routers": [
-          {
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "exposed_path_route_GetHealth1235"
-              },
-              "statPrefix": "exposed_path_route_GetHealth1235",
-              "staticRoute": true
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "exposed_path_route_GetHealth1235": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_GetHealth1235",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9091"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "GetHealth"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "exposed_path_route_health1234": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "exposed_path_route_health1234",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "exposed_cluster_9090"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "exact": "/health"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:port3": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:port3",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:port3"
-                  },
-                  "destinationConfiguration": {
-                    "timeoutConfig": {
-                      "timeout": "9s"
-                    }
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-bar.golden
deleted file mode 100644
index 9fb74bcac23a6..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-bar.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden
deleted file mode 100644
index 70d0232467f1f..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-default-default.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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/multiple-workload-addresses-with-specific-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-bar.golden
deleted file mode 100644
index 053dab78e252c..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-bar.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-default.golden
deleted file mode 100644
index cce0e467791b6..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports-foo-default.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports.golden
deleted file mode 100644
index 70d0232467f1f..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-with-specific-ports.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "listeners": [
-      {
-        "capabilities": [
-          "CAPABILITY_L4_TLS_INSPECTION"
-        ],
-        "direction": "DIRECTION_INBOUND",
-        "hostPort": {
-          "host": "127.0.0.1",
-          "port": 20000
-        },
-        "name": "public_listener",
-        "routers": [
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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/multiple-workload-addresses-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-bar.golden
deleted file mode 100644
index 71727030fd3a5..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-bar.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-default.golden
deleted file mode 100644
index b86daa2817148..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-default-default.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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/multiple-workload-addresses-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-bar.golden
deleted file mode 100644
index 091b51a8086bd..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-bar.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-default.golden
deleted file mode 100644
index ef874be52ac62..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports-foo-default.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden
deleted file mode 100644
index b86daa2817148..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiple-workload-addresses-without-ports.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-bar.golden
deleted file mode 100644
index 94089a6f0a59a..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-default-bar.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "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-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-bar.golden
deleted file mode 100644
index c1b2664d2e2d2..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-bar.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-default.golden
deleted file mode 100644
index af5c54fa0e3ac..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-with-specific-ports-foo-default.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "foo"
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-bar.golden
deleted file mode 100644
index 52a3257ee7524..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-default-bar.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "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-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-bar.golden
deleted file mode 100644
index 19fe7d3a1663a..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-bar.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-default.golden
deleted file mode 100644
index 8279e5ee7b195..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-multiple-workload-addresses-without-ports-foo-default.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "foo"
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-bar.golden
deleted file mode 100644
index 52a3257ee7524..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-default-bar.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "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-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-bar.golden
deleted file mode 100644
index 19fe7d3a1663a..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-bar.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-default.golden
deleted file mode 100644
index 8279e5ee7b195..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-single-workload-address-without-ports-foo-default.golden
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_TCP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "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": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "foo"
-    }
-  },
-  "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-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-bar.golden
deleted file mode 100644
index 913b1b8e98c88..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-bar.golden
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "black-hole-cluster": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "black-hole-cluster",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "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-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden
deleted file mode 100644
index dc9afc44fa43d..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-default-default.golden
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "black-hole-cluster": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "black-hole-cluster",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-bar.golden
deleted file mode 100644
index 9400538fc5c6d..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-bar.golden
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "black-hole-cluster": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "black-hole-cluster",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "bar",
-      "partition": "foo"
-    }
-  },
-  "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-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-default.golden
deleted file mode 100644
index 7e9283df7ad6c..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l4-workload-with-only-mesh-port-foo-default.golden
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "black-hole-cluster": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "black-hole-cluster",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-bar.golden
deleted file mode 100644
index 97f406874f620..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-bar.golden
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      }
-    },
-    "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": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden
deleted file mode 100644
index dcba1dc58150a..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-default-default.golden
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      }
-    },
-    "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"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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-l7-multiple-workload-addresses-with-specific-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-bar.golden
deleted file mode 100644
index 60bf38e8ecb8b..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-bar.golden
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      }
-    },
-    "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": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-default.golden
deleted file mode 100644
index 4ddca8f31b2b3..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-with-specific-ports-foo-default.golden
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      }
-    },
-    "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": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-bar.golden
deleted file mode 100644
index c8849428f06e4..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-bar.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden
deleted file mode 100644
index 08d9faa234ea6..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-default-default.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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-l7-multiple-workload-addresses-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-bar.golden
deleted file mode 100644
index d5d96889b4380..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-bar.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-default.golden
deleted file mode 100644
index 89503e533e16e..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-multiple-workload-addresses-without-ports-foo-default.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-bar.golden
deleted file mode 100644
index c8849428f06e4..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-bar.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-default.golden
deleted file mode 100644
index 08d9faa234ea6..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-default-default.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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-l7-single-workload-address-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-bar.golden
deleted file mode 100644
index d5d96889b4380..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-bar.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-default.golden
deleted file mode 100644
index 89503e533e16e..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/multiport-l7-single-workload-address-without-ports-foo-default.golden
+++ /dev/null
@@ -1,250 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:admin-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:admin-port",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:api-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:api-port",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:grpc-port": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc-port",
-        "protocol": "PROTOCOL_GRPC"
-      }
-    },
-    "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
-            }
-          }
-        ]
-      },
-      "local_app:grpc-port": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 9091
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:admin-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~admin-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:api-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~api-port"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc-port"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc-port"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:admin-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:admin-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:admin-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:api-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:api-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:api-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:grpc-port": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc-port",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc-port"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-bar.golden
deleted file mode 100644
index 71727030fd3a5..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-bar.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "default"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-default.golden
deleted file mode 100644
index b86daa2817148..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-default-default.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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/single-workload-address-without-ports-foo-bar.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-bar.golden
deleted file mode 100644
index 091b51a8086bd..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-bar.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "bar",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "bar",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-default.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-default.golden
deleted file mode 100644
index ef874be52ac62..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports-foo-default.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "foo",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "requiredLeafCertificates": {
-    "test-identity": {
-      "name": "test-identity",
-      "namespace": "default",
-      "partition": "foo"
-    }
-  },
-  "requiredTrustBundles": {
-    "local": {
-      "peer": "local"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports.golden
deleted file mode 100644
index b86daa2817148..0000000000000
--- a/internal/mesh/internal/controllers/sidecarproxy/builder/testdata/source/single-workload-address-without-ports.golden
+++ /dev/null
@@ -1,291 +0,0 @@
-{
-  "proxyState": {
-    "clusters": {
-      "local_app:grpc": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:grpc",
-        "protocol": "PROTOCOL_GRPC"
-      },
-      "local_app:http": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http",
-        "protocol": "PROTOCOL_HTTP"
-      },
-      "local_app:http2": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:http2",
-        "protocol": "PROTOCOL_HTTP2"
-      },
-      "local_app:tcp": {
-        "endpointGroup": {
-          "static": {}
-        },
-        "name": "local_app:tcp",
-        "protocol": "PROTOCOL_TCP"
-      }
-    },
-    "endpoints": {
-      "local_app:grpc": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8083
-            }
-          }
-        ]
-      },
-      "local_app:http": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8081
-            }
-          }
-        ]
-      },
-      "local_app:http2": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8082
-            }
-          }
-        ]
-      },
-      "local_app:tcp": {
-        "endpoints": [
-          {
-            "hostPort": {
-              "host": "127.0.0.1",
-              "port": 8080
-            }
-          }
-        ]
-      }
-    },
-    "identity": {
-      "name": "test-identity",
-      "tenancy": {
-        "namespace": "default",
-        "partition": "default",
-        "peerName": "local"
-      },
-      "type": {
-        "group": "auth",
-        "groupVersion": "v2beta1",
-        "kind": "WorkloadIdentity"
-      }
-    },
-    "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"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_GRPC",
-              "route": {
-                "name": "public_listener:grpc"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~grpc"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "route": {
-                "name": "public_listener:http"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l7": {
-              "protocol": "L7_PROTOCOL_HTTP2",
-              "route": {
-                "name": "public_listener:http2"
-              },
-              "statPrefix": "public_listener",
-              "staticRoute": true,
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~http2"
-              ]
-            }
-          },
-          {
-            "inboundTls": {
-              "inboundMesh": {
-                "identityKey": "test-identity",
-                "validationContext": {
-                  "trustBundlePeerNameKeys": [
-                    "local"
-                  ]
-                }
-              }
-            },
-            "l4": {
-              "cluster": {
-                "name": "local_app:tcp"
-              },
-              "statPrefix": "public_listener",
-              "trafficPermissions": {}
-            },
-            "match": {
-              "alpnProtocols": [
-                "consul~tcp"
-              ]
-            }
-          }
-        ]
-      }
-    ],
-    "routes": {
-      "public_listener:grpc": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:grpc",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:grpc"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      },
-      "public_listener:http2": {
-        "virtualHosts": [
-          {
-            "domains": [
-              "*"
-            ],
-            "name": "public_listener:http2",
-            "routeRules": [
-              {
-                "destination": {
-                  "cluster": {
-                    "name": "local_app:http2"
-                  }
-                },
-                "match": {
-                  "pathMatch": {
-                    "prefix": "/"
-                  }
-                }
-              }
-            ]
-          }
-        ]
-      }
-    }
-  },
-  "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/cache/cache_test.go b/internal/mesh/internal/controllers/sidecarproxy/cache/cache_test.go
index e0ade738e2fd1..2aa5484db498e 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/cache/cache_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/cache/cache_test.go
@@ -24,408 +24,397 @@ import (
 )
 
 func TestIdentities(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		cache := New()
-
-		identityID1 := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-1").
-			WithTenancy(tenancy).ID()
-		identityID2 := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-2").
-			WithTenancy(tenancy).ID()
-
-		w1 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-1").
-			WithData(t, &pbcatalog.Workload{
-				Identity: identityID1.Name,
-			}).
-			WithTenancy(tenancy).
-			Build()
-		decW1 := resourcetest.MustDecode[*pbcatalog.Workload](t, w1)
-		w2 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-2").
-			WithData(t, &pbcatalog.Workload{
-				Identity: identityID2.Name,
-			}).
-			WithTenancy(tenancy).
-			Build()
-		decW2 := resourcetest.MustDecode[*pbcatalog.Workload](t, w2)
-
-		// Empty cache
-		require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID1))
-		require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
-
-		// Insert value and fetch it.
-		cache.TrackWorkload(decW1)
-		require.Equal(t, []*pbresource.ID{w1.Id}, cache.WorkloadsByWorkloadIdentity(identityID1))
-		require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
-
-		// Insert another value referencing the same identity.
-		decW2.GetData().Identity = identityID1.Name
-		cache.TrackWorkload(decW2)
-		require.ElementsMatch(t, []*pbresource.ID{w1.Id, w2.Id}, cache.WorkloadsByWorkloadIdentity(identityID1))
-		require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
-
-		// Now workload 1 uses identity 2
-		decW1.GetData().Identity = identityID2.Name
-		cache.TrackWorkload(decW1)
-		require.Equal(t, []*pbresource.ID{w1.Id}, cache.WorkloadsByWorkloadIdentity(identityID2))
-		require.Equal(t, []*pbresource.ID{w2.Id}, cache.WorkloadsByWorkloadIdentity(identityID1))
-
-		// Untrack workload 2
-		cache.UntrackWorkload(w2.Id)
-		require.Equal(t, []*pbresource.ID{w1.Id}, cache.WorkloadsByWorkloadIdentity(identityID2))
-		require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID1))
-
-		// Untrack workload 1
-		cache.UntrackWorkload(w1.Id)
-		require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
-		require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID1))
-	}, t)
+	cache := New()
+
+	identityID1 := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-1").
+		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
+	identityID2 := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-2").
+		WithTenancy(resource.DefaultNamespacedTenancy()).ID()
+
+	w1 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-1").
+		WithData(t, &pbcatalog.Workload{
+			Identity: identityID1.Name,
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+	decW1 := resourcetest.MustDecode[*pbcatalog.Workload](t, w1)
+	w2 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-2").
+		WithData(t, &pbcatalog.Workload{
+			Identity: identityID2.Name,
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+	decW2 := resourcetest.MustDecode[*pbcatalog.Workload](t, w2)
+
+	// Empty cache
+	require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID1))
+	require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
+
+	// Insert value and fetch it.
+	cache.TrackWorkload(decW1)
+	require.Equal(t, []*pbresource.ID{w1.Id}, cache.WorkloadsByWorkloadIdentity(identityID1))
+	require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
+
+	// Insert another value referencing the same identity.
+	decW2.GetData().Identity = identityID1.Name
+	cache.TrackWorkload(decW2)
+	require.ElementsMatch(t, []*pbresource.ID{w1.Id, w2.Id}, cache.WorkloadsByWorkloadIdentity(identityID1))
+	require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
+
+	// Now workload 1 uses identity 2
+	decW1.GetData().Identity = identityID2.Name
+	cache.TrackWorkload(decW1)
+	require.Equal(t, []*pbresource.ID{w1.Id}, cache.WorkloadsByWorkloadIdentity(identityID2))
+	require.Equal(t, []*pbresource.ID{w2.Id}, cache.WorkloadsByWorkloadIdentity(identityID1))
+
+	// Untrack workload 2
+	cache.UntrackWorkload(w2.Id)
+	require.Equal(t, []*pbresource.ID{w1.Id}, cache.WorkloadsByWorkloadIdentity(identityID2))
+	require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID1))
+
+	// Untrack workload 1
+	cache.UntrackWorkload(w1.Id)
+	require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID2))
+	require.Nil(t, cache.WorkloadsByWorkloadIdentity(identityID1))
 }
 
 func TestMapComputedTrafficPermissions(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		client := svctest.NewResourceServiceBuilder().
-			WithRegisterFns(types.Register, catalog.RegisterTypes).
-			Run(t)
-
-		ctp := resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, "workload-identity-1").
-			WithTenancy(tenancy).
-			WithData(t, &pbauth.ComputedTrafficPermissions{}).
-			Build()
-
-		c := New()
-
-		// Empty results when the cache isn't populated.
-		requests, err := c.MapComputedTrafficPermissions(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(tenancy).ID()
-
-		w1 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-1").
-			WithData(t, &pbcatalog.Workload{
-				Identity: identityID1.Name,
-			}).
-			WithTenancy(tenancy).
-			Build()
-		decW1 := resourcetest.MustDecode[*pbcatalog.Workload](t, w1)
-		w2 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-2").
-			WithData(t, &pbcatalog.Workload{
-				Identity: identityID1.Name,
-			}).
-			WithTenancy(tenancy).
-			Build()
-		decW2 := resourcetest.MustDecode[*pbcatalog.Workload](t, w2)
-
-		c.TrackWorkload(decW1)
-
-		// Empty results when the cache isn't populated.
-		requests, err = c.MapComputedTrafficPermissions(context.Background(), controller.Runtime{Client: client}, ctp)
-		require.NoError(t, err)
-		prototest.AssertElementsMatch(t,
-			[]controller.Request{{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w1.Id)}}, requests)
-
-		c.TrackWorkload(decW2)
-
-		// Empty results when the cache isn't populated.
-		requests, err = c.MapComputedTrafficPermissions(context.Background(), controller.Runtime{Client: client}, ctp)
-		require.NoError(t, err)
-		prototest.AssertElementsMatch(t, []controller.Request{
-			{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w1.Id)},
-			{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w2.Id)},
-		}, requests)
-	}, 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()
+
+	c := New()
+
+	// Empty results when the cache isn't populated.
+	requests, err := c.MapComputedTrafficPermissions(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()
+
+	w1 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-1").
+		WithData(t, &pbcatalog.Workload{
+			Identity: identityID1.Name,
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+	decW1 := resourcetest.MustDecode[*pbcatalog.Workload](t, w1)
+	w2 := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-2").
+		WithData(t, &pbcatalog.Workload{
+			Identity: identityID1.Name,
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+	decW2 := resourcetest.MustDecode[*pbcatalog.Workload](t, w2)
+
+	c.TrackWorkload(decW1)
+
+	// Empty results when the cache isn't populated.
+	requests, err = c.MapComputedTrafficPermissions(context.Background(), controller.Runtime{Client: client}, ctp)
+	require.NoError(t, err)
+	prototest.AssertElementsMatch(t,
+		[]controller.Request{{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w1.Id)}}, requests)
+
+	c.TrackWorkload(decW2)
+
+	// Empty results when the cache isn't populated.
+	requests, err = c.MapComputedTrafficPermissions(context.Background(), controller.Runtime{Client: client}, ctp)
+	require.NoError(t, err)
+	prototest.AssertElementsMatch(t, []controller.Request{
+		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w1.Id)},
+		{ID: resource.ReplaceType(pbmesh.ProxyStateTemplateType, w2.Id)},
+	}, requests)
 }
 
 func TestUnified_AllMappingsToProxyStateTemplate(t *testing.T) {
-	resourcetest.RunWithTenancies(func(tenancy *pbresource.Tenancy) {
-		var (
-			cache  = New()
-			client = svctest.NewResourceServiceBuilder().
-				WithRegisterFns(types.Register, catalog.RegisterTypes).
-				Run(t)
-		)
-
-		anyServiceData := &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{
-				Prefixes: []string{"src-workload"},
+	var (
+		cache  = New()
+		client = svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
+	)
+
+	anyServiceData := &pbcatalog.Service{
+		Workloads: &pbcatalog.WorkloadSelector{
+			Prefixes: []string{"src-workload"},
+		},
+		Ports: []*pbcatalog.ServicePort{
+			{
+				TargetPort: "tcp1",
+				Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
 			},
-			Ports: []*pbcatalog.ServicePort{
+			{
+				TargetPort: "tcp2",
+				Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
+			},
+			{
+				TargetPort: "mesh",
+				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 (
+		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")
+	)
+
+	compDestProxy1 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy1.Name).
+		WithData(t, &pbmesh.ComputedExplicitDestinations{
+			Destinations: []*pbmesh.Destination{
 				{
-					TargetPort: "tcp1",
-					Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
+					DestinationRef:  destServiceRef,
+					DestinationPort: "tcp1",
 				},
+			},
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+
+	compDestProxy2 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy2.Name).
+		WithData(t, &pbmesh.ComputedExplicitDestinations{
+			Destinations: []*pbmesh.Destination{
 				{
-					TargetPort: "tcp2",
-					Protocol:   pbcatalog.Protocol_PROTOCOL_TCP,
+					DestinationRef:  destServiceRef,
+					DestinationPort: "tcp1",
 				},
+			},
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+
+	compDestProxy3 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy3.Name).
+		WithData(t, &pbmesh.ComputedExplicitDestinations{
+			Destinations: []*pbmesh.Destination{
 				{
-					TargetPort: "mesh",
-					Protocol:   pbcatalog.Protocol_PROTOCOL_MESH,
+					DestinationRef:  destServiceRef,
+					DestinationPort: "tcp2",
 				},
 			},
-		}
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
 
-		// The thing we link through Destinations.
-		destService := resourcetest.Resource(pbcatalog.ServiceType, "web").
-			WithTenancy(tenancy).
-			WithData(t, anyServiceData).
-			Build()
-		destServiceRef := resource.Reference(destService.Id, "")
-
-		// The thing we reach through the mesh config.
-		targetService := resourcetest.Resource(pbcatalog.ServiceType, "db").
-			WithTenancy(tenancy).
-			WithData(t, anyServiceData).
-			Build()
-		targetServiceRef := resource.Reference(targetService.Id, "")
-
-		backupTargetService := resourcetest.Resource(pbcatalog.ServiceType, "db-backup").
-			WithTenancy(tenancy).
-			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(tenancy).
-			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(tenancy).
-			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 (
-			sourceProxy1 = newID(pbmesh.ProxyStateTemplateType, "src-workload-1", tenancy)
-			sourceProxy2 = newID(pbmesh.ProxyStateTemplateType, "src-workload-2", tenancy)
-			sourceProxy3 = newID(pbmesh.ProxyStateTemplateType, "src-workload-3", tenancy)
-			sourceProxy4 = newID(pbmesh.ProxyStateTemplateType, "src-workload-4", tenancy)
-			sourceProxy5 = newID(pbmesh.ProxyStateTemplateType, "src-workload-5", tenancy)
-			sourceProxy6 = newID(pbmesh.ProxyStateTemplateType, "src-workload-6", tenancy)
-		)
-
-		compDestProxy1 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy1.Name).
-			WithData(t, &pbmesh.ComputedExplicitDestinations{
-				Destinations: []*pbmesh.Destination{
-					{
-						DestinationRef:  destServiceRef,
-						DestinationPort: "tcp1",
-					},
-				},
-			}).
-			WithTenancy(tenancy).
-			Build()
-
-		compDestProxy2 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy2.Name).
-			WithData(t, &pbmesh.ComputedExplicitDestinations{
-				Destinations: []*pbmesh.Destination{
-					{
-						DestinationRef:  destServiceRef,
-						DestinationPort: "tcp1",
-					},
-				},
-			}).
-			WithTenancy(tenancy).
-			Build()
-
-		compDestProxy3 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy3.Name).
-			WithData(t, &pbmesh.ComputedExplicitDestinations{
-				Destinations: []*pbmesh.Destination{
-					{
-						DestinationRef:  destServiceRef,
-						DestinationPort: "tcp2",
-					},
-				},
-			}).
-			WithTenancy(tenancy).
-			Build()
-
-		compDestProxy4 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy4.Name).
-			WithData(t, &pbmesh.ComputedExplicitDestinations{
-				Destinations: []*pbmesh.Destination{
-					{
-						DestinationRef:  destServiceRef,
-						DestinationPort: "tcp2",
-					},
+	compDestProxy4 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy4.Name).
+		WithData(t, &pbmesh.ComputedExplicitDestinations{
+			Destinations: []*pbmesh.Destination{
+				{
+					DestinationRef:  destServiceRef,
+					DestinationPort: "tcp2",
 				},
-			}).
-			WithTenancy(tenancy).
-			Build()
-
-		compDestProxy5 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy5.Name).
-			WithData(t, &pbmesh.ComputedExplicitDestinations{
-				Destinations: []*pbmesh.Destination{
-					{
-						DestinationRef:  destServiceRef,
-						DestinationPort: "mesh",
-					},
+			},
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+
+	compDestProxy5 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy5.Name).
+		WithData(t, &pbmesh.ComputedExplicitDestinations{
+			Destinations: []*pbmesh.Destination{
+				{
+					DestinationRef:  destServiceRef,
+					DestinationPort: "mesh",
 				},
-			}).
-			WithTenancy(tenancy).
-			Build()
-
-		compDestProxy6 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy6.Name).
-			WithData(t, &pbmesh.ComputedExplicitDestinations{
-				Destinations: []*pbmesh.Destination{
-					{
-						DestinationRef:  destServiceRef,
-						DestinationPort: "mesh",
-					},
+			},
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+
+	compDestProxy6 := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, sourceProxy6.Name).
+		WithData(t, &pbmesh.ComputedExplicitDestinations{
+			Destinations: []*pbmesh.Destination{
+				{
+					DestinationRef:  destServiceRef,
+					DestinationPort: "mesh",
 				},
-			}).
-			WithTenancy(tenancy).
-			Build()
-
-		cache.trackComputedRoutes(webRoutes)
-		cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy1))
-		cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy2))
-		cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy3))
-		cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy4))
-		cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy5))
-		cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy6))
-
-		t.Run(resourcetest.AppendTenancyInfoSubtest(t.Name(), "Service", tenancy), func(t *testing.T) {
-			t.Run("map dest service", func(t *testing.T) {
-				requests, err := cache.MapService(
-					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)
-
-				// Check that service's workload selector is tracked.
-				prototest.AssertElementsMatch(t,
-					[]*pbresource.ID{destService.Id},
-					cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy1)))
-				prototest.AssertElementsMatch(t,
-					[]*pbresource.ID{destService.Id},
-					cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy2)))
-				prototest.AssertElementsMatch(t,
-					[]*pbresource.ID{destService.Id},
-					cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy3)))
-				prototest.AssertElementsMatch(t,
-					[]*pbresource.ID{destService.Id},
-					cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy4)))
-				prototest.AssertElementsMatch(t,
-					[]*pbresource.ID{destService.Id},
-					cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy5)))
-				prototest.AssertElementsMatch(t,
-					[]*pbresource.ID{destService.Id},
-					cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy6)))
-			})
-
-			t.Run("map target endpoints (TCPRoute)", func(t *testing.T) {
-				requests, err := cache.MapService(
-					context.Background(),
-					controller.Runtime{Client: client},
-					targetService,
-				)
-				require.NoError(t, err)
-
-				requests = testDeduplicateRequests(requests)
-
-				expRequests := []controller.Request{
-					// 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 := cache.MapService(
-					context.Background(),
-					controller.Runtime{Client: client},
-					backupTargetService,
-				)
-				require.NoError(t, err)
-
-				requests = testDeduplicateRequests(requests)
-
-				expRequests := []controller.Request{
-					// 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)
-			})
+			},
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
+
+	cache.trackComputedRoutes(webRoutes)
+	cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy1))
+	cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy2))
+	cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy3))
+	cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy4))
+	cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy5))
+	cache.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDestProxy6))
+
+	t.Run("Service", func(t *testing.T) {
+		t.Run("map dest service", func(t *testing.T) {
+			requests, err := cache.MapService(
+				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)
+
+			// Check that service's workload selector is tracked.
+			prototest.AssertElementsMatch(t,
+				[]*pbresource.ID{destService.Id},
+				cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy1)))
+			prototest.AssertElementsMatch(t,
+				[]*pbresource.ID{destService.Id},
+				cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy2)))
+			prototest.AssertElementsMatch(t,
+				[]*pbresource.ID{destService.Id},
+				cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy3)))
+			prototest.AssertElementsMatch(t,
+				[]*pbresource.ID{destService.Id},
+				cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy4)))
+			prototest.AssertElementsMatch(t,
+				[]*pbresource.ID{destService.Id},
+				cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy5)))
+			prototest.AssertElementsMatch(t,
+				[]*pbresource.ID{destService.Id},
+				cache.serviceSelectorTracker.GetIDsForWorkload(resource.ReplaceType(pbcatalog.WorkloadType, sourceProxy6)))
+		})
+
+		t.Run("map target endpoints (TCPRoute)", func(t *testing.T) {
+			requests, err := cache.MapService(
+				context.Background(),
+				controller.Runtime{Client: client},
+				targetService,
+			)
+			require.NoError(t, err)
+
+			requests = testDeduplicateRequests(requests)
+
+			expRequests := []controller.Request{
+				// 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(resourcetest.AppendTenancyInfoSubtest(t.Name(), "ComputedRoutes", tenancy), func(t *testing.T) {
-			t.Run("map web routes", func(t *testing.T) {
-				requests, err := cache.MapComputedRoutes(
-					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)
-			})
+		t.Run("map backup target endpoints (FailoverPolicy)", func(t *testing.T) {
+			requests, err := cache.MapService(
+				context.Background(),
+				controller.Runtime{Client: client},
+				backupTargetService,
+			)
+			require.NoError(t, err)
+
+			requests = testDeduplicateRequests(requests)
+
+			expRequests := []controller.Request{
+				// 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("ComputedRoutes", func(t *testing.T) {
+		t.Run("map web routes", func(t *testing.T) {
+			requests, err := cache.MapComputedRoutes(
+				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)
 		})
-	}, t)
+	})
 }
 
-func newID(typ *pbresource.Type, name string, tenancy *pbresource.Tenancy) *pbresource.ID {
+func newID(typ *pbresource.Type, name string) *pbresource.ID {
 	return &pbresource.ID{
 		Type:    typ,
-		Tenancy: tenancy,
+		Tenancy: resource.DefaultNamespacedTenancy(),
 		Name:    name,
 	}
 }
diff --git a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go b/internal/mesh/internal/controllers/sidecarproxy/controller_test.go
index 8a2fe05a465e5..adeffe1cdf7e0 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/controller_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/controller_test.go
@@ -5,7 +5,6 @@ package sidecarproxy
 
 import (
 	"context"
-	"fmt"
 	"strings"
 	"testing"
 
@@ -43,9 +42,15 @@ type controllerTestSuite struct {
 	ctl *reconciler
 	ctx context.Context
 
-	webWorkload *pbresource.Resource
-
-	api map[tenancyKey]apiData
+	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
@@ -53,42 +58,11 @@ type controllerTestSuite struct {
 	dbEndpoints     *pbresource.Resource
 	dbEndpointsData *pbcatalog.ServiceEndpoints
 
-	tenancies []*pbresource.Tenancy
-}
-
-type tenancyKey struct {
-	Namespace string
-	Partition string
-}
-
-func toTenancyKey(t *pbresource.Tenancy) tenancyKey {
-	return tenancyKey{
-		Namespace: t.Namespace,
-		Partition: t.Partition,
-	}
-}
-
-type apiData struct {
-	workloadID                     *pbresource.ID
-	workload                       *pbcatalog.Workload
-	computedTrafficPermissions     *pbresource.Resource
-	computedTrafficPermissionsData *pbauth.ComputedTrafficPermissions
-	service                        *pbresource.Resource
-	destinationListenerName        string
-	destinationClusterName         string
-	serviceData                    *pbcatalog.Service
-	endpoints                      *pbresource.Resource
-	endpointsData                  *pbcatalog.ServiceEndpoints
-	proxyStateTemplate             *pbmesh.ProxyStateTemplate
+	proxyStateTemplate *pbmesh.ProxyStateTemplate
 }
 
 func (suite *controllerTestSuite) SetupTest() {
-	suite.tenancies = resourcetest.TestTenancies()
-	resourceClient := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes, auth.RegisterTypes).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
-
+	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())
@@ -100,168 +74,135 @@ func (suite *controllerTestSuite) SetupTest() {
 		},
 	}
 
-	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},
-		},
+	{
+		// 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)
+
 	}
-}
 
-func (suite *controllerTestSuite) setupSuiteWithTenancy(tenancy *pbresource.Tenancy) {
-	webWorkloadData := &pbcatalog.Workload{
-		Identity: "web-identity",
+	suite.apiWorkload = &pbcatalog.Workload{
+		Identity: "api-identity",
 		Addresses: []*pbcatalog.WorkloadAddress{
 			{
-				Host: "10.0.0.2",
+				Host: "10.0.0.1",
 			},
 		},
 		Ports: map[string]*pbcatalog.WorkloadPort{
-			"tcp":  {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
+			"tcp":  {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
 			"mesh": {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
 		},
 	}
-	// DB will be a service with a single workload, IN the mesh that will
-	// be a destination of web.
 
-	suite.dbWorkloadID = resourcetest.Resource(pbcatalog.WorkloadType, "db-abc").
-		WithData(suite.T(), suite.dbWorkload).
-		WithTenancy(tenancy).
-		Write(suite.T(), suite.client.ResourceServiceClient).Id
+	suite.apiWorkloadID = resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
+		WithData(suite.T(), suite.apiWorkload).
+		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},
-			}}).
-		WithTenancy(tenancy).
-		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.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.dbEndpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "db-service").
-		WithData(suite.T(), suite.dbEndpointsData).
-		WithTenancy(tenancy).
-		Write(suite.T(), suite.client)
-
-	suite.api = make(map[tenancyKey]apiData)
 
-	for i, t := range suite.tenancies {
-		var a apiData
-
-		a.computedTrafficPermissionsData = &pbauth.ComputedTrafficPermissions{
-			IsDefault: false,
-			AllowPermissions: []*pbauth.Permission{
-				{
-					Sources: []*pbauth.Source{
-						{
-							IdentityName: "foo",
-							Namespace:    "default",
-							Partition:    "default",
-							Peer:         "local",
-						},
+	suite.apiComputedTrafficPermissionsData = &pbauth.ComputedTrafficPermissions{
+		IsDefault: false,
+		AllowPermissions: []*pbauth.Permission{
+			{
+				Sources: []*pbauth.Source{
+					{
+						IdentityName: "foo",
+						Namespace:    "default",
+						Partition:    "default",
+						Peer:         "local",
 					},
 				},
 			},
-		}
-
-		a.workload = &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},
-			},
-		}
+		},
+	}
 
-		a.serviceData = &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.apiComputedTrafficPermissions = resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, suite.apiWorkload.Identity).
+		WithData(suite.T(), suite.apiComputedTrafficPermissionsData).
+		Write(suite.T(), resourceClient)
 
-		a.workloadID = resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-			WithTenancy(t).
-			WithData(suite.T(), a.workload).
-			Write(suite.T(), suite.client.ResourceServiceClient).Id
+	suite.apiService = resourcetest.Resource(pbcatalog.ServiceType, "api-service").
+		WithData(suite.T(), suite.apiServiceData).
+		Write(suite.T(), suite.client.ResourceServiceClient)
 
-		a.endpointsData = &pbcatalog.ServiceEndpoints{
-			Endpoints: []*pbcatalog.Endpoint{
-				{
-					TargetRef: a.workloadID,
-					Addresses: a.workload.Addresses,
-					Ports:     a.workload.Ports,
-					Identity:  "api-identity",
-				},
+	suite.apiEndpointsData = &pbcatalog.ServiceEndpoints{
+		Endpoints: []*pbcatalog.Endpoint{
+			{
+				TargetRef: suite.apiWorkloadID,
+				Addresses: suite.apiWorkload.Addresses,
+				Ports:     suite.apiWorkload.Ports,
+				Identity:  "api-identity",
 			},
-		}
-
-		a.computedTrafficPermissions = resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, a.workload.Identity).
-			WithData(suite.T(), a.computedTrafficPermissionsData).
-			WithTenancy(t).
-			Write(suite.T(), suite.client.ResourceServiceClient)
-
-		a.service = resourcetest.Resource(pbcatalog.ServiceType, "api-service").
-			WithData(suite.T(), a.serviceData).
-			WithTenancy(t).
-			Write(suite.T(), suite.client.ResourceServiceClient)
-
-		a.endpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-service").
-			WithData(suite.T(), a.endpointsData).
-			WithTenancy(t).
-			Write(suite.T(), suite.client.ResourceServiceClient)
-
-		identityRef := &pbresource.Reference{
-			Name:    a.workload.Identity,
-			Tenancy: a.workloadID.Tenancy,
-			Type:    pbauth.WorkloadIdentityType,
-		}
-
-		a.destinationListenerName = builder.DestinationListenerName(resource.Reference(a.service.Id, ""), "tcp", "127.0.0.1", uint32(1234+i))
-		a.destinationClusterName = builder.DestinationSNI(resource.Reference(a.service.Id, ""), "dc1", "test.consul")
-
-		a.proxyStateTemplate = builder.New(resource.ReplaceType(pbmesh.ProxyStateTemplateType, a.workloadID),
-			identityRef, "test.consul", "dc1", false, nil).
-			BuildLocalApp(a.workload, a.computedTrafficPermissionsData).
-			Build()
-
-		suite.api[toTenancyKey(t)] = a
+		},
 	}
+	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).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
 	resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, webWorkloadData.Identity).
 		WithData(suite.T(), &pbauth.ComputedTrafficPermissions{IsDefault: true}).
-		WithTenancy(tenancy).
-		Write(suite.T(), suite.client.ResourceServiceClient)
+		Write(suite.T(), resourceClient)
 
 	resourcetest.Resource(pbcatalog.ServiceType, "web").
-		WithTenancy(tenancy).
 		WithData(suite.T(), &pbcatalog.Service{
 			Workloads: &pbcatalog.WorkloadSelector{Names: []string{"web-def"}},
 			Ports: []*pbcatalog.ServicePort{
@@ -271,7 +212,6 @@ func (suite *controllerTestSuite) setupSuiteWithTenancy(tenancy *pbresource.Tena
 		Write(suite.T(), suite.client)
 
 	resourcetest.Resource(pbcatalog.ServiceEndpointsType, "web").
-		WithTenancy(tenancy).
 		WithData(suite.T(), &pbcatalog.ServiceEndpoints{
 			Endpoints: []*pbcatalog.Endpoint{
 				{
@@ -282,297 +222,282 @@ func (suite *controllerTestSuite) setupSuiteWithTenancy(tenancy *pbresource.Tena
 				},
 			},
 		}).Write(suite.T(), suite.client)
+
+	identityRef := &pbresource.Reference{
+		Name:    suite.apiWorkload.Identity,
+		Tenancy: suite.apiWorkloadID.Tenancy,
+		Type:    pbauth.WorkloadIdentityType,
+	}
+
+	suite.proxyStateTemplate = builder.New(resource.ReplaceType(pbmesh.ProxyStateTemplateType, suite.apiWorkloadID),
+		identityRef, "test.consul", "dc1", false, nil).
+		BuildLocalApp(suite.apiWorkload, suite.apiComputedTrafficPermissionsData).
+		Build()
 }
 
 func (suite *controllerTestSuite) TestWorkloadPortProtocolsFromService_NoServicesInCache() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		dataFetcher := fetcher.New(suite.client, suite.ctl.cache)
+	dataFetcher := fetcher.New(suite.client, suite.ctl.cache)
 
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, "api-workload").
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Workload{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"tcp": {Port: 8080},
-				},
-			}).
-			Build()
+	workload := resourcetest.Resource(pbcatalog.WorkloadType, "api-workload").
+		WithData(suite.T(), &pbcatalog.Workload{
+			Ports: map[string]*pbcatalog.WorkloadPort{
+				"tcp": {Port: 8080},
+			},
+		}).
+		Build()
 
-		decWorkload := resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload)
-		workloadPorts, err := suite.ctl.workloadPortProtocolsFromService(suite.ctx, dataFetcher, decWorkload, suite.runtime.Logger)
-		require.NoError(suite.T(), err)
-		prototest.AssertDeepEqual(suite.T(), pbcatalog.Protocol_PROTOCOL_TCP, workloadPorts["tcp"].GetProtocol())
-	})
+	decWorkload := resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload)
+	workloadPorts, err := suite.ctl.workloadPortProtocolsFromService(suite.ctx, dataFetcher, decWorkload, suite.runtime.Logger)
+	require.NoError(suite.T(), err)
+	prototest.AssertDeepEqual(suite.T(), pbcatalog.Protocol_PROTOCOL_TCP, workloadPorts["tcp"].GetProtocol())
 }
 
 func (suite *controllerTestSuite) TestWorkloadPortProtocolsFromService_ServiceNotFound() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		c := cache.New()
-		dataFetcher := fetcher.New(suite.client, c)
-		ctrl := &reconciler{
-			cache: c,
-			getTrustDomain: func() (string, error) {
-				return "test.consul", nil
+	c := cache.New()
+	dataFetcher := fetcher.New(suite.client, c)
+	ctrl := &reconciler{
+		cache: c,
+		getTrustDomain: func() (string, error) {
+			return "test.consul", nil
+		},
+	}
+	svc := resourcetest.Resource(pbcatalog.ServiceType, "not-found").
+		WithData(suite.T(), &pbcatalog.Service{
+			Workloads: &pbcatalog.WorkloadSelector{
+				Names: []string{"api-workload"},
 			},
-		}
-		svc := resourcetest.Resource(pbcatalog.ServiceType, "not-found").
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Names: []string{"api-workload"},
-				},
-			}).
-			WithTenancy(tenancy).
-			Build()
+		}).
+		Build()
 
-		decSvc := resourcetest.MustDecode[*pbcatalog.Service](suite.T(), svc)
-		c.TrackService(decSvc)
+	decSvc := resourcetest.MustDecode[*pbcatalog.Service](suite.T(), svc)
+	c.TrackService(decSvc)
 
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, "api-workload").
-			WithData(suite.T(), &pbcatalog.Workload{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"tcp": {Port: 8080},
-				},
-			}).
-			WithTenancy(tenancy).
-			Build()
+	workload := resourcetest.Resource(pbcatalog.WorkloadType, "api-workload").
+		WithData(suite.T(), &pbcatalog.Workload{
+			Ports: map[string]*pbcatalog.WorkloadPort{
+				"tcp": {Port: 8080},
+			},
+		}).
+		Build()
 
-		decWorkload := resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload)
+	decWorkload := resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload)
 
-		workloadPorts, err := ctrl.workloadPortProtocolsFromService(suite.ctx, dataFetcher, decWorkload, suite.runtime.Logger)
-		require.NoError(suite.T(), err)
-		prototest.AssertDeepEqual(suite.T(), pbcatalog.Protocol_PROTOCOL_TCP, workloadPorts["tcp"].GetProtocol())
-		// Check that the service is no longer in cache.
-		require.Nil(suite.T(), c.ServicesForWorkload(workload.Id))
-	})
+	workloadPorts, err := ctrl.workloadPortProtocolsFromService(suite.ctx, dataFetcher, decWorkload, suite.runtime.Logger)
+	require.NoError(suite.T(), err)
+	prototest.AssertDeepEqual(suite.T(), pbcatalog.Protocol_PROTOCOL_TCP, workloadPorts["tcp"].GetProtocol())
+	// Check that the service is no longer in cache.
+	require.Nil(suite.T(), c.ServicesForWorkload(workload.Id))
 }
 
 func (suite *controllerTestSuite) TestWorkloadPortProtocolsFromService() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		c := cache.New()
-		dataFetcher := fetcher.New(suite.client, c)
-		ctrl := &reconciler{
-			cache: c,
-			getTrustDomain: func() (string, error) {
-				return "test.consul", nil
+	c := cache.New()
+	dataFetcher := fetcher.New(suite.client, c)
+	ctrl := &reconciler{
+		cache: c,
+		getTrustDomain: func() (string, error) {
+			return "test.consul", nil
+		},
+	}
+	svc1 := resourcetest.Resource(pbcatalog.ServiceType, "api-1").
+		WithData(suite.T(), &pbcatalog.Service{
+			Workloads: &pbcatalog.WorkloadSelector{
+				Names: []string{"api-workload"},
 			},
-		}
-		svc1 := resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Names: []string{"api-workload"},
+			Ports: []*pbcatalog.ServicePort{
+				{
+					TargetPort: "http1",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
 				},
-				Ports: []*pbcatalog.ServicePort{
-					{
-						TargetPort: "http1",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-					},
-					{
-						TargetPort: "conflict",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
-					},
+				{
+					TargetPort: "conflict",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP,
 				},
-			}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
+			},
+		}).
+		Write(suite.T(), suite.client)
 
-		decSvc := resourcetest.MustDecode[*pbcatalog.Service](suite.T(), svc1)
-		c.TrackService(decSvc)
+	decSvc := resourcetest.MustDecode[*pbcatalog.Service](suite.T(), svc1)
+	c.TrackService(decSvc)
 
-		svc2 := resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Service{
-				Workloads: &pbcatalog.WorkloadSelector{
-					Names: []string{"api-workload"},
+	svc2 := resourcetest.Resource(pbcatalog.ServiceType, "api-2").
+		WithData(suite.T(), &pbcatalog.Service{
+			Workloads: &pbcatalog.WorkloadSelector{
+				Names: []string{"api-workload"},
+			},
+			Ports: []*pbcatalog.ServicePort{
+				{
+					TargetPort: "http2",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP2,
 				},
-				Ports: []*pbcatalog.ServicePort{
-					{
-						TargetPort: "http2",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_HTTP2,
-					},
-					{
-						TargetPort: "conflict",
-						Protocol:   pbcatalog.Protocol_PROTOCOL_GRPC,
-					},
+				{
+					TargetPort: "conflict",
+					Protocol:   pbcatalog.Protocol_PROTOCOL_GRPC,
 				},
-			}).
-			Write(suite.T(), suite.client)
+			},
+		}).
+		Write(suite.T(), suite.client)
 
-		decSvc = resourcetest.MustDecode[*pbcatalog.Service](suite.T(), svc2)
-		c.TrackService(decSvc)
+	decSvc = resourcetest.MustDecode[*pbcatalog.Service](suite.T(), svc2)
+	c.TrackService(decSvc)
 
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, "api-workload").
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Workload{
-				Ports: map[string]*pbcatalog.WorkloadPort{
-					"http1":              {Port: 8080},
-					"http2":              {Port: 9090},
-					"conflict":           {Port: 9091},
-					"not-selected":       {Port: 8081},
-					"specified-protocol": {Port: 8082, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-					"mesh":               {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-				},
-			}).
-			WithTenancy(tenancy).
-			Build()
+	workload := resourcetest.Resource(pbcatalog.WorkloadType, "api-workload").
+		WithData(suite.T(), &pbcatalog.Workload{
+			Ports: map[string]*pbcatalog.WorkloadPort{
+				"http1":              {Port: 8080},
+				"http2":              {Port: 9090},
+				"conflict":           {Port: 9091},
+				"not-selected":       {Port: 8081},
+				"specified-protocol": {Port: 8082, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
+				"mesh":               {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+			},
+		}).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Build()
 
-		decWorkload := resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload)
+	decWorkload := resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload)
 
-		expWorkloadPorts := map[string]*pbcatalog.WorkloadPort{
-			// This protocol should be inherited from service 1.
-			"http1": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
+	expWorkloadPorts := map[string]*pbcatalog.WorkloadPort{
+		// This protocol should be inherited from service 1.
+		"http1": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
 
-			// this protocol should be inherited from service 2.
-			"http2": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
+		// this protocol should be inherited from service 2.
+		"http2": {Port: 9090, Protocol: pbcatalog.Protocol_PROTOCOL_HTTP2},
 
-			// This port is not selected by the service and should default to tcp.
-			"not-selected": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
+		// This port is not selected by the service and should default to tcp.
+		"not-selected": {Port: 8081, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
 
-			// This port has conflicting protocols in each service and so it should default to tcp.
-			"conflict": {Port: 9091, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
+		// This port has conflicting protocols in each service and so it should default to tcp.
+		"conflict": {Port: 9091, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
 
-			// These port should keep its existing protocol.
-			"specified-protocol": {Port: 8082, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
-			"mesh":               {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-		}
+		// These port should keep its existing protocol.
+		"specified-protocol": {Port: 8082, Protocol: pbcatalog.Protocol_PROTOCOL_GRPC},
+		"mesh":               {Port: 20000, Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
+	}
 
-		workloadPorts, err := ctrl.workloadPortProtocolsFromService(suite.ctx, dataFetcher, decWorkload, suite.runtime.Logger)
-		require.NoError(suite.T(), err)
+	workloadPorts, err := ctrl.workloadPortProtocolsFromService(suite.ctx, dataFetcher, decWorkload, suite.runtime.Logger)
+	require.NoError(suite.T(), err)
 
-		prototest.AssertDeepEqual(suite.T(), expWorkloadPorts, workloadPorts)
-	})
+	prototest.AssertDeepEqual(suite.T(), expWorkloadPorts, workloadPorts)
 }
 
 func (suite *controllerTestSuite) TestReconcile_NoWorkload() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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", tenancy),
-		})
-		require.NoError(suite.T(), err)
-
-		suite.client.RequireResourceNotFound(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, "not-found", tenancy))
+	// 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 *controllerTestSuite) TestReconcile_NonMeshWorkload() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// This test ensures that non-mesh workloads are ignored by the controller.
+	// 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},
+	nonMeshWorkload := &pbcatalog.Workload{
+		Addresses: []*pbcatalog.WorkloadAddress{
+			{
+				Host: "10.0.0.1",
 			},
-		}
-
-		resourcetest.Resource(pbcatalog.WorkloadType, "test-non-mesh-api-workload").
-			WithData(suite.T(), nonMeshWorkload).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client.ResourceServiceClient)
+		},
+		Ports: map[string]*pbcatalog.WorkloadPort{
+			"tcp": {Port: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
+		},
+	}
 
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: resourceID(pbmesh.ProxyStateTemplateType, "test-non-mesh-api-workload", tenancy),
-		})
+	resourcetest.Resource(pbcatalog.WorkloadType, "test-non-mesh-api-workload").
+		WithData(suite.T(), nonMeshWorkload).
+		Write(suite.T(), suite.client.ResourceServiceClient)
 
-		require.NoError(suite.T(), err)
-		suite.client.RequireResourceNotFound(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, "test-non-mesh-api-workload", tenancy))
+	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 *controllerTestSuite) TestReconcile_NoExistingProxyStateTemplate() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-
-		api := suite.api[toTenancyKey(tenancy)]
-
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: resourceID(pbmesh.ProxyStateTemplateType, api.workloadID.Name, tenancy),
-		})
-		require.NoError(suite.T(), err)
-
-		res := suite.client.RequireResourceExists(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, api.workloadID.Name, tenancy))
-		require.NoError(suite.T(), err)
-		require.NotNil(suite.T(), res.Data)
-		prototest.AssertDeepEqual(suite.T(), api.workloadID, res.Owner)
+	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 *controllerTestSuite) TestReconcile_ExistingProxyStateTemplate_WithUpdates() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// This test ensures that we write a new proxy state template when there are changes.
-		api := suite.api[toTenancyKey(tenancy)]
-
-		// Write the original.
-		resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").
-			WithData(suite.T(), api.proxyStateTemplate).
-			WithOwner(api.workloadID).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client.ResourceServiceClient)
+	// This test ensures that we write a new proxy state template when there are changes.
 
-		// Update the apiWorkload and check that we default the port to tcp if it's unspecified.
-		api.workload.Ports["tcp"].Protocol = pbcatalog.Protocol_PROTOCOL_UNSPECIFIED
+	// Write the original.
+	resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").
+		WithData(suite.T(), suite.proxyStateTemplate).
+		WithOwner(suite.apiWorkloadID).
+		Write(suite.T(), suite.client.ResourceServiceClient)
 
-		updatedWorkloadID := resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-			WithTenancy(tenancy).
-			WithData(suite.T(), api.workload).
-			Write(suite.T(), suite.client.ResourceServiceClient).Id
+	// Update the apiWorkload and check that we default the port to tcp if it's unspecified.
+	suite.apiWorkload.Ports["tcp"].Protocol = pbcatalog.Protocol_PROTOCOL_UNSPECIFIED
 
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: resourceID(pbmesh.ProxyStateTemplateType, updatedWorkloadID.Name, tenancy),
-		})
-		require.NoError(suite.T(), err)
+	updatedWorkloadID := resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
+		WithData(suite.T(), suite.apiWorkload).
+		Write(suite.T(), suite.client.ResourceServiceClient).Id
 
-		res := suite.client.RequireResourceExists(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, updatedWorkloadID.Name, tenancy))
-		require.NoError(suite.T(), err)
-		require.NotNil(suite.T(), res.Data)
-		prototest.AssertDeepEqual(suite.T(), updatedWorkloadID, res.Owner)
+	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: resourceID(pbmesh.ProxyStateTemplateType, updatedWorkloadID.Name),
+	})
+	require.NoError(suite.T(), err)
 
-		var updatedProxyStateTemplate pbmesh.ProxyStateTemplate
-		err = res.Data.UnmarshalTo(&updatedProxyStateTemplate)
-		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)
 
-		// Check that our value is updated in the proxy state template.
-		require.Len(suite.T(), updatedProxyStateTemplate.ProxyState.Listeners, 1)
-		require.Len(suite.T(), updatedProxyStateTemplate.ProxyState.Listeners[0].Routers, 1)
+	var updatedProxyStateTemplate pbmesh.ProxyStateTemplate
+	err = res.Data.UnmarshalTo(&updatedProxyStateTemplate)
+	require.NoError(suite.T(), err)
 
-		l4InboundRouter := updatedProxyStateTemplate.ProxyState.Listeners[0].
-			Routers[0].GetL4()
-		require.NotNil(suite.T(), l4InboundRouter)
-	})
+	// Check that our value is updated in the proxy state template.
+	require.Len(suite.T(), updatedProxyStateTemplate.ProxyState.Listeners, 1)
+	require.Len(suite.T(), updatedProxyStateTemplate.ProxyState.Listeners[0].Routers, 1)
+
+	l4InboundRouter := updatedProxyStateTemplate.ProxyState.Listeners[0].
+		Routers[0].GetL4()
+	require.NotNil(suite.T(), l4InboundRouter)
 }
 
 func (suite *controllerTestSuite) TestReconcile_ExistingProxyStateTemplate_NoUpdates() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// This test ensures that we skip writing of the proxy state template when there are no changes to it.
-		api := suite.api[toTenancyKey(tenancy)]
-
-		// Write the original.
-		originalProxyState := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").
-			WithData(suite.T(), api.proxyStateTemplate).
-			WithOwner(api.workloadID).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client.ResourceServiceClient)
+	// This test ensures that we skip writing of the proxy state template when there are no changes to it.
 
-		// Update the metadata on the apiWorkload which should result in no changes.
-		updatedWorkloadID := resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
-			WithData(suite.T(), api.workload).
-			WithMeta("some", "meta").
-			Write(suite.T(), suite.client.ResourceServiceClient).Id
+	// Write the original.
+	originalProxyState := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").
+		WithData(suite.T(), suite.proxyStateTemplate).
+		WithOwner(suite.apiWorkloadID).
+		Write(suite.T(), suite.client.ResourceServiceClient)
 
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: resourceID(pbmesh.ProxyStateTemplateType, updatedWorkloadID.Name, tenancy),
-		})
-		require.NoError(suite.T(), err)
+	// 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
 
-		updatedProxyState := suite.client.RequireResourceExists(suite.T(), resourceID(pbmesh.ProxyStateTemplateType, api.workloadID.Name, tenancy))
-		resourcetest.RequireVersionUnchanged(suite.T(), updatedProxyState, originalProxyState.Version)
+	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 *controllerTestSuite) 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.
@@ -583,339 +508,295 @@ func (suite *controllerTestSuite) TestController() {
 	mgr.SetRaftLeader(true)
 	go mgr.Run(suite.ctx)
 
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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.
+	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()
 
-		api := suite.api[toTenancyKey(tenancy)]
+		apiComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.apiService.Id)
+		dbComputedRoutesID  = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.dbService.Id)
 
-		// Run the controller manager
-		var (
-			// Create proxy state template IDs to check against in this test.
-			apiProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "api-abc").WithTenancy(tenancy).ID()
-			webProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "web-def").WithTenancy(tenancy).ID()
+		apiProxyStateTemplate   *pbresource.Resource
+		webProxyStateTemplate   *pbresource.Resource
+		webComputedDestinations *pbresource.Resource
+	)
 
-			apiComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, api.service.Id)
-			dbComputedRoutesID  = resource.ReplaceType(pbmesh.ComputedRoutesType, suite.dbService.Id)
+	// Check that proxy state template resource is generated for both the api and web workloads.
+	retry.Run(suite.T(), func(r *retry.R) {
+		suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
+		webProxyStateTemplate = suite.client.RequireResourceExists(r, webProxyStateTemplateID)
+		apiProxyStateTemplate = suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
+	})
 
-			apiProxyStateTemplate   *pbresource.Resource
-			webProxyStateTemplate   *pbresource.Resource
-			webComputedDestinations *pbresource.Resource
-		)
+	// Write a default ComputedRoutes for api.
+	routestest.ReconcileComputedRoutes(suite.T(), suite.client, apiComputedRoutesID,
+		resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.apiService),
+	)
+
+	// Add a source service and check that a new proxy state is generated.
+	webComputedDestinations = resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webWorkload.Id.Name).
+		WithData(suite.T(), &pbmesh.ComputedExplicitDestinations{
+			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)
+
+	testutil.RunStep(suite.T(), "add explicit destinations and check that new proxy state is generated", func(t *testing.T) {
+		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
 
-		// Check that proxy state template resource is generated for both the api and web workloads.
-		retry.Run(suite.T(), func(r *retry.R) {
-			suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
-			webProxyStateTemplate = suite.client.RequireResourceExists(r, webProxyStateTemplateID)
-			apiProxyStateTemplate = suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
+		suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
+			requireExplicitDestinationsFound(rt, "api", tmpl)
 		})
+	})
 
-		// Write a default ComputedRoutes for api.
-		for _, api := range suite.api {
-			crID := resource.ReplaceType(pbmesh.ComputedRoutesType, api.service.Id)
-			routestest.ReconcileComputedRoutes(suite.T(), suite.client, crID,
-				resourcetest.MustDecode[*pbcatalog.Service](suite.T(), api.service),
-			)
+	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},
 		}
 
-		var destinations []*pbmesh.Destination
-		var i uint32
-		for _, t := range suite.tenancies {
-			destinations = append(destinations, &pbmesh.Destination{
-				DestinationRef:  resource.Reference(suite.api[toTenancyKey(t)].service.Id, ""),
-				DestinationPort: "tcp",
-				ListenAddr: &pbmesh.Destination_IpPort{
-					IpPort: &pbmesh.IPPortAddress{
-						Ip:   "127.0.0.1",
-						Port: 1234 + i,
+		// 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",
 					},
 				},
-			})
-			i++
-		}
+			}).
+			Write(suite.T(), suite.client.ResourceServiceClient)
 
-		// Add a source service and check that a new proxy state is generated.
-		webComputedDestinations = resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webWorkload.Id.Name).
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbmesh.ComputedExplicitDestinations{
-				Destinations: destinations,
-			}).Write(suite.T(), suite.client)
+		// 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),
+		)
 
-		testutil.RunStep(suite.T(), "add explicit destinations and check that new proxy state is generated", func(t *testing.T) {
-			webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
+		// Check that api proxy template is gone.
+		retry.Run(t, func(r *retry.R) {
+			suite.client.RequireResourceNotFound(r, apiProxyStateTemplateID)
+		})
 
-			suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
-				for _, data := range suite.api {
-					requireExplicitDestinationsFound(t, data.destinationListenerName, data.destinationClusterName, tmpl)
-				}
-			})
+		// We should get a new web proxy template resource because this destination should be removed.
+		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
+
+		suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
+			requireExplicitDestinationsNotFound(rt, "api", tmpl)
 		})
+	})
 
-		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},
-			}
+	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")
 
-			// 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").
-				WithTenancy(tenancy).
-				WithData(suite.T(), &pbcatalog.Workload{
-					Identity:  "api-identity",
-					Addresses: api.workload.Addresses,
-					Ports:     nonMeshPorts}).
-				Write(suite.T(), suite.client)
-
-			api.service = resourcetest.ResourceID(api.service.Id).
-				WithTenancy(tenancy).
-				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").
-				WithTenancy(tenancy).
-				WithData(suite.T(), &pbcatalog.ServiceEndpoints{
-					Endpoints: []*pbcatalog.Endpoint{
-						{
-							TargetRef: api.workloadID,
-							Addresses: api.workload.Addresses,
-							Ports:     nonMeshPorts,
-							Identity:  "api-identity",
-						},
-					},
-				}).
-				Write(suite.T(), suite.client.ResourceServiceClient)
+		resourcetest.Resource(pbcatalog.WorkloadType, "api-abc").
+			WithData(suite.T(), suite.apiWorkload).
+			Write(suite.T(), suite.client)
 
-			// Refresh the computed routes in light of api losing a mesh port.
-			routestest.ReconcileComputedRoutes(suite.T(), suite.client, apiComputedRoutesID,
-				resourcetest.MustDecode[*pbcatalog.Service](t, api.service),
-			)
+		suite.apiService = resourcetest.Resource(pbcatalog.ServiceType, "api-service").
+			WithData(suite.T(), suite.apiServiceData).
+			Write(suite.T(), suite.client.ResourceServiceClient)
 
-			// Check that api proxy template is gone.
-			retry.Run(t, func(r *retry.R) {
-				suite.client.RequireResourceNotFound(r, apiProxyStateTemplateID)
-			})
+		resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-service").
+			WithData(suite.T(), suite.apiEndpointsData).
+			Write(suite.T(), suite.client.ResourceServiceClient)
 
-			// We should get a new web proxy template resource because this destination should be removed.
-			webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
+		// 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),
+		)
 
-			suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
-				requireExplicitDestinationsNotFound(t, api.destinationListenerName, api.destinationClusterName, tmpl)
-			})
-		})
+		// We should also get a new web proxy template resource as this destination should be added again.
+		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
 
-		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").
-				WithTenancy(tenancy).
-				WithData(suite.T(), api.workload).
-				Write(suite.T(), suite.client)
-
-			api.service = resourcetest.Resource(pbcatalog.ServiceType, "api-service").
-				WithData(suite.T(), api.serviceData).
-				WithTenancy(tenancy).
-				Write(suite.T(), suite.client.ResourceServiceClient)
-
-			resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-service").
-				WithTenancy(tenancy).
-				WithData(suite.T(), api.endpointsData).
-				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, api.service),
-			)
-
-			// We should also get a new web proxy template resource as this destination should be added again.
-			webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
-
-			suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
-				for _, data := range suite.api {
-					requireExplicitDestinationsFound(t, data.destinationListenerName, data.destinationClusterName, tmpl)
-				}
-			})
+		suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
+			requireExplicitDestinationsFound(rt, "api", tmpl)
 		})
+	})
 
-		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)
+	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)
+		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
 
-			suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
-				for _, data := range suite.api {
-					requireExplicitDestinationsFound(t, data.destinationListenerName, data.destinationClusterName, tmpl)
-				}
-			})
+		suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
+			requireExplicitDestinationsFound(rt, "api", tmpl)
 		})
+	})
 
-		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: webComputedDestinations.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.ComputedProxyConfigurationType, suite.webWorkload.Id.Name).
-				WithTenancy(tenancy).
-				WithData(t, &pbmesh.ComputedProxyConfiguration{
-					DynamicConfig: &pbmesh.DynamicConfig{
-						Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
-						TransparentProxy: &pbmesh.TransparentProxy{
-							OutboundListenerPort: 15001,
-						},
+	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: webComputedDestinations.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.ComputedProxyConfigurationType, suite.webWorkload.Id.Name).
+			WithData(t, &pbmesh.ComputedProxyConfiguration{
+				DynamicConfig: &pbmesh.DynamicConfig{
+					Mode: pbmesh.ProxyMode_PROXY_MODE_TRANSPARENT,
+					TransparentProxy: &pbmesh.TransparentProxy{
+						OutboundListenerPort: 15001,
 					},
-				}).Write(suite.T(), suite.client)
+				},
+			}).Write(suite.T(), suite.client)
 
-			webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
-			apiProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), apiProxyStateTemplateID, apiProxyStateTemplate.Version)
+		webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
+		apiProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), apiProxyStateTemplateID, apiProxyStateTemplate.Version)
 
-			suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
-				listenerNameDb := fmt.Sprintf("%s/local/%s/db-service", tenancy.Partition, tenancy.Namespace)
-				clusterNameDb := fmt.Sprintf("db-service.%s.%s", tenancy.Namespace, tenancy.Partition)
-				if tenancy.Partition == "default" {
-					clusterNameDb = fmt.Sprintf("db-service.%s", tenancy.Namespace)
-				}
-				requireImplicitDestinationsFound(t, api.destinationListenerName, api.destinationClusterName, tmpl)
-				requireImplicitDestinationsFound(t, listenerNameDb, clusterNameDb, tmpl)
-			})
+		suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
+			requireImplicitDestinationsFound(rt, "api", tmpl)
+			requireImplicitDestinationsFound(rt, "db", tmpl)
 		})
+	})
 
-		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)
+	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: api.computedTrafficPermissions.Id})
-			require.NoError(t, err)
-			suite.client.WaitForDeletion(t, api.computedTrafficPermissions.Id)
+		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(suite.T(), apiProxyStateTemplateID, apiProxyStateTemplate.Version)
+		apiProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), apiProxyStateTemplateID, apiProxyStateTemplate.Version)
 
-			suite.runtime.Logger.Trace("creating computed traffic permissions")
-			resourcetest.Resource(pbauth.ComputedTrafficPermissionsType, api.workload.Identity).
-				WithTenancy(tenancy).
-				WithData(t, api.computedTrafficPermissionsData).
-				Write(t, suite.client)
+		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)
-		})
+		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(api.service.Id, ""),
-								Port: "tcp",
-							},
-							Weight: 60,
+	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",
 						},
-						{
-							BackendRef: &pbmesh.BackendReference{
-								Ref:  resource.Reference(suite.dbService.Id, ""),
-								Port: "", // assumed to be 'http'
-							},
-							Weight: 40,
+						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(tenancy).
-				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, api.service),
-			)
-			require.NotNil(t, dbCR, "computed routes for db was deleted instead of created")
-
-			webProxyStateTemplate = suite.client.WaitForNewVersion(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
-
-			suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
-				listenerNameDb := fmt.Sprintf("%s/local/%s/db-service", tenancy.Partition, tenancy.Namespace)
-				clusterNameDb := fmt.Sprintf("db-service.%s.%s", tenancy.Namespace, tenancy.Partition)
-				if tenancy.Partition == "default" {
-					clusterNameDb = fmt.Sprintf("db-service.%s", tenancy.Namespace)
-				}
-				requireImplicitDestinationsFound(t, api.destinationListenerName, api.destinationClusterName, tmpl)
-				requireImplicitDestinationsFound(t, listenerNameDb, clusterNameDb, tmpl)
-			})
+				},
+			}},
+		}
+		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(suite.T(), webProxyStateTemplateID, webProxyStateTemplate.Version)
+
+		suite.waitForProxyStateTemplateState(t, webProxyStateTemplateID, func(rt resourcetest.T, tmpl *pbmesh.ProxyStateTemplate) {
+			requireImplicitDestinationsFound(rt, "api", tmpl)
+			requireImplicitDestinationsFound(rt, "db", tmpl)
 		})
 	})
 }
 
 func (suite *controllerTestSuite) TestControllerDefaultAllow() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Run the controller manager
-		mgr := controller.NewManager(suite.client, suite.runtime.Logger)
-
-		// Initialize controller dependencies.
-		c := cache.New()
-		trustDomainFetcher := func() (string, error) { return "test.consul", nil }
-
-		mgr.Register(Controller(c, 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").WithTenancy(tenancy).ID()
-			webProxyStateTemplateID = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "web-def").WithTenancy(tenancy).ID()
-		)
+	// Run the controller manager
+	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
 
-		retry.Run(suite.T(), func(r *retry.R) {
-			webProxyStateTemplate := suite.client.RequireResourceExists(r, webProxyStateTemplateID)
-			apiProxyStateTemplate := suite.client.RequireResourceExists(r, apiProxyStateTemplateID)
+	// Initialize controller dependencies.
+	c := cache.New()
+	trustDomainFetcher := func() (string, error) { return "test.consul", nil }
 
-			// Default deny because api has non-empty computed traffic permissions.
-			assertTrafficPermissionDefaultPolicy(r, false, apiProxyStateTemplate)
-			assertTrafficPermissionDefaultPolicy(r, true, webProxyStateTemplate)
-		})
+	mgr.Register(Controller(c, 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)
 	})
 }
 
@@ -923,21 +804,21 @@ func TestMeshController(t *testing.T) {
 	suite.Run(t, new(controllerTestSuite))
 }
 
-func requireExplicitDestinationsFound(t *testing.T, listenerName, clusterName string, tmpl *pbmesh.ProxyStateTemplate) {
-	requireExplicitDestinations(t, listenerName, clusterName, tmpl, true)
+func requireExplicitDestinationsFound(t resourcetest.T, name string, tmpl *pbmesh.ProxyStateTemplate) {
+	requireExplicitDestinations(t, name, tmpl, true)
 }
 
-func requireExplicitDestinationsNotFound(t *testing.T, listenerName, clusterName string, tmpl *pbmesh.ProxyStateTemplate) {
-	requireExplicitDestinations(t, listenerName, clusterName, tmpl, false)
+func requireExplicitDestinationsNotFound(t resourcetest.T, name string, tmpl *pbmesh.ProxyStateTemplate) {
+	requireExplicitDestinations(t, name, tmpl, false)
 }
 
-func requireExplicitDestinations(t resourcetest.T, listenerName string, clusterName string, tmpl *pbmesh.ProxyStateTemplate, found bool) {
+func requireExplicitDestinations(t resourcetest.T, name string, tmpl *pbmesh.ProxyStateTemplate, found bool) {
 	t.Helper()
 
 	// Check outbound listener.
 	var foundListener bool
 	for _, l := range tmpl.ProxyState.Listeners {
-		if l.Name == listenerName && l.Direction == pbproxystate.Direction_DIRECTION_OUTBOUND {
+		if strings.Contains(l.Name, name) && l.Direction == pbproxystate.Direction_DIRECTION_OUTBOUND {
 			foundListener = true
 			break
 		}
@@ -945,10 +826,10 @@ func requireExplicitDestinations(t resourcetest.T, listenerName string, clusterN
 
 	require.Equal(t, found, foundListener)
 
-	requireClustersAndEndpoints(t, clusterName, tmpl, found)
+	requireClustersAndEndpoints(t, name, tmpl, found)
 }
 
-func requireImplicitDestinationsFound(t resourcetest.T, listenerName string, clusterName string, tmpl *pbmesh.ProxyStateTemplate) {
+func requireImplicitDestinationsFound(t resourcetest.T, name string, tmpl *pbmesh.ProxyStateTemplate) {
 	t.Helper()
 
 	// Check outbound listener.
@@ -971,7 +852,7 @@ func requireImplicitDestinationsFound(t resourcetest.T, listenerName string, clu
 				case *pbproxystate.Router_L7:
 					require.NotNil(t, x.L7.Route)
 					routerName := x.L7.Route.Name
-					foundByName = strings.Contains(routerName, listenerName)
+					foundByName = strings.Contains(routerName, name)
 				default:
 					t.Fatalf("unexpected type of destination: %T", r.Destination)
 				}
@@ -988,15 +869,15 @@ func requireImplicitDestinationsFound(t resourcetest.T, listenerName string, clu
 	}
 	require.True(t, foundListener)
 
-	requireClustersAndEndpoints(t, clusterName, tmpl, true)
+	requireClustersAndEndpoints(t, name, tmpl, true)
 }
 
-func requireClustersAndEndpoints(t resourcetest.T, clusterName string, tmpl *pbmesh.ProxyStateTemplate, found bool) {
+func requireClustersAndEndpoints(t resourcetest.T, name string, tmpl *pbmesh.ProxyStateTemplate, found bool) {
 	t.Helper()
 
 	var foundCluster bool
 	for c := range tmpl.ProxyState.Clusters {
-		if strings.Contains(c, clusterName) {
+		if strings.Contains(c, name) {
 			foundCluster = true
 			break
 		}
@@ -1006,7 +887,7 @@ func requireClustersAndEndpoints(t resourcetest.T, clusterName string, tmpl *pbm
 
 	var foundEndpoints bool
 	for c := range tmpl.RequiredEndpoints {
-		if strings.Contains(c, clusterName) {
+		if strings.Contains(c, name) {
 			foundEndpoints = true
 			break
 		}
@@ -1025,11 +906,15 @@ func (suite *controllerTestSuite) waitForProxyStateTemplateState(t *testing.T, i
 	})
 }
 
-func resourceID(rtype *pbresource.Type, name string, tenancy *pbresource.Tenancy) *pbresource.ID {
+func resourceID(rtype *pbresource.Type, name string) *pbresource.ID {
 	return &pbresource.ID{
-		Type:    rtype,
-		Tenancy: tenancy,
-		Name:    name,
+		Type: rtype,
+		Tenancy: &pbresource.Tenancy{
+			Partition: "default",
+			Namespace: "default",
+			PeerName:  "local",
+		},
+		Name: name,
 	}
 }
 
@@ -1047,33 +932,3 @@ func assertTrafficPermissionDefaultPolicy(t resourcetest.T, defaultAllow bool, r
 	require.NotNil(t, l4)
 	require.Equal(t, defaultAllow, l4.TrafficPermissions.DefaultAllow)
 }
-
-func (suite *controllerTestSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
-
-func (suite *controllerTestSuite) cleanupResources() {
-
-	for _, api := range suite.api {
-		suite.client.MustDelete(suite.T(), api.workloadID)
-		suite.client.MustDelete(suite.T(), api.computedTrafficPermissions.Id)
-		suite.client.MustDelete(suite.T(), api.service.Id)
-		suite.client.MustDelete(suite.T(), api.endpoints.Id)
-	}
-	suite.client.MustDelete(suite.T(), suite.webWorkload.Id)
-	suite.client.MustDelete(suite.T(), suite.dbWorkloadID)
-	suite.client.MustDelete(suite.T(), suite.dbService.Id)
-	suite.client.MustDelete(suite.T(), suite.dbEndpoints.Id)
-}
-
-func (suite *controllerTestSuite) runTestCaseWithTenancies(t func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			suite.setupSuiteWithTenancy(tenancy)
-			suite.T().Cleanup(func() {
-				suite.cleanupResources()
-			})
-			t(tenancy)
-		})
-	}
-}
diff --git a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher_test.go b/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher_test.go
index c9cdd5475113c..457fa393b43f1 100644
--- a/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher_test.go
+++ b/internal/mesh/internal/controllers/sidecarproxy/fetcher/data_fetcher_test.go
@@ -5,7 +5,6 @@ package fetcher
 
 import (
 	"context"
-	"fmt"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -31,10 +30,9 @@ import (
 type dataFetcherSuite struct {
 	suite.Suite
 
-	ctx            context.Context
-	client         pbresource.ResourceServiceClient
-	resourceClient *resourcetest.Client
-	rt             controller.Runtime
+	ctx    context.Context
+	client pbresource.ResourceServiceClient
+	rt     controller.Runtime
 
 	api1Service                 *pbresource.Resource
 	api1ServiceData             *pbcatalog.Service
@@ -47,24 +45,16 @@ type dataFetcherSuite struct {
 	webComputedDestinationsData *pbmesh.ComputedExplicitDestinations
 	webProxy                    *pbresource.Resource
 	webWorkload                 *pbresource.Resource
-	tenancies                   []*pbresource.Tenancy
 }
 
 func (suite *dataFetcherSuite) SetupTest() {
 	suite.ctx = testutil.TestContext(suite.T())
-	suite.tenancies = resourcetest.TestTenancies()
-	suite.client = svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		WithTenancies(suite.tenancies...).
-		Run(suite.T())
-	suite.resourceClient = resourcetest.NewClient(suite.client)
+	suite.client = svctest.RunResourceService(suite.T(), types.Register, catalog.RegisterTypes)
 	suite.rt = controller.Runtime{
 		Client: suite.client,
 		Logger: testutil.Logger(suite.T()),
 	}
-}
 
-func (suite *dataFetcherSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 	suite.api1ServiceData = &pbcatalog.Service{
 		Ports: []*pbcatalog.ServicePort{
 			{TargetPort: "tcp", VirtualPort: 8080, Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
@@ -72,7 +62,6 @@ func (suite *dataFetcherSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 		},
 	}
 	suite.api1Service = resourcetest.Resource(pbcatalog.ServiceType, "api-1").
-		WithTenancy(tenancy).
 		WithData(suite.T(), suite.api1ServiceData).
 		Write(suite.T(), suite.client)
 
@@ -89,7 +78,6 @@ func (suite *dataFetcherSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 		},
 	}
 	suite.api1ServiceEndpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-1").
-		WithTenancy(tenancy).
 		WithData(suite.T(), suite.api1ServiceEndpointsData).
 		Write(suite.T(), suite.client)
 
@@ -101,7 +89,6 @@ func (suite *dataFetcherSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 		},
 	}
 	suite.api2Service = resourcetest.Resource(pbcatalog.ServiceType, "api-2").
-		WithTenancy(tenancy).
 		WithData(suite.T(), suite.api2ServiceData).
 		Write(suite.T(), suite.client)
 
@@ -119,7 +106,6 @@ func (suite *dataFetcherSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 		},
 	}
 	suite.api2ServiceEndpoints = resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-2").
-		WithTenancy(tenancy).
 		WithData(suite.T(), suite.api2ServiceEndpointsData).
 		Write(suite.T(), suite.client)
 
@@ -141,12 +127,10 @@ func (suite *dataFetcherSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 	}
 
 	suite.webProxy = resourcetest.Resource(pbmesh.ProxyStateTemplateType, "web-abc").
-		WithTenancy(tenancy).
 		WithData(suite.T(), &pbmesh.ProxyStateTemplate{}).
 		Write(suite.T(), suite.client)
 
 	suite.webWorkload = resourcetest.Resource(pbcatalog.WorkloadType, "web-abc").
-		WithTenancy(tenancy).
 		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}},
@@ -155,384 +139,259 @@ func (suite *dataFetcherSuite) setupWithTenancy(tenancy *pbresource.Tenancy) {
 }
 
 func (suite *dataFetcherSuite) TestFetcher_FetchWorkload_WorkloadNotFound() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		identityID := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-abc").
-			WithTenancy(tenancy).ID()
+	identityID := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-abc").ID()
 
-		// Create cache and pre-populate it.
-		c := cache.New()
+	// Create cache and pre-populate it.
+	c := cache.New()
 
-		f := Fetcher{
-			cache:  c,
-			client: suite.client,
-		}
+	f := Fetcher{
+		cache:  c,
+		client: suite.client,
+	}
 
-		workloadID := resourcetest.Resource(pbcatalog.WorkloadType, "not-found").WithTenancy(tenancy).ID()
+	workloadID := resourcetest.Resource(pbcatalog.WorkloadType, "not-found").ID()
 
-		// Track workload with its identity.
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, workloadID.GetName()).
-			WithTenancy(tenancy).
-			WithData(suite.T(), &pbcatalog.Workload{
-				Identity: identityID.Name,
-			}).Build()
+	// Track workload with its identity.
+	workload := resourcetest.Resource(pbcatalog.WorkloadType, workloadID.GetName()).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		WithData(suite.T(), &pbcatalog.Workload{
+			Identity: identityID.Name,
+		}).Build()
 
-		c.TrackWorkload(resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload))
+	c.TrackWorkload(resourcetest.MustDecode[*pbcatalog.Workload](suite.T(), workload))
 
-		// Now fetch the workload so that we can check that it's been removed from cache.
-		_, err := f.FetchWorkload(context.Background(), workloadID)
-		require.NoError(suite.T(), err)
-		require.Nil(suite.T(), c.WorkloadsByWorkloadIdentity(identityID))
-	})
+	// Now fetch the workload so that we can check that it's been removed from cache.
+	_, err := f.FetchWorkload(context.Background(), workloadID)
+	require.NoError(suite.T(), err)
+	require.Nil(suite.T(), c.WorkloadsByWorkloadIdentity(identityID))
 }
 
 func (suite *dataFetcherSuite) TestFetcher_FetchWorkload_WorkloadFound() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		identityID := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-abc").
-			WithTenancy(tenancy).ID()
+	identityID := resourcetest.Resource(pbauth.WorkloadIdentityType, "workload-identity-abc").ID()
 
-		// Create cache and pre-populate it.
-		c := cache.New()
+	// Create cache and pre-populate it.
+	c := cache.New()
 
-		f := Fetcher{
-			cache:  c,
-			client: suite.client,
-		}
+	f := Fetcher{
+		cache:  c,
+		client: suite.client,
+	}
 
-		workload := resourcetest.Resource(pbcatalog.WorkloadType, "service-workload-abc").
-			WithTenancy(tenancy).
-			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"},
-					},
+	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)
+			},
+		}).Write(suite.T(), suite.client)
 
-		// This call should track the workload's identity
-		_, err := f.FetchWorkload(context.Background(), workload.Id)
-		require.NoError(suite.T(), err)
+	// This call should track the workload's identity
+	_, err := f.FetchWorkload(context.Background(), workload.Id)
+	require.NoError(suite.T(), err)
 
-		// Check that the workload is tracked
-		workload.Id.Uid = ""
-		prototest.AssertElementsMatch(suite.T(), []*pbresource.ID{workload.Id}, c.WorkloadsByWorkloadIdentity(identityID))
-	})
+	// Check that the workload is tracked
+	workload.Id.Uid = ""
+	prototest.AssertElementsMatch(suite.T(), []*pbresource.ID{workload.Id}, c.WorkloadsByWorkloadIdentity(identityID))
 }
 
 func (suite *dataFetcherSuite) TestFetcher_FetchExplicitDestinationsData() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		c := cache.New()
+	c := cache.New()
 
-		var (
-			api1ServiceRef = resource.Reference(suite.api1Service.Id, "")
-		)
+	var (
+		api1ServiceRef = resource.Reference(suite.api1Service.Id, "")
+	)
 
-		f := Fetcher{
-			cache:  c,
-			client: suite.client,
-		}
+	f := Fetcher{
+		cache:  c,
+		client: suite.client,
+	}
 
-		testutil.RunStep(suite.T(), "computed destinations not found", func(t *testing.T) {
-			// First add computed destination to cache so we can check if it's untracked later.
-			compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
-				WithData(t, &pbmesh.ComputedExplicitDestinations{
-					Destinations: []*pbmesh.Destination{
-						{
-							DestinationRef:  api1ServiceRef,
-							DestinationPort: "tcp1",
-						},
-					},
-				}).
-				WithTenancy(tenancy).
-				Build()
-			c.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDest))
-
-			// We will try to fetch explicit destinations for a proxy that doesn't have one.
-			destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
-			require.NoError(t, err)
-			require.Nil(t, destinations)
-
-			// Check that cache no longer has this destination.
-			require.Nil(t, c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef)))
-		})
-
-		testutil.RunStep(suite.T(), "invalid destinations: service not found", func(t *testing.T) {
-			notFoundServiceRef := resourcetest.Resource(pbcatalog.ServiceType, "not-found").
-				WithTenancy(tenancy).
-				ReferenceNoSection()
-
-			compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
-				WithData(t, &pbmesh.ComputedExplicitDestinations{
-					Destinations: []*pbmesh.Destination{
-						{
-							DestinationRef:  notFoundServiceRef,
-							DestinationPort: "tcp",
-						},
+	testutil.RunStep(suite.T(), "computed destinations not found", func(t *testing.T) {
+		// First add computed destination to cache so we can check if it's untracked later.
+		compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
+			WithData(t, &pbmesh.ComputedExplicitDestinations{
+				Destinations: []*pbmesh.Destination{
+					{
+						DestinationRef:  api1ServiceRef,
+						DestinationPort: "tcp1",
 					},
-				}).
-				WithTenancy(tenancy).
-				Write(t, suite.client)
-
-			destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
-			require.NoError(t, err)
-			require.Nil(t, destinations)
-			cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(notFoundServiceRef))
-			compDest.Id.Uid = ""
-			prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
-		})
-
-		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},
 				},
-			}
-			resourcetest.ResourceID(suite.api1Service.Id).
-				WithTenancy(tenancy).
-				WithData(t, apiNonMeshServiceData).
-				Write(t, suite.client)
-			compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
-				WithData(t, &pbmesh.ComputedExplicitDestinations{
-					Destinations: []*pbmesh.Destination{
-						{
-							DestinationRef:  api1ServiceRef,
-							DestinationPort: "tcp",
-						},
-					},
-				}).
-				WithTenancy(tenancy).
-				Write(t, suite.client)
-
-			destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
-			require.NoError(t, err)
-			require.Nil(t, destinations)
-			cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
-			compDest.Id.Uid = ""
-			prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
-		})
-
-		testutil.RunStep(suite.T(), "invalid destinations: destination port not found", func(t *testing.T) {
-			resourcetest.ResourceID(suite.api1Service.Id).
-				WithData(t, &pbcatalog.Service{
-					Ports: []*pbcatalog.ServicePort{
-						{TargetPort: "some-other-port", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
-						{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
-					},
-				}).
-				WithTenancy(tenancy).
-				Write(t, suite.client)
-			compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
-				WithData(t, &pbmesh.ComputedExplicitDestinations{
-					Destinations: []*pbmesh.Destination{
-						{
-							DestinationRef:  api1ServiceRef,
-							DestinationPort: "tcp",
-						},
-					},
-				}).
-				WithTenancy(tenancy).
-				Write(t, suite.client)
-
-			destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
-			require.NoError(t, err)
-			require.Nil(t, destinations)
-			cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
-			compDest.Id.Uid = ""
-			prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
-		})
-
-		suite.api1Service = resourcetest.ResourceID(suite.api1Service.Id).
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.api1ServiceData).
-			Write(suite.T(), suite.client)
-
-		suite.api2Service = resourcetest.ResourceID(suite.api2Service.Id).
-			WithTenancy(tenancy).
-			WithData(suite.T(), suite.api2ServiceData).
-			Write(suite.T(), suite.client)
-
-		testutil.RunStep(suite.T(), "invalid destinations: destination is pointing to a mesh port", func(t *testing.T) {
-			// Create a computed destinations resource pointing to the mesh port.
-			compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
-				WithData(t, &pbmesh.ComputedExplicitDestinations{
-					Destinations: []*pbmesh.Destination{
-						{
-							DestinationRef:  api1ServiceRef,
-							DestinationPort: "mesh",
-						},
-					},
-				}).
-				WithTenancy(tenancy).
-				Write(t, suite.client)
+			}).
+			WithTenancy(resource.DefaultNamespacedTenancy()).
+			Build()
+		c.TrackComputedDestinations(resourcetest.MustDecode[*pbmesh.ComputedExplicitDestinations](t, compDest))
 
-			destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
-			require.NoError(t, err)
-			require.Empty(t, destinations)
+		// We will try to fetch explicit destinations for a proxy that doesn't have one.
+		destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
+		require.NoError(t, err)
+		require.Nil(t, destinations)
 
-			cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
-			compDest.Id.Uid = ""
-			prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
-		})
+		// Check that cache no longer has this destination.
+		require.Nil(t, c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef)))
+	})
+
+	testutil.RunStep(suite.T(), "invalid destinations: service not found", func(t *testing.T) {
+		notFoundServiceRef := resourcetest.Resource(pbcatalog.ServiceType, "not-found").
+			WithTenancy(resource.DefaultNamespacedTenancy()).
+			ReferenceNoSection()
+
+		compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
+			WithData(t, &pbmesh.ComputedExplicitDestinations{
+				Destinations: []*pbmesh.Destination{
+					{
+						DestinationRef:  notFoundServiceRef,
+						DestinationPort: "tcp",
+					},
+				},
+			}).
+			WithTenancy(resource.DefaultNamespacedTenancy()).
+			Write(t, suite.client)
+
+		destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
+		require.NoError(t, err)
+		require.Nil(t, destinations)
+		cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(notFoundServiceRef))
+		compDest.Id.Uid = ""
+		prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
+	})
 
+	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},
+			},
+		}
+		resourcetest.ResourceID(suite.api1Service.Id).
+			WithData(t, apiNonMeshServiceData).
+			Write(t, suite.client)
 		compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
-			WithData(suite.T(), suite.webComputedDestinationsData).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
+			WithData(t, &pbmesh.ComputedExplicitDestinations{
+				Destinations: []*pbmesh.Destination{
+					{
+						DestinationRef:  api1ServiceRef,
+						DestinationPort: "tcp",
+					},
+				},
+			}).
+			WithTenancy(resource.DefaultNamespacedTenancy()).
+			Write(t, suite.client)
+
+		destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
+		require.NoError(t, err)
+		require.Nil(t, destinations)
+		cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
+		compDest.Id.Uid = ""
+		prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
+	})
 
-		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{
+	testutil.RunStep(suite.T(), "invalid destinations: destination port not found", func(t *testing.T) {
+		resourcetest.ResourceID(suite.api1Service.Id).
+			WithData(t, &pbcatalog.Service{
 				Ports: []*pbcatalog.ServicePort{
-					{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
+					{TargetPort: "some-other-port", Protocol: pbcatalog.Protocol_PROTOCOL_TCP},
 					{TargetPort: "mesh", Protocol: pbcatalog.Protocol_PROTOCOL_MESH},
 				},
-			}
-			apiNonTCPService := resourcetest.ResourceID(suite.api1Service.Id).
-				WithData(t, apiNonTCPServiceData).
-				WithTenancy(tenancy).
-				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.
-			destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
-			require.NoError(t, err)
-
-			// 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.
-			cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
-			compDest.Id.Uid = ""
-			prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
-		})
-
-		testutil.RunStep(suite.T(), "happy path", func(t *testing.T) {
-			// 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)
-
-			resourcetest.ResourceID(suite.api1Service.Id)
-
-			expectedDestinations := []*intermediate.Destination{
-				{
-					Explicit: suite.webComputedDestinationsData.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.webComputedDestinationsData.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.webComputedDestinationsData.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,
-							}}
-						}
-					}),
+			}).
+			Write(t, suite.client)
+		compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
+			WithData(t, &pbmesh.ComputedExplicitDestinations{
+				Destinations: []*pbmesh.Destination{
+					{
+						DestinationRef:  api1ServiceRef,
+						DestinationPort: "tcp",
+					},
 				},
-			}
+			}).
+			WithTenancy(resource.DefaultNamespacedTenancy()).
+			Write(t, suite.client)
+
+		destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
+		require.NoError(t, err)
+		require.Nil(t, destinations)
+		cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
+		compDest.Id.Uid = ""
+		prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
+	})
 
-			actualDestinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
-			require.NoError(t, err)
+	suite.api1Service = resourcetest.ResourceID(suite.api1Service.Id).
+		WithData(suite.T(), suite.api1ServiceData).
+		Write(suite.T(), suite.client)
 
-			// Check that we've computed expanded destinations correctly.
-			prototest.AssertElementsMatch(t, expectedDestinations, actualDestinations)
-		})
-	})
-}
+	suite.api2Service = resourcetest.ResourceID(suite.api2Service.Id).
+		WithData(suite.T(), suite.api2ServiceData).
+		Write(suite.T(), suite.client)
 
-func (suite *dataFetcherSuite) TestFetcher_FetchImplicitDestinationsData() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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},
+	testutil.RunStep(suite.T(), "invalid destinations: destination is pointing to a mesh port", func(t *testing.T) {
+		// Create a computed destinations resource pointing to the mesh port.
+		compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
+			WithData(t, &pbmesh.ComputedExplicitDestinations{
+				Destinations: []*pbmesh.Destination{
+					{
+						DestinationRef:  api1ServiceRef,
+						DestinationPort: "mesh",
+					},
 				},
 			}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
+			WithTenancy(resource.DefaultNamespacedTenancy()).
+			Write(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",
-				},
+		destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
+		require.NoError(t, err)
+		require.Empty(t, destinations)
+
+		cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
+		compDest.Id.Uid = ""
+		prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
+	})
+
+	compDest := resourcetest.Resource(pbmesh.ComputedExplicitDestinationsType, suite.webProxy.Id.Name).
+		WithData(suite.T(), suite.webComputedDestinationsData).
+		WithTenancy(resource.DefaultNamespacedTenancy()).
+		Write(suite.T(), suite.client)
+
+	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},
 			},
 		}
-		api3ServiceEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "api-3").
-			WithTenancy(tenancy).
-			WithData(suite.T(), api3ServiceEndpointsData).
-			Write(suite.T(), suite.client)
+		apiNonTCPService := resourcetest.ResourceID(suite.api1Service.Id).
+			WithData(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.
+		destinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
+		require.NoError(t, err)
 
-		// Write a default ComputedRoutes for api1, api2, and api3.
+		// 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.
+		cachedCompDestIDs := c.ComputedDestinationsByService(resource.IDFromReference(api1ServiceRef))
+		compDest.Id.Uid = ""
+		prototest.AssertElementsMatch(t, []*pbresource.ID{compDest.Id}, cachedCompDestIDs)
+	})
+
+	testutil.RunStep(suite.T(), "happy path", func(t *testing.T) {
+		// 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)
-			api3ComputedRoutesID = resource.ReplaceType(pbmesh.ComputedRoutesType, api3Service.Id)
 		)
 		api1ComputedRoutes := routestest.ReconcileComputedRoutes(suite.T(), suite.client, api1ComputedRoutesID,
 			resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
@@ -542,12 +401,10 @@ func (suite *dataFetcherSuite) TestFetcher_FetchImplicitDestinationsData() {
 			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{
+		resourcetest.ResourceID(suite.api1Service.Id)
+
+		expectedDestinations := []*intermediate.Destination{
 			{
 				Explicit: suite.webComputedDestinationsData.Destinations[0],
 				Service:  resourcetest.MustDecode[*pbcatalog.Service](suite.T(), suite.api1Service),
@@ -575,7 +432,7 @@ func (suite *dataFetcherSuite) TestFetcher_FetchImplicitDestinationsData() {
 						details.ServiceEndpoints = se.Data
 						details.IdentityRefs = []*pbresource.Reference{{
 							Name:    "api-2-identity",
-							Tenancy: suite.api1Service.Id.Tenancy,
+							Tenancy: suite.api2Service.Id.Tenancy,
 						}}
 					}
 				}),
@@ -591,66 +448,151 @@ func (suite *dataFetcherSuite) TestFetcher_FetchImplicitDestinationsData() {
 						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,
+							Tenancy: suite.api2Service.Id.Tenancy,
 						}}
 					}
 				}),
-				VirtualIPs: []string{"192.1.1.1"},
 			},
 		}
 
-		f := Fetcher{
-			client: suite.client,
-		}
+		actualDestinations, err := f.FetchExplicitDestinationsData(suite.ctx, suite.webProxy.Id)
+		require.NoError(t, err)
 
-		actualDestinations, err := f.FetchImplicitDestinationsData(context.Background(), suite.webProxy.Id, existingDestinations)
-		require.NoError(suite.T(), err)
-
-		prototest.AssertElementsMatch(suite.T(), existingDestinations, actualDestinations)
+		// Check that we've computed expanded destinations correctly.
+		prototest.AssertElementsMatch(t, expectedDestinations, actualDestinations)
 	})
 }
 
-func TestDataFetcher(t *testing.T) {
-	suite.Run(t, new(dataFetcherSuite))
-}
+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)
 
-func (suite *dataFetcherSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
+	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)
 
-func (suite *dataFetcherSuite) cleanUpNodes() {
-	suite.resourceClient.MustDelete(suite.T(), suite.api1Service.Id)
-	suite.resourceClient.MustDelete(suite.T(), suite.api1ServiceEndpoints.Id)
-	suite.resourceClient.MustDelete(suite.T(), suite.api2Service.Id)
-	suite.resourceClient.MustDelete(suite.T(), suite.api2ServiceEndpoints.Id)
-	suite.resourceClient.MustDelete(suite.T(), suite.webProxy.Id)
-	suite.resourceClient.MustDelete(suite.T(), suite.webWorkload.Id)
-}
+	// 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.webComputedDestinationsData.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.webComputedDestinationsData.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.webComputedDestinationsData.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"},
+		},
+	}
 
-func (suite *dataFetcherSuite) runTestCaseWithTenancies(t func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			suite.setupWithTenancy(tenancy)
-			suite.T().Cleanup(func() {
-				suite.cleanUpNodes()
-			})
-			t(tenancy)
-		})
+	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 TestDataFetcher(t *testing.T) {
+	suite.Run(t, new(dataFetcherSuite))
 }
diff --git a/internal/mesh/internal/controllers/xds/controller_test.go b/internal/mesh/internal/controllers/xds/controller_test.go
index 6ef4eefd7f5a9..e1dd0ebb61719 100644
--- a/internal/mesh/internal/controllers/xds/controller_test.go
+++ b/internal/mesh/internal/controllers/xds/controller_test.go
@@ -11,6 +11,7 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/consul/internal/testing/golden"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 	"google.golang.org/protobuf/encoding/protojson"
@@ -25,7 +26,6 @@ import (
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/mappers/bimapper"
 	"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/pbmesh/v2beta1/pbproxystate"
@@ -51,7 +51,6 @@ type xdsControllerTestSuite struct {
 	leafCancels     *LeafCancels
 	leafCertEvents  chan controller.Event
 	signer          *leafcert.TestSigner
-	tenancies       []*pbresource.Tenancy
 
 	fooProxyStateTemplate          *pbresource.Resource
 	barProxyStateTemplate          *pbresource.Resource
@@ -70,12 +69,7 @@ type xdsControllerTestSuite struct {
 
 func (suite *xdsControllerTestSuite) SetupTest() {
 	suite.ctx = testutil.TestContext(suite.T())
-	suite.tenancies = resourcetest.TestTenancies()
-	resourceClient := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		WithTenancies(suite.tenancies...).
-		Run(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
@@ -118,233 +112,202 @@ func mockFetcher() (*pbproxystate.TrustBundle, error) {
 
 // This test ensures when a ProxyState is deleted, it is no longer tracked in the mappers.
 func (suite *xdsControllerTestSuite) TestReconcile_NoProxyStateTemplate() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Track the id of a non-existent ProxyStateTemplate.
-		proxyStateTemplateId := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "not-found").WithTenancy(tenancy).ID()
-
-		suite.T().Cleanup(suite.deleteResourceFunc(proxyStateTemplateId))
-
-		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())
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Store the initial ProxyStateTemplate and track it in the mapper.
-		proxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").
-			WithData(suite.T(), &pbmesh.ProxyStateTemplate{}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(proxyStateTemplate.Id))
-
-		suite.mapper.TrackItem(proxyStateTemplate.Id, []resource.ReferenceOrID{})
+	// 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)
 
-		// 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
+	suite.mapper.TrackItem(proxyStateTemplate.Id, []resource.ReferenceOrID{})
 
-		// Run the reconcile.
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: proxyStateTemplate.Id,
-		})
-		require.NoError(suite.T(), err)
+	// 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
 
-		// Assert that nothing is tracked in the mapper.
-		require.True(suite.T(), suite.mapper.IsEmpty())
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Have the mock simulate an error from the PushChange call.
-		suite.updater.pushChangeError = true
+	// Have the mock simulate an error from the PushChange call.
+	suite.updater.pushChangeError = true
 
-		// Setup a happy path scenario.
-		suite.setupFooProxyStateTemplateWithReferences(tenancy)
+	// 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)))
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy).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{},
-			}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(fooProxyStateTemplate.Id))
+	// 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",
+	}
 
-		retry.Run(suite.T(), func(r *retry.R) {
-			suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
-		})
+	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
+		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
+			RequiredEndpoints: fooRequiredEndpoints,
+			ProxyState:        &pbmesh.ProxyState{},
+		}).
+		Write(suite.T(), suite.client)
 
-		// Run the reconcile.
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: fooProxyStateTemplate.Id,
-		})
-		require.Error(suite.T(), err)
+	retry.Run(suite.T(), func(r *retry.R) {
+		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
+	})
 
-		// 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"))
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		badID := &pbresource.ID{
-			Type: &pbresource.Type{
-				Group:        "not",
-				Kind:         "found",
-				GroupVersion: "vfake",
-			},
-			Tenancy: tenancy,
-		}
-		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{},
-			}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(fooProxyStateTemplate.Id))
+	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",
+	}
 
-		retry.Run(suite.T(), func(r *retry.R) {
-			suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
-		})
+	fooProxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "foo-pst").
+		WithData(suite.T(), &pbmesh.ProxyStateTemplate{
+			RequiredEndpoints: fooRequiredEndpoints,
+			ProxyState:        &pbmesh.ProxyState{},
+		}).
+		Write(suite.T(), suite.client)
 
-		// Run the reconcile.
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: fooProxyStateTemplate.Id,
-		})
-		require.Error(suite.T(), err)
+	retry.Run(suite.T(), func(r *retry.R) {
+		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
+	})
 
-		// 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 invalid: a resource name must consist of lower case alphanumeric characters or '-', must start and end with an alphanumeric character and be less than 64 characters, got: \"\"",
-		))
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy)
-
-		// 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())
+	// 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()
 
-		// 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)
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy)
-
-		// Run the reconcile.
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: suite.fooProxyStateTemplate.Id,
-		})
-		require.NoError(suite.T(), err)
+	// 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()
 
-		// Assert on the status.
-		suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
+	// Run the reconcile.
+	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: suite.fooProxyStateTemplate.Id,
+	})
+	require.NoError(suite.T(), err)
 
-		// Assert that the actual leaf certs computed are match the expected leaf cert spiffes.
-		actualLeafs := suite.updater.GetLeafs(suite.fooProxyStateTemplate.Id.Name)
+	// Assert on the status.
+	suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
 
-		for k, l := range actualLeafs {
-			pemDecode, _ := pem.Decode([]byte(l.Cert))
-			cert, err := x509.ParseCertificate(pemDecode.Bytes)
-			require.NoError(suite.T(), err)
-			require.Equal(suite.T(), cert.URIs[0].String(), suite.expectedFooProxyStateSpiffes[k])
-		}
-	})
+	// 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.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		suite.setupFooProxyStateTemplateWithReferences(tenancy)
+	suite.setupFooProxyStateTemplateWithReferences()
 
-		// Run the reconcile.
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: suite.fooProxyStateTemplate.Id,
-		})
-		require.NoError(suite.T(), err)
+	// 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 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)
-	})
+	// 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
@@ -352,368 +315,342 @@ func (suite *xdsControllerTestSuite) TestReconcile_ProxyStateTemplateSetsTrustBu
 // 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy)
-
-		// Reconcile the fooProxyStateTemplate.
-		err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: suite.fooProxyStateTemplate.Id,
-		})
-		require.NoError(suite.T(), err)
+	// 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()
 
-		// Assert on the status.
-		suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
+	// Reconcile the fooProxyStateTemplate.
+	err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+		ID: suite.fooProxyStateTemplate.Id,
+	})
+	require.NoError(suite.T(), err)
 
-		// 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)
+	// Assert on the status.
+	suite.client.RequireStatusCondition(suite.T(), suite.fooProxyStateTemplate.Id, ControllerName, status.ConditionAccepted())
 
-		// Reconcile the barProxyStateTemplate.
-		err = suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-			ID: suite.barProxyStateTemplate.Id,
-		})
-		require.NoError(suite.T(), err)
+	// 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)
 
-		// 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)
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy)
-
-		// 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)
-		})
+	// 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)
 
-		// 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.
-		svc := 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,
-						},
+	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"},
-						},
+				},
+				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).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
-		// 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)
-		})
+				HealthStatus: pbcatalog.Health_HEALTH_CRITICAL,
+			},
+		}}).
+		WithOwner(suite.fooService.Id).
+		Write(suite.T(), suite.client)
 
-		// 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
+	// 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)
+	})
 
-		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)
-		})
+	// 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
 
-		// 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{}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
+	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)
+	})
 
-		suite.T().Cleanup(suite.deleteResourceFunc(secondService.Id))
+	// 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,
-						},
+	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"},
-						},
+				},
+				Addresses: []*pbcatalog.WorkloadAddress{
+					{
+						Host:  "10.5.5.5",
+						Ports: []string{"mesh"},
+					},
+					{
+						Host:  "10.6.6.6",
+						Ports: []string{"mesh"},
 					},
 				},
-			}}).
-			WithOwner(secondService.Id).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
-
-		suite.T().Cleanup(suite.deleteResourceFunc(secondEndpoints.Id))
-
-		// Update the endpoint references on the fooProxyStateTemplate.
-		suite.fooEndpointRefs["test-cluster-2"] = &pbproxystate.EndpointRef{
-			Id:   secondEndpoints.Id,
-			Port: "mesh",
-		}
+			},
+		}}).
+		WithOwner(secondService.Id).
+		Write(suite.T(), suite.client)
 
-		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,
-			}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
+	// Update the endpoint references on the fooProxyStateTemplate.
+	suite.fooEndpointRefs["test-cluster-2"] = &pbproxystate.EndpointRef{
+		Id:   secondEndpoints.Id,
+		Port: "mesh",
+	}
 
-		suite.T().Cleanup(suite.deleteResourceFunc(fooProxyStateTemplate.Id))
+	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)
-		})
+	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,
-						},
+	// 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,
+			},
+			{
+				Address: &pbproxystate.Endpoint_HostPort{
+					HostPort: &pbproxystate.HostPortAddress{
+						Host: "10.6.6.6",
+						Port: 20000,
 					},
-					HealthStatus: pbproxystate.HealthStatus_HEALTH_STATUS_HEALTHY,
 				},
+				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)
-		})
+		},
+	}
 
+	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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy)
-		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 {
-				pemDecode, _ := pem.Decode([]byte(l.Cert))
-				cert, err := x509.ParseCertificate(pemDecode.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 {
-				pemDecode, _ := pem.Decode([]byte(l.Cert))
-				cert, err := x509.ParseCertificate(pemDecode.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)
-			}
-		})
+	// 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)
 
-		// 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,
-			}).
-			WithTenancy(tenancy).
-			Write(suite.T(), suite.client)
+	suite.setupFooProxyStateTemplateWithReferences()
+	leafCertRef := suite.fooLeafRefs["foo-workload-identity"]
+	fooLeafResRef := leafResourceRef(leafCertRef.Name, leafCertRef.Namespace, leafCertRef.Partition)
 
-		suite.T().Cleanup(suite.deleteResourceFunc(fooProxyStateTemplate.Id))
+	// oldLeaf will store the original leaf from before we trigger a CA update.
+	var oldLeaf *x509.Certificate
 
-		retry.Run(suite.T(), func(r *retry.R) {
-			suite.client.RequireVersionChanged(r, fooProxyStateTemplate.Id, oldVersion)
-		})
+	// 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)
+		}
+	})
 
-		// Ensure the leaf certificate watches were cancelled since we deleted the leaf reference.
-		retry.Run(suite.T(), func(r *retry.R) {
+	// 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.False(r, ok)
-		})
+			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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy)
-		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 {
-				pemDecode, _ := pem.Decode([]byte(l.Cert))
-				cert, err := x509.ParseCertificate(pemDecode.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)
-			}
-		})
+	// 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
+	// Delete the fooProxyStateTemplate
 
-		req := &pbresource.DeleteRequest{
-			Id: suite.fooProxyStateTemplate.Id,
-		}
-		_, err := suite.client.Delete(suite.ctx, req)
-		require.NoError(suite.T(), err)
+	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)
-		})
+	// 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() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// 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(tenancy)
-
-		// 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)
-		})
+	// Run the controller manager.
+	mgr := controller.NewManager(suite.client, suite.runtime.Logger)
 
-		eventChannel := suite.updater.EventChannel()
-		eventChannel <- controller.Event{Obj: &proxytracker.ProxyConnection{ProxyID: suite.fooProxyStateTemplate.Id}}
+	mgr.Register(Controller(suite.mapper, suite.updater, suite.fetcher, suite.leafCertManager, suite.leafMapper, suite.leafCancels, "dc1"))
+	mgr.SetRaftLeader(true)
+	go mgr.Run(suite.ctx)
 
-		// 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)
+	// 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:
@@ -721,14 +658,11 @@ func (suite *xdsControllerTestSuite) TestController_ComputeEndpointForProxyConne
 //   - 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(tenancy *pbresource.Tenancy) {
+func (suite *xdsControllerTestSuite) setupFooProxyStateTemplateWithReferences() {
 	fooService := resourcetest.Resource(pbcatalog.ServiceType, "foo-service").
 		WithData(suite.T(), &pbcatalog.Service{}).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooService.Id))
-
 	fooEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-service").
 		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
 			{
@@ -750,12 +684,9 @@ func (suite *xdsControllerTestSuite) setupFooProxyStateTemplateWithReferences(te
 				},
 			},
 		}}).
-		WithTenancy(tenancy).
 		WithOwner(fooService.Id).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooEndpoints.Id))
-
 	fooRequiredEndpoints := make(map[string]*pbproxystate.EndpointRef)
 	fooRequiredEndpoints["test-cluster-1"] = &pbproxystate.EndpointRef{
 		Id:   fooEndpoints.Id,
@@ -773,11 +704,8 @@ func (suite *xdsControllerTestSuite) setupFooProxyStateTemplateWithReferences(te
 			RequiredLeafCertificates: fooRequiredLeafs,
 			ProxyState:               &pbmesh.ProxyState{},
 		}).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooProxyStateTemplate.Id))
-
 	retry.Run(suite.T(), func(r *retry.R) {
 		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
 	})
@@ -823,14 +751,6 @@ func (suite *xdsControllerTestSuite) setupFooProxyStateTemplateWithReferences(te
 	suite.expectedFooProxyStateEndpoints = expectedFooProxyStateEndpoints
 	suite.expectedTrustBundle = expectedTrustBundle
 	suite.expectedFooProxyStateSpiffes = expectedFooLeafSpiffes
-
-	suite.T().Cleanup(func() {
-		suite.fooEndpointRefs = make(map[string]*pbproxystate.EndpointRef)
-		suite.fooLeafRefs = make(map[string]*pbproxystate.LeafCertificateRef)
-		suite.expectedFooProxyStateEndpoints = make(map[string]*pbproxystate.Endpoints)
-		suite.expectedTrustBundle = make(map[string]*pbproxystate.TrustBundle)
-		suite.expectedFooProxyStateSpiffes = make(map[string]string)
-	})
 }
 
 // Setup:
@@ -838,14 +758,11 @@ func (suite *xdsControllerTestSuite) setupFooProxyStateTemplateWithReferences(te
 //   - barProxyStateTemplate with an EndpointsRef to fooBarEndpoints.
 //
 // Saves all related resources to the suite so they can be modified if needed.
-func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints(tenancy *pbresource.Tenancy) {
+func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints() {
 	fooService := resourcetest.Resource(pbcatalog.ServiceType, "foo-service").
 		WithData(suite.T(), &pbcatalog.Service{}).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooService.Id))
-
 	fooEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-service").
 		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
 			{
@@ -868,18 +785,12 @@ func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints(t
 			},
 		}}).
 		WithOwner(fooService.Id).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooEndpoints.Id))
-
 	fooBarService := resourcetest.Resource(pbcatalog.ServiceType, "foo-bar-service").
 		WithData(suite.T(), &pbcatalog.Service{}).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooBarService.Id))
-
 	fooBarEndpoints := resourcetest.Resource(pbcatalog.ServiceEndpointsType, "foo-bar-service").
 		WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
 			{
@@ -902,11 +813,8 @@ func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints(t
 			},
 		}}).
 		WithOwner(fooBarService.Id).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooBarEndpoints.Id))
-
 	fooRequiredEndpoints := make(map[string]*pbproxystate.EndpointRef)
 	fooRequiredEndpoints["test-cluster-1"] = &pbproxystate.EndpointRef{
 		Id:   fooEndpoints.Id,
@@ -930,11 +838,8 @@ func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints(t
 			RequiredEndpoints: fooRequiredEndpoints,
 			ProxyState:        &pbmesh.ProxyState{},
 		}).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(fooProxyStateTemplate.Id))
-
 	retry.Run(suite.T(), func(r *retry.R) {
 		suite.client.RequireResourceExists(r, fooProxyStateTemplate.Id)
 	})
@@ -945,11 +850,8 @@ func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints(t
 			RequiredEndpoints: barRequiredEndpoints,
 			ProxyState:        &pbmesh.ProxyState{},
 		}).
-		WithTenancy(tenancy).
 		Write(suite.T(), suite.client)
 
-	suite.T().Cleanup(suite.deleteResourceFunc(barProxyStateTemplate.Id))
-
 	retry.Run(suite.T(), func(r *retry.R) {
 		suite.client.RequireResourceExists(r, barProxyStateTemplate.Id)
 	})
@@ -1030,77 +932,68 @@ func (suite *xdsControllerTestSuite) setupFooBarProxyStateTemplateAndEndpoints(t
 	suite.fooBarService = fooBarService
 	suite.expectedFooProxyStateEndpoints = expectedFooProxyStateEndpoints
 	suite.expectedBarProxyStateEndpoints = expectedBarProxyStateEndpoints
-
-	suite.T().Cleanup(func() {
-		suite.barEndpointRefs = make(map[string]*pbproxystate.EndpointRef)
-		suite.fooEndpointRefs = make(map[string]*pbproxystate.EndpointRef)
-		suite.expectedFooProxyStateEndpoints = make(map[string]*pbproxystate.Endpoints)
-		suite.expectedBarProxyStateEndpoints = make(map[string]*pbproxystate.Endpoints)
-	})
 }
 
 func (suite *xdsControllerTestSuite) TestReconcile_prevWatchesToCancel() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		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: tenancy,
-				}
+	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
+		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(),
-			},
-		}
+	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)
-		}
-	})
+	for _, tc := range cases {
+		toCancel := prevWatchesToCancel(tc.old, convert(tc.new))
+		require.ElementsMatch(suite.T(), toCancel, tc.expect)
+	}
 }
 
 func TestXdsController(t *testing.T) {
@@ -1121,92 +1014,86 @@ func TestXdsController(t *testing.T) {
 // rather than just endpoints, leaf certs, and trust bundles, the test also ensures
 // side effects or change in scope to XDS controller are not introduce mistakenly.
 func (suite *xdsControllerTestSuite) TestReconcile_SidecarProxyGoldenFileInputs() {
-	suite.runTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		path := "../sidecarproxy/builder/testdata"
-		cases := []string{
-			// destinations - please add in alphabetical order
-			"destination/l4-single-destination-ip-port-bind-address",
-			"destination/l4-single-destination-unix-socket-bind-address",
-			"destination/l4-single-implicit-destination-tproxy",
-			"destination/l4-multi-destination",
-			"destination/l4-multiple-implicit-destinations-tproxy",
-			"destination/l4-implicit-and-explicit-destinations-tproxy",
-			"destination/mixed-multi-destination",
-			"destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy",
-			"destination/multiport-l4-and-l7-single-implicit-destination-tproxy",
-			"destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy",
-
-			//sources - please add in alphabetical order
-			"source/l7-expose-paths",
-			"source/local-and-inbound-connections",
-			"source/multiple-workload-addresses-with-specific-ports",
-			"source/multiple-workload-addresses-without-ports",
-			"source/multiport-l4-multiple-workload-addresses-with-specific-ports",
-			"source/multiport-l4-multiple-workload-addresses-without-ports",
-			"source/multiport-l4-workload-with-only-mesh-port",
-			"source/multiport-l7-multiple-workload-addresses-with-specific-ports",
-			"source/multiport-l7-multiple-workload-addresses-without-ports",
-			"source/multiport-l7-multiple-workload-addresses-without-ports",
-			"source/single-workload-address-without-ports",
-		}
+	path := "../sidecarproxy/builder/testdata"
+	cases := []string{
+		// destinations - please add in alphabetical order
+		"destination/l4-single-destination-ip-port-bind-address",
+		"destination/l4-single-destination-unix-socket-bind-address",
+		"destination/l4-single-implicit-destination-tproxy",
+		"destination/l4-multi-destination",
+		"destination/l4-multiple-implicit-destinations-tproxy",
+		"destination/l4-implicit-and-explicit-destinations-tproxy",
+		"destination/mixed-multi-destination",
+		"destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy",
+		"destination/multiport-l4-and-l7-single-implicit-destination-tproxy",
+		"destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy",
+
+		//sources - please add in alphabetical order
+		"source/l4-multiple-workload-addresses-with-specific-ports",
+		"source/l4-multiple-workload-addresses-without-ports",
+		"source/l4-single-workload-address-without-ports",
+		"source/l7-expose-paths",
+		"source/local-and-inbound-connections",
+		"source/multiport-l4-multiple-workload-addresses-with-specific-ports",
+		"source/multiport-l4-multiple-workload-addresses-without-ports",
+		"source/multiport-l4-workload-with-only-mesh-port",
+		"source/multiport-l7-multiple-workload-addresses-with-specific-ports",
+		"source/multiport-l7-multiple-workload-addresses-without-ports",
+	}
 
-		for _, name := range cases {
-			suite.Run(name, func() {
-				// Create ProxyStateTemplate from the golden file.
-				pst := JSONToProxyTemplate(suite.T(),
-					golden.GetBytesAtFilePath(suite.T(), fmt.Sprintf("%s/%s.golden", path, name)))
-
-				// Destinations will need endpoint refs set up.
-				if strings.Split(name, "/")[0] == "destination" && len(pst.ProxyState.Endpoints) == 0 {
-					suite.addRequiredEndpointsAndRefs(pst, tenancy)
-				}
-
-				// Store the initial ProxyStateTemplate.
-				proxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").
-					WithData(suite.T(), pst).
-					WithTenancy(tenancy).
-					Write(suite.T(), suite.client)
-
-				suite.T().Cleanup(suite.deleteResourceFunc(proxyStateTemplate.Id))
-
-				// Check with resource service that it exists.
-				retry.Run(suite.T(), func(r *retry.R) {
-					suite.client.RequireResourceExists(r, proxyStateTemplate.Id)
-				})
-
-				// Track it in the mapper.
-				suite.mapper.TrackItem(proxyStateTemplate.Id, []resource.ReferenceOrID{})
-
-				// Run the reconcile, and since no ProxyStateTemplate is stored, this simulates a deletion.
-				err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
-					ID: proxyStateTemplate.Id,
-				})
-				require.NoError(suite.T(), err)
-				require.NotNil(suite.T(), proxyStateTemplate)
-
-				// Get the reconciled proxyStateTemplate to check the reconcile results.
-				reconciledPS := suite.updater.Get(proxyStateTemplate.Id.Name)
-
-				// Verify leaf cert contents then hard code them for comparison
-				// and downstream tests since they change from test run to test run.
-				require.NotEmpty(suite.T(), reconciledPS.LeafCertificates)
-				reconciledPS.LeafCertificates = map[string]*pbproxystate.LeafCertificate{
-					"test-identity": {
-						Cert: "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
-						Key:  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n",
-					},
-				}
+	for _, name := range cases {
+		suite.Run(name, func() {
+			// Create ProxyStateTemplate from the golden file.
+			pst := JSONToProxyTemplate(suite.T(),
+				golden.GetBytesAtFilePath(suite.T(), fmt.Sprintf("%s/%s.golden", path, name)))
+
+			// Destinations will need endpoint refs set up.
+			if strings.Split(name, "/")[0] == "destination" && len(pst.ProxyState.Endpoints) == 0 {
+				suite.addRequiredEndpointsAndRefs(pst)
+			}
+
+			// Store the initial ProxyStateTemplate.
+			proxyStateTemplate := resourcetest.Resource(pbmesh.ProxyStateTemplateType, "test").
+				WithData(suite.T(), pst).
+				Write(suite.T(), suite.client)
 
-				// Compare actual vs expected.
-				actual := prototest.ProtoToJSON(suite.T(), reconciledPS)
-				expected := golden.Get(suite.T(), actual, name+".golden")
-				require.JSONEq(suite.T(), expected, actual)
+			// Check with resource service that it exists.
+			retry.Run(suite.T(), func(r *retry.R) {
+				suite.client.RequireResourceExists(r, proxyStateTemplate.Id)
 			})
-		}
-	})
+
+			// Track it in the mapper.
+			suite.mapper.TrackItem(proxyStateTemplate.Id, []resource.ReferenceOrID{})
+
+			// Run the reconcile, and since no ProxyStateTemplate is stored, this simulates a deletion.
+			err := suite.ctl.Reconcile(context.Background(), suite.runtime, controller.Request{
+				ID: proxyStateTemplate.Id,
+			})
+			require.NoError(suite.T(), err)
+			require.NotNil(suite.T(), proxyStateTemplate)
+
+			// Get the reconciled proxyStateTemplate to check the reconcile results.
+			reconciledPS := suite.updater.Get(proxyStateTemplate.Id.Name)
+
+			// Verify leaf cert contents then hard code them for comparison
+			// and downstream tests since they change from test run to test run.
+			require.NotEmpty(suite.T(), reconciledPS.LeafCertificates)
+			reconciledPS.LeafCertificates = map[string]*pbproxystate.LeafCertificate{
+				"test-identity": {
+					Cert: "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
+					Key:  "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n",
+				},
+			}
+
+			// Compare actual vs expected.
+			actual := prototest.ProtoToJSON(suite.T(), reconciledPS)
+			expected := golden.Get(suite.T(), actual, name+".golden")
+			require.JSONEq(suite.T(), expected, actual)
+		})
+	}
 }
 
-func (suite *xdsControllerTestSuite) addRequiredEndpointsAndRefs(pst *pbmesh.ProxyStateTemplate, tenancy *pbresource.Tenancy) {
+func (suite *xdsControllerTestSuite) addRequiredEndpointsAndRefs(pst *pbmesh.ProxyStateTemplate) {
 	//get service data
 	serviceData := &pbcatalog.Service{}
 	var vp uint32 = 7000
@@ -1234,11 +1121,8 @@ func (suite *xdsControllerTestSuite) addRequiredEndpointsAndRefs(pst *pbmesh.Pro
 		// create service.
 		svc := resourcetest.Resource(pbcatalog.ServiceType, svcName).
 			WithData(suite.T(), &pbcatalog.Service{}).
-			WithTenancy(tenancy).
 			Write(suite.T(), suite.client)
 
-		suite.T().Cleanup(suite.deleteResourceFunc(svc.Id))
-
 		// create endpoints with svc as owner.
 		eps := resourcetest.Resource(pbcatalog.ServiceEndpointsType, svcName).
 			WithData(suite.T(), &pbcatalog.ServiceEndpoints{Endpoints: []*pbcatalog.Endpoint{
@@ -1258,11 +1142,8 @@ func (suite *xdsControllerTestSuite) addRequiredEndpointsAndRefs(pst *pbmesh.Pro
 				},
 			}}).
 			WithOwner(svc.Id).
-			WithTenancy(tenancy).
 			Write(suite.T(), suite.client)
 
-		suite.T().Cleanup(suite.deleteResourceFunc(eps.Id))
-
 		// add to working list of required endpoints.
 		requiredEps[clusterName] = &pbproxystate.EndpointRef{
 			Id:   eps.Id,
@@ -1282,21 +1163,3 @@ func JSONToProxyTemplate(t *testing.T, json []byte) *pbmesh.ProxyStateTemplate {
 	require.NoError(t, err)
 	return proxyTemplate
 }
-
-func (suite *xdsControllerTestSuite) runTestCaseWithTenancies(testCase func(tenancy *pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			testCase(tenancy)
-		})
-	}
-}
-
-func (suite *xdsControllerTestSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
-
-func (suite *xdsControllerTestSuite) deleteResourceFunc(id *pbresource.ID) func() {
-	return func() {
-		suite.client.MustDelete(suite.T(), id)
-	}
-}
diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden
index 3acd9869e51dc..16b1841296ed8 100644
--- a/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden
+++ b/internal/mesh/internal/controllers/xds/testdata/destination/mixed-multi-destination.golden
@@ -285,7 +285,7 @@
             "route": {
               "name": "default/local/default/api-1:http:1.1.1.1:1234"
             },
-            "statPrefix": "upstream.http.api-1.default.default.dc1"
+            "statPrefix": "upstream."
           }
         }
       ]
@@ -377,4 +377,4 @@
       "trustDomain": "some-trust-domain"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
index 0158f07aa2c58..7ac1ec80710b5 100644
--- a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
+++ b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-multiple-implicit-destinations-tproxy.golden
@@ -330,7 +330,7 @@
             "route": {
               "name": "default/local/default/api-app:http"
             },
-            "statPrefix": "upstream.http.api-app.default.default.dc1"
+            "statPrefix": "upstream."
           },
           "match": {
             "destinationPort": 8080,
@@ -347,7 +347,7 @@
             "route": {
               "name": "default/local/default/api-app2:http"
             },
-            "statPrefix": "upstream.http.api-app2.default.default.dc1"
+            "statPrefix": "upstream."
           },
           "match": {
             "destinationPort": 8080,
@@ -463,4 +463,4 @@
       "trustDomain": "some-trust-domain"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
index 3c9d62fb4ea17..8f5e73c92ee52 100644
--- a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
+++ b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-tproxy.golden
@@ -192,7 +192,7 @@
             "route": {
               "name": "default/local/default/api-app:http"
             },
-            "statPrefix": "upstream.http.api-app.default.default.dc1"
+            "statPrefix": "upstream."
           },
           "match": {
             "destinationPort": 8080,
@@ -259,4 +259,4 @@
       "trustDomain": "some-trust-domain"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
index 3c9d62fb4ea17..8f5e73c92ee52 100644
--- a/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
+++ b/internal/mesh/internal/controllers/xds/testdata/destination/multiport-l4-and-l7-single-implicit-destination-with-multiple-workloads-tproxy.golden
@@ -192,7 +192,7 @@
             "route": {
               "name": "default/local/default/api-app:http"
             },
-            "statPrefix": "upstream.http.api-app.default.default.dc1"
+            "statPrefix": "upstream."
           },
           "match": {
             "destinationPort": 8080,
@@ -259,4 +259,4 @@
       "trustDomain": "some-trust-domain"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/internal/mesh/internal/controllers/xds/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden
new file mode 100644
index 0000000000000..c88a05495613c
--- /dev/null
+++ b/internal/mesh/internal/controllers/xds/testdata/source/l4-multiple-workload-addresses-with-specific-ports.golden
@@ -0,0 +1,102 @@
+{
+  "clusters": {
+    "local_app:port1": {
+      "endpointGroup": {
+        "static": {}
+      },
+      "name": "local_app:port1",
+      "protocol": "PROTOCOL_TCP"
+    }
+  },
+  "endpoints": {
+    "local_app:port1": {
+      "endpoints": [
+        {
+          "hostPort": {
+            "host": "127.0.0.1",
+            "port": 8080
+          }
+        }
+      ]
+    }
+  },
+  "identity": {
+    "name": "test-identity",
+    "tenancy": {
+      "namespace": "default",
+      "partition": "default",
+      "peerName": "local"
+    },
+    "type": {
+      "group": "auth",
+      "groupVersion": "v2beta1",
+      "kind": "WorkloadIdentity"
+    }
+  },
+  "leafCertificates": {
+    "test-identity": {
+      "cert": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
+      "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+    }
+  },
+  "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"
+            ]
+          }
+        }
+      ]
+    }
+  ],
+  "trustBundles": {
+    "local": {
+      "roots": [
+        "some-root",
+        "some-other-root"
+      ],
+      "trustDomain": "some-trust-domain"
+    }
+  }
+}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/xds/testdata/source/l4-multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/l4-multiple-workload-addresses-without-ports.golden
new file mode 100644
index 0000000000000..439c536fdc3bb
--- /dev/null
+++ b/internal/mesh/internal/controllers/xds/testdata/source/l4-multiple-workload-addresses-without-ports.golden
@@ -0,0 +1,90 @@
+{
+  "clusters": {
+    "local_app:port1": {
+      "endpointGroup": {
+        "static": {}
+      },
+      "name": "local_app:port1",
+      "protocol": "PROTOCOL_TCP"
+    }
+  },
+  "endpoints": {
+    "local_app:port1": {
+      "endpoints": [
+        {
+          "hostPort": {
+            "host": "127.0.0.1",
+            "port": 8080
+          }
+        }
+      ]
+    }
+  },
+  "identity": {
+    "name": "test-identity",
+    "tenancy": {
+      "namespace": "default",
+      "partition": "default",
+      "peerName": "local"
+    },
+    "type": {
+      "group": "auth",
+      "groupVersion": "v2beta1",
+      "kind": "WorkloadIdentity"
+    }
+  },
+  "leafCertificates": {
+    "test-identity": {
+      "cert": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
+      "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+    }
+  },
+  "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"
+            ]
+          }
+        }
+      ]
+    }
+  ],
+  "trustBundles": {
+    "local": {
+      "roots": [
+        "some-root",
+        "some-other-root"
+      ],
+      "trustDomain": "some-trust-domain"
+    }
+  }
+}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/xds/testdata/source/l4-single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/l4-single-workload-address-without-ports.golden
new file mode 100644
index 0000000000000..439c536fdc3bb
--- /dev/null
+++ b/internal/mesh/internal/controllers/xds/testdata/source/l4-single-workload-address-without-ports.golden
@@ -0,0 +1,90 @@
+{
+  "clusters": {
+    "local_app:port1": {
+      "endpointGroup": {
+        "static": {}
+      },
+      "name": "local_app:port1",
+      "protocol": "PROTOCOL_TCP"
+    }
+  },
+  "endpoints": {
+    "local_app:port1": {
+      "endpoints": [
+        {
+          "hostPort": {
+            "host": "127.0.0.1",
+            "port": 8080
+          }
+        }
+      ]
+    }
+  },
+  "identity": {
+    "name": "test-identity",
+    "tenancy": {
+      "namespace": "default",
+      "partition": "default",
+      "peerName": "local"
+    },
+    "type": {
+      "group": "auth",
+      "groupVersion": "v2beta1",
+      "kind": "WorkloadIdentity"
+    }
+  },
+  "leafCertificates": {
+    "test-identity": {
+      "cert": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
+      "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
+    }
+  },
+  "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"
+            ]
+          }
+        }
+      ]
+    }
+  ],
+  "trustBundles": {
+    "local": {
+      "roots": [
+        "some-root",
+        "some-other-root"
+      ],
+      "trustDomain": "some-trust-domain"
+    }
+  }
+}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden
deleted file mode 100644
index b67d034c7e345..0000000000000
--- a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-with-specific-ports.golden
+++ /dev/null
@@ -1,292 +0,0 @@
-{
-  "clusters": {
-    "local_app:grpc": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:grpc",
-      "protocol": "PROTOCOL_GRPC"
-    },
-    "local_app:http": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:http",
-      "protocol": "PROTOCOL_HTTP"
-    },
-    "local_app:http2": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:http2",
-      "protocol": "PROTOCOL_HTTP2"
-    },
-    "local_app:tcp": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:tcp",
-      "protocol": "PROTOCOL_TCP"
-    }
-  },
-  "endpoints": {
-    "local_app:grpc": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8083
-          }
-        }
-      ]
-    },
-    "local_app:http": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8081
-          }
-        }
-      ]
-    },
-    "local_app:http2": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8082
-          }
-        }
-      ]
-    },
-    "local_app:tcp": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8080
-          }
-        }
-      ]
-    }
-  },
-  "identity": {
-    "name": "test-identity",
-    "tenancy": {
-      "namespace": "default",
-      "partition": "default",
-      "peerName": "local"
-    },
-    "type": {
-      "group": "auth",
-      "groupVersion": "v2beta1",
-      "kind": "WorkloadIdentity"
-    }
-  },
-  "leafCertificates": {
-    "test-identity": {
-      "cert": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
-      "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-    }
-  },
-  "listeners": [
-    {
-      "capabilities": [
-        "CAPABILITY_L4_TLS_INSPECTION"
-      ],
-      "direction": "DIRECTION_INBOUND",
-      "hostPort": {
-        "host": "127.0.0.1",
-        "port": 20000
-      },
-      "name": "public_listener",
-      "routers": [
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "protocol": "L7_PROTOCOL_GRPC",
-            "route": {
-              "name": "public_listener:grpc"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~grpc"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "route": {
-              "name": "public_listener:http"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~http"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "protocol": "L7_PROTOCOL_HTTP2",
-            "route": {
-              "name": "public_listener:http2"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~http2"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l4": {
-            "cluster": {
-              "name": "local_app:tcp"
-            },
-            "statPrefix": "public_listener",
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~tcp"
-            ]
-          }
-        }
-      ]
-    }
-  ],
-  "routes": {
-    "public_listener:grpc": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:grpc",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:grpc"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "public_listener:http": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:http",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:http"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "public_listener:http2": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:http2",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:http2"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    }
-  },
-  "trustBundles": {
-    "local": {
-      "roots": [
-        "some-root",
-        "some-other-root"
-      ],
-      "trustDomain": "some-trust-domain"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden
deleted file mode 100644
index 8b04918948654..0000000000000
--- a/internal/mesh/internal/controllers/xds/testdata/source/multiple-workload-addresses-without-ports.golden
+++ /dev/null
@@ -1,292 +0,0 @@
-{
-  "clusters": {
-    "local_app:grpc": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:grpc",
-      "protocol": "PROTOCOL_GRPC"
-    },
-    "local_app:http": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:http",
-      "protocol": "PROTOCOL_HTTP"
-    },
-    "local_app:http2": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:http2",
-      "protocol": "PROTOCOL_HTTP2"
-    },
-    "local_app:tcp": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:tcp",
-      "protocol": "PROTOCOL_TCP"
-    }
-  },
-  "endpoints": {
-    "local_app:grpc": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8083
-          }
-        }
-      ]
-    },
-    "local_app:http": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8081
-          }
-        }
-      ]
-    },
-    "local_app:http2": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8082
-          }
-        }
-      ]
-    },
-    "local_app:tcp": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8080
-          }
-        }
-      ]
-    }
-  },
-  "identity": {
-    "name": "test-identity",
-    "tenancy": {
-      "namespace": "default",
-      "partition": "default",
-      "peerName": "local"
-    },
-    "type": {
-      "group": "auth",
-      "groupVersion": "v2beta1",
-      "kind": "WorkloadIdentity"
-    }
-  },
-  "leafCertificates": {
-    "test-identity": {
-      "cert": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
-      "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-    }
-  },
-  "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"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "protocol": "L7_PROTOCOL_GRPC",
-            "route": {
-              "name": "public_listener:grpc"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~grpc"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "route": {
-              "name": "public_listener:http"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~http"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "protocol": "L7_PROTOCOL_HTTP2",
-            "route": {
-              "name": "public_listener:http2"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~http2"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l4": {
-            "cluster": {
-              "name": "local_app:tcp"
-            },
-            "statPrefix": "public_listener",
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~tcp"
-            ]
-          }
-        }
-      ]
-    }
-  ],
-  "routes": {
-    "public_listener:grpc": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:grpc",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:grpc"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "public_listener:http": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:http",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:http"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "public_listener:http2": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:http2",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:http2"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    }
-  },
-  "trustBundles": {
-    "local": {
-      "roots": [
-        "some-root",
-        "some-other-root"
-      ],
-      "trustDomain": "some-trust-domain"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden b/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden
deleted file mode 100644
index 8b04918948654..0000000000000
--- a/internal/mesh/internal/controllers/xds/testdata/source/single-workload-address-without-ports.golden
+++ /dev/null
@@ -1,292 +0,0 @@
-{
-  "clusters": {
-    "local_app:grpc": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:grpc",
-      "protocol": "PROTOCOL_GRPC"
-    },
-    "local_app:http": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:http",
-      "protocol": "PROTOCOL_HTTP"
-    },
-    "local_app:http2": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:http2",
-      "protocol": "PROTOCOL_HTTP2"
-    },
-    "local_app:tcp": {
-      "endpointGroup": {
-        "static": {}
-      },
-      "name": "local_app:tcp",
-      "protocol": "PROTOCOL_TCP"
-    }
-  },
-  "endpoints": {
-    "local_app:grpc": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8083
-          }
-        }
-      ]
-    },
-    "local_app:http": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8081
-          }
-        }
-      ]
-    },
-    "local_app:http2": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8082
-          }
-        }
-      ]
-    },
-    "local_app:tcp": {
-      "endpoints": [
-        {
-          "hostPort": {
-            "host": "127.0.0.1",
-            "port": 8080
-          }
-        }
-      ]
-    }
-  },
-  "identity": {
-    "name": "test-identity",
-    "tenancy": {
-      "namespace": "default",
-      "partition": "default",
-      "peerName": "local"
-    },
-    "type": {
-      "group": "auth",
-      "groupVersion": "v2beta1",
-      "kind": "WorkloadIdentity"
-    }
-  },
-  "leafCertificates": {
-    "test-identity": {
-      "cert": "-----BEGIN CERTIFICATE-----\nMIICDjCCAbWgAwIBAgIBAjAKBggqhkjOPQQDAjAUMRIwEAYDVQQDEwlUZXN0IENB\nIDEwHhcNMjMxMDE2MTYxMzI5WhcNMjMxMDE2MTYyMzI5WjAAMFkwEwYHKoZIzj0C\nAQYIKoZIzj0DAQcDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9\nta/bGT+5orZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJaOCAQowggEGMA4GA1UdDwEB\n/wQEAwIDuDAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwDAYDVR0TAQH/\nBAIwADApBgNVHQ4EIgQg3ogXVz9cqaK2B6xdiJYMa5NtT0KkYv7BA2dR7h9EcwUw\nKwYDVR0jBCQwIoAgq+C1mPlPoGa4lt7sSft1goN5qPGyBIB/3mUHJZKSFY8wbwYD\nVR0RAQH/BGUwY4Zhc3BpZmZlOi8vMTExMTExMTEtMjIyMi0zMzMzLTQ0NDQtNTU1\nNTU1NTU1NTU1LmNvbnN1bC9hcC9kZWZhdWx0L25zL2RlZmF1bHQvaWRlbnRpdHkv\ndGVzdC1pZGVudGl0eTAKBggqhkjOPQQDAgNHADBEAiB6L+t5bzRrBPhiQYNeA7fF\nUCuLWrdjW4Xbv3SLg0IKMgIgfRC5hEx+DqzQxTCP4sexX3hVWMjKoWmHdwiUcg+K\n/IE=\n-----END CERTIFICATE-----\n",
-      "key": "-----BEGIN EC PRIVATE KEY-----\nMHcCAQEEIFIFkTIL1iUV4O/RpveVHzHs7ZzhSkvYIzbdXDttz9EooAoGCCqGSM49\nAwEHoUQDQgAErErAIosDPheZQGbxFQ4hYC/e9Fi4MG9z/zjfCnCq/oK9ta/bGT+5\norZqTmdN/ICsKQDhykxZ2u/Xr6845zhcJQ==\n-----END EC PRIVATE KEY-----\n"
-    }
-  },
-  "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"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "protocol": "L7_PROTOCOL_GRPC",
-            "route": {
-              "name": "public_listener:grpc"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~grpc"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "route": {
-              "name": "public_listener:http"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~http"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l7": {
-            "protocol": "L7_PROTOCOL_HTTP2",
-            "route": {
-              "name": "public_listener:http2"
-            },
-            "statPrefix": "public_listener",
-            "staticRoute": true,
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~http2"
-            ]
-          }
-        },
-        {
-          "inboundTls": {
-            "inboundMesh": {
-              "identityKey": "test-identity",
-              "validationContext": {
-                "trustBundlePeerNameKeys": [
-                  "local"
-                ]
-              }
-            }
-          },
-          "l4": {
-            "cluster": {
-              "name": "local_app:tcp"
-            },
-            "statPrefix": "public_listener",
-            "trafficPermissions": {}
-          },
-          "match": {
-            "alpnProtocols": [
-              "consul~tcp"
-            ]
-          }
-        }
-      ]
-    }
-  ],
-  "routes": {
-    "public_listener:grpc": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:grpc",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:grpc"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "public_listener:http": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:http",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:http"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    "public_listener:http2": {
-      "virtualHosts": [
-        {
-          "domains": [
-            "*"
-          ],
-          "name": "public_listener:http2",
-          "routeRules": [
-            {
-              "destination": {
-                "cluster": {
-                  "name": "local_app:http2"
-                }
-              },
-              "match": {
-                "pathMatch": {
-                  "prefix": "/"
-                }
-              }
-            }
-          ]
-        }
-      ]
-    }
-  },
-  "trustBundles": {
-    "local": {
-      "roots": [
-        "some-root",
-        "some-other-root"
-      ],
-      "trustDomain": "some-trust-domain"
-    }
-  }
-}
\ No newline at end of file
diff --git a/internal/mesh/internal/mappers/common/workload_selector_util_test.go b/internal/mesh/internal/mappers/common/workload_selector_util_test.go
index 6b178d892287d..6f9e71e1af54d 100644
--- a/internal/mesh/internal/mappers/common/workload_selector_util_test.go
+++ b/internal/mesh/internal/mappers/common/workload_selector_util_test.go
@@ -21,9 +21,7 @@ import (
 )
 
 func TestMapSelector(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		Run(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
diff --git a/internal/mesh/internal/mappers/workloadselectionmapper/workload_selection_mapper_test.go b/internal/mesh/internal/mappers/workloadselectionmapper/workload_selection_mapper_test.go
index 5c90fa2463b73..071be1f60d2f1 100644
--- a/internal/mesh/internal/mappers/workloadselectionmapper/workload_selection_mapper_test.go
+++ b/internal/mesh/internal/mappers/workloadselectionmapper/workload_selection_mapper_test.go
@@ -22,10 +22,7 @@ import (
 )
 
 func TestMapToComputedType(t *testing.T) {
-	resourceClient := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		Run(t)
-
+	resourceClient := svctest.RunResourceService(t, types.Register, catalog.RegisterTypes)
 	mapper := New[*pbmesh.ProxyConfiguration](pbmesh.ComputedProxyConfigurationType)
 
 	workloadData := &pbcatalog.Workload{
diff --git a/internal/mesh/internal/types/computed_routes.go b/internal/mesh/internal/types/computed_routes.go
index b572c01fc3764..1f66cc97ac211 100644
--- a/internal/mesh/internal/types/computed_routes.go
+++ b/internal/mesh/internal/types/computed_routes.go
@@ -11,6 +11,7 @@ import (
 
 	"github.com/hashicorp/consul/internal/resource"
 	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 const (
@@ -29,12 +30,16 @@ func RegisterComputedRoutes(r resource.Registry) {
 	})
 }
 
-var ValidateComputedRoutes = resource.DecodeAndValidate(validateComputedRoutes)
+func ValidateComputedRoutes(res *pbresource.Resource) error {
+	var config pbmesh.ComputedRoutes
+
+	if err := res.Data.UnmarshalTo(&config); err != nil {
+		return resource.NewErrDataParse(&config, err)
+	}
 
-func validateComputedRoutes(res *DecodedComputedRoutes) error {
 	var merr error
 
-	if len(res.Data.PortedConfigs) == 0 {
+	if len(config.PortedConfigs) == 0 {
 		merr = multierror.Append(merr, resource.ErrInvalidField{
 			Name:    "ported_configs",
 			Wrapped: resource.ErrEmpty,
@@ -43,7 +48,7 @@ func validateComputedRoutes(res *DecodedComputedRoutes) error {
 
 	// TODO(rb): do more elaborate validation
 
-	for port, pmc := range res.Data.PortedConfigs {
+	for port, pmc := range config.PortedConfigs {
 		wrapErr := func(err error) error {
 			return resource.ErrInvalidMapValue{
 				Map:     "ported_configs",
diff --git a/internal/mesh/internal/types/decoded.go b/internal/mesh/internal/types/decoded.go
index be4836c066ff7..ee1244fdcb1bc 100644
--- a/internal/mesh/internal/types/decoded.go
+++ b/internal/mesh/internal/types/decoded.go
@@ -15,7 +15,6 @@ type (
 	DecodedGRPCRoute                  = resource.DecodedResource[*pbmesh.GRPCRoute]
 	DecodedTCPRoute                   = resource.DecodedResource[*pbmesh.TCPRoute]
 	DecodedDestinationPolicy          = resource.DecodedResource[*pbmesh.DestinationPolicy]
-	DecodedDestinationsConfiguration  = resource.DecodedResource[*pbmesh.DestinationsConfiguration]
 	DecodedComputedRoutes             = resource.DecodedResource[*pbmesh.ComputedRoutes]
 	DecodedComputedTrafficPermissions = resource.DecodedResource[*pbauth.ComputedTrafficPermissions]
 	DecodedFailoverPolicy             = resource.DecodedResource[*pbcatalog.FailoverPolicy]
diff --git a/internal/mesh/internal/types/destination_policy.go b/internal/mesh/internal/types/destination_policy.go
index 4fe3062367cf5..68b37345baf3e 100644
--- a/internal/mesh/internal/types/destination_policy.go
+++ b/internal/mesh/internal/types/destination_policy.go
@@ -29,19 +29,23 @@ func RegisterDestinationPolicy(r resource.Registry) {
 	})
 }
 
-var ValidateDestinationPolicy = resource.DecodeAndValidate(validateDestinationPolicy)
+func ValidateDestinationPolicy(res *pbresource.Resource) error {
+	var policy pbmesh.DestinationPolicy
+
+	if err := res.Data.UnmarshalTo(&policy); err != nil {
+		return resource.NewErrDataParse(&policy, err)
+	}
 
-func validateDestinationPolicy(res *DecodedDestinationPolicy) error {
 	var merr error
 
-	if len(res.Data.PortConfigs) == 0 {
+	if len(policy.PortConfigs) == 0 {
 		merr = multierror.Append(merr, resource.ErrInvalidField{
 			Name:    "port_configs",
 			Wrapped: resource.ErrEmpty,
 		})
 	}
 
-	for port, pc := range res.Data.PortConfigs {
+	for port, pc := range policy.PortConfigs {
 		wrapErr := func(err error) error {
 			return resource.ErrInvalidMapValue{
 				Map:     "port_configs",
diff --git a/internal/mesh/internal/types/destinations.go b/internal/mesh/internal/types/destinations.go
index 7de3011e3ef0a..34287e627ab71 100644
--- a/internal/mesh/internal/types/destinations.go
+++ b/internal/mesh/internal/types/destinations.go
@@ -26,12 +26,16 @@ func RegisterDestinations(r resource.Registry) {
 	})
 }
 
-var MutateDestinations = resource.DecodeAndMutate(mutateDestinations)
+func MutateDestinations(res *pbresource.Resource) error {
+	var destinations pbmesh.Destinations
+
+	if err := res.Data.UnmarshalTo(&destinations); err != nil {
+		return resource.NewErrDataParse(&destinations, err)
+	}
 
-func mutateDestinations(res *DecodedDestinations) (bool, error) {
 	changed := false
 
-	for _, dest := range res.Data.Destinations {
+	for _, dest := range destinations.Destinations {
 		if dest.DestinationRef == nil {
 			continue // skip; let the validation hook error out instead
 		}
@@ -52,33 +56,41 @@ func mutateDestinations(res *DecodedDestinations) (bool, error) {
 		}
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&destinations)
 }
 
 func isLocalPeer(p string) bool {
 	return p == "local" || p == ""
 }
 
-var ValidateDestinations = resource.DecodeAndValidate(validateDestinations)
+func ValidateDestinations(res *pbresource.Resource) error {
+	var destinations pbmesh.Destinations
+
+	if err := res.Data.UnmarshalTo(&destinations); err != nil {
+		return resource.NewErrDataParse(&destinations, err)
+	}
 
-func validateDestinations(res *DecodedDestinations) error {
 	var merr error
 
-	if selErr := catalog.ValidateSelector(res.Data.Workloads, false); selErr != nil {
+	if selErr := catalog.ValidateSelector(destinations.Workloads, false); selErr != nil {
 		merr = multierror.Append(merr, resource.ErrInvalidField{
 			Name:    "workloads",
 			Wrapped: selErr,
 		})
 	}
 
-	if res.Data.GetPqDestinations() != nil {
+	if destinations.GetPqDestinations() != nil {
 		merr = multierror.Append(merr, resource.ErrInvalidField{
 			Name:    "pq_destinations",
 			Wrapped: resource.ErrUnsupported,
 		})
 	}
 
-	for i, dest := range res.Data.Destinations {
+	for i, dest := range destinations.Destinations {
 		wrapDestErr := func(err error) error {
 			return resource.ErrInvalidListElement{
 				Name:    "destinations",
diff --git a/internal/mesh/internal/types/destinations_configuration.go b/internal/mesh/internal/types/destinations_configuration.go
index 7d46d93ed9993..fedbe40df48c1 100644
--- a/internal/mesh/internal/types/destinations_configuration.go
+++ b/internal/mesh/internal/types/destinations_configuration.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/hashicorp/consul/internal/resource"
 	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 )
 
 func RegisterDestinationsConfiguration(r resource.Registry) {
@@ -22,13 +23,17 @@ func RegisterDestinationsConfiguration(r resource.Registry) {
 	})
 }
 
-var ValidateDestinationsConfiguration = resource.DecodeAndValidate(validateDestinationsConfiguration)
+func ValidateDestinationsConfiguration(res *pbresource.Resource) error {
+	var cfg pbmesh.DestinationsConfiguration
+
+	if err := res.Data.UnmarshalTo(&cfg); err != nil {
+		return resource.NewErrDataParse(&cfg, err)
+	}
 
-func validateDestinationsConfiguration(res *DecodedDestinationsConfiguration) error {
 	var merr error
 
 	// Validate the workload selector
-	if selErr := catalog.ValidateSelector(res.Data.Workloads, false); selErr != nil {
+	if selErr := catalog.ValidateSelector(cfg.Workloads, false); selErr != nil {
 		merr = multierror.Append(merr, resource.ErrInvalidField{
 			Name:    "workloads",
 			Wrapped: selErr,
diff --git a/internal/mesh/internal/types/grpc_route.go b/internal/mesh/internal/types/grpc_route.go
index b861abccdc050..630e416e611c4 100644
--- a/internal/mesh/internal/types/grpc_route.go
+++ b/internal/mesh/internal/types/grpc_route.go
@@ -11,6 +11,7 @@ import (
 
 	"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) {
@@ -24,16 +25,20 @@ func RegisterGRPCRoute(r resource.Registry) {
 	})
 }
 
-var MutateGRPCRoute = resource.DecodeAndMutate(mutateGRPCRoute)
+func MutateGRPCRoute(res *pbresource.Resource) error {
+	var route pbmesh.GRPCRoute
+
+	if err := res.Data.UnmarshalTo(&route); err != nil {
+		return resource.NewErrDataParse(&route, err)
+	}
 
-func mutateGRPCRoute(res *DecodedGRPCRoute) (bool, error) {
 	changed := false
 
-	if mutateParentRefs(res.Id.Tenancy, res.Data.ParentRefs) {
+	if mutateParentRefs(res.Id.Tenancy, route.ParentRefs) {
 		changed = true
 	}
 
-	for _, rule := range res.Data.Rules {
+	for _, rule := range route.Rules {
 		for _, backend := range rule.BackendRefs {
 			if backend.BackendRef == nil || backend.BackendRef.Ref == nil {
 				continue
@@ -44,25 +49,33 @@ func mutateGRPCRoute(res *DecodedGRPCRoute) (bool, error) {
 		}
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&route)
 }
 
-var ValidateGRPCRoute = resource.DecodeAndValidate(validateGRPCRoute)
+func ValidateGRPCRoute(res *pbresource.Resource) error {
+	var route pbmesh.GRPCRoute
+
+	if err := res.Data.UnmarshalTo(&route); err != nil {
+		return resource.NewErrDataParse(&route, err)
+	}
 
-func validateGRPCRoute(res *DecodedGRPCRoute) error {
 	var merr error
-	if err := validateParentRefs(res.Id, res.Data.ParentRefs); err != nil {
+	if err := validateParentRefs(res.Id, route.ParentRefs); err != nil {
 		merr = multierror.Append(merr, err)
 	}
 
-	if len(res.Data.Hostnames) > 0 {
+	if len(route.Hostnames) > 0 {
 		merr = multierror.Append(merr, resource.ErrInvalidField{
 			Name:    "hostnames",
 			Wrapped: errors.New("should not populate hostnames"),
 		})
 	}
 
-	for i, rule := range res.Data.Rules {
+	for i, rule := range route.Rules {
 		wrapRuleErr := func(err error) error {
 			return resource.ErrInvalidListElement{
 				Name:    "rules",
diff --git a/internal/mesh/internal/types/http_route.go b/internal/mesh/internal/types/http_route.go
index d32f55dc6cc82..0ac2dcbf5c8b0 100644
--- a/internal/mesh/internal/types/http_route.go
+++ b/internal/mesh/internal/types/http_route.go
@@ -13,6 +13,7 @@ import (
 
 	"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) {
@@ -26,16 +27,20 @@ func RegisterHTTPRoute(r resource.Registry) {
 	})
 }
 
-var MutateHTTPRoute = resource.DecodeAndMutate(mutateHTTPRoute)
+func MutateHTTPRoute(res *pbresource.Resource) error {
+	var route pbmesh.HTTPRoute
+
+	if err := res.Data.UnmarshalTo(&route); err != nil {
+		return resource.NewErrDataParse(&route, err)
+	}
 
-func mutateHTTPRoute(res *DecodedHTTPRoute) (bool, error) {
 	changed := false
 
-	if mutateParentRefs(res.Id.Tenancy, res.Data.ParentRefs) {
+	if mutateParentRefs(res.Id.Tenancy, route.ParentRefs) {
 		changed = true
 	}
 
-	for _, rule := range res.Data.Rules {
+	for _, rule := range route.Rules {
 		for _, match := range rule.Matches {
 			if match.Method != "" {
 				norm := strings.ToUpper(match.Method)
@@ -55,25 +60,33 @@ func mutateHTTPRoute(res *DecodedHTTPRoute) (bool, error) {
 		}
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&route)
 }
 
-var ValidateHTTPRoute = resource.DecodeAndValidate(validateHTTPRoute)
+func ValidateHTTPRoute(res *pbresource.Resource) error {
+	var route pbmesh.HTTPRoute
+
+	if err := res.Data.UnmarshalTo(&route); err != nil {
+		return resource.NewErrDataParse(&route, err)
+	}
 
-func validateHTTPRoute(res *DecodedHTTPRoute) error {
 	var merr error
-	if err := validateParentRefs(res.Id, res.Data.ParentRefs); err != nil {
+	if err := validateParentRefs(res.Id, route.ParentRefs); err != nil {
 		merr = multierror.Append(merr, err)
 	}
 
-	if len(res.Data.Hostnames) > 0 {
+	if len(route.Hostnames) > 0 {
 		merr = multierror.Append(merr, resource.ErrInvalidField{
 			Name:    "hostnames",
 			Wrapped: errors.New("should not populate hostnames"),
 		})
 	}
 
-	for i, rule := range res.Data.Rules {
+	for i, rule := range route.Rules {
 		wrapRuleErr := func(err error) error {
 			return resource.ErrInvalidListElement{
 				Name:    "rules",
diff --git a/internal/mesh/internal/types/mesh_configuration.go b/internal/mesh/internal/types/mesh_configuration.go
deleted file mode 100644
index 323c86e544a77..0000000000000
--- a/internal/mesh/internal/types/mesh_configuration.go
+++ /dev/null
@@ -1,22 +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"
-)
-
-// RegisterMeshConfiguration takes the resource registry and registers
-// the MeshConfiguration resource to it.
-func RegisterMeshConfiguration(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.MeshConfigurationType,
-		Proto:    &pbmesh.MeshConfiguration{},
-		Scope:    resource.ScopePartition,
-		ACLs:     nil, // TODO NET-6423
-		Mutate:   nil, // TODO NET-6425
-		Validate: nil, // TODO NET-6424
-	})
-}
diff --git a/internal/mesh/internal/types/mesh_gateway.go b/internal/mesh/internal/types/mesh_gateway.go
deleted file mode 100644
index 2583b4dcc01ae..0000000000000
--- a/internal/mesh/internal/types/mesh_gateway.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"
-	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
-)
-
-func RegisterMeshGateway(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmesh.MeshGatewayType,
-		Proto:    &pbmesh.MeshGateway{},
-		Scope:    resource.ScopePartition,
-		ACLs:     nil, // TODO NET-6416
-		Mutate:   nil, // TODO NET-6418
-		Validate: nil, // TODO NET-6417
-	})
-}
diff --git a/internal/mesh/internal/types/proxy_configuration.go b/internal/mesh/internal/types/proxy_configuration.go
index 9a4388a40f01d..081324d721675 100644
--- a/internal/mesh/internal/types/proxy_configuration.go
+++ b/internal/mesh/internal/types/proxy_configuration.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/hashicorp/consul/internal/resource"
 	pbmesh "github.com/hashicorp/consul/proto-public/pbmesh/v2beta1"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/sdk/iptables"
 )
 
@@ -26,40 +27,52 @@ func RegisterProxyConfiguration(r resource.Registry) {
 	})
 }
 
-var MutateProxyConfiguration = resource.DecodeAndMutate(mutateProxyConfiguration)
+func MutateProxyConfiguration(res *pbresource.Resource) error {
+	var proxyCfg pbmesh.ProxyConfiguration
+	err := res.Data.UnmarshalTo(&proxyCfg)
+	if err != nil {
+		return resource.NewErrDataParse(&proxyCfg, err)
+	}
 
-func mutateProxyConfiguration(res *DecodedProxyConfiguration) (bool, error) {
 	changed := false
 
 	// Default the tproxy outbound port.
-	if res.Data.IsTransparentProxy() {
-		if res.Data.GetDynamicConfig().GetTransparentProxy() == nil {
-			res.Data.DynamicConfig.TransparentProxy = &pbmesh.TransparentProxy{
+	if proxyCfg.IsTransparentProxy() {
+		if proxyCfg.GetDynamicConfig().GetTransparentProxy() == nil {
+			proxyCfg.DynamicConfig.TransparentProxy = &pbmesh.TransparentProxy{
 				OutboundListenerPort: iptables.DefaultTProxyOutboundPort,
 			}
 			changed = true
-		} else if res.Data.GetDynamicConfig().GetTransparentProxy().OutboundListenerPort == 0 {
-			res.Data.DynamicConfig.TransparentProxy.OutboundListenerPort = iptables.DefaultTProxyOutboundPort
+		} else if proxyCfg.GetDynamicConfig().GetTransparentProxy().OutboundListenerPort == 0 {
+			proxyCfg.DynamicConfig.TransparentProxy.OutboundListenerPort = iptables.DefaultTProxyOutboundPort
 			changed = true
 		}
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&proxyCfg)
 }
 
-var ValidateProxyConfiguration = resource.DecodeAndValidate(validateProxyConfiguration)
+func ValidateProxyConfiguration(res *pbresource.Resource) error {
+	decodedProxyCfg, decodeErr := resource.Decode[*pbmesh.ProxyConfiguration](res)
+	if decodeErr != nil {
+		return resource.NewErrDataParse(decodedProxyCfg.GetData(), decodeErr)
+	}
+	proxyCfg := decodedProxyCfg.GetData()
 
-func validateProxyConfiguration(res *DecodedProxyConfiguration) error {
 	var err error
 
-	if selErr := catalog.ValidateSelector(res.Data.Workloads, false); selErr != nil {
+	if selErr := catalog.ValidateSelector(proxyCfg.Workloads, false); selErr != nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "workloads",
 			Wrapped: selErr,
 		})
 	}
 
-	if res.Data.GetDynamicConfig() == nil && res.Data.GetBootstrapConfig() == nil {
+	if proxyCfg.GetDynamicConfig() == nil && proxyCfg.GetBootstrapConfig() == nil {
 		err = multierror.Append(err, resource.ErrInvalidFields{
 			Names:   []string{"dynamic_config", "bootstrap_config"},
 			Wrapped: errMissingProxyConfigData,
@@ -67,14 +80,14 @@ func validateProxyConfiguration(res *DecodedProxyConfiguration) error {
 	}
 
 	// nolint:staticcheck
-	if res.Data.GetOpaqueConfig() != nil {
+	if proxyCfg.GetOpaqueConfig() != nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "opaque_config",
 			Wrapped: resource.ErrUnsupported,
 		})
 	}
 
-	if dynamicCfgErr := validateDynamicProxyConfiguration(res.Data.GetDynamicConfig()); dynamicCfgErr != nil {
+	if dynamicCfgErr := validateDynamicProxyConfiguration(proxyCfg.GetDynamicConfig()); dynamicCfgErr != nil {
 		err = multierror.Append(err, resource.ErrInvalidField{
 			Name:    "dynamic_config",
 			Wrapped: dynamicCfgErr,
diff --git a/internal/mesh/internal/types/proxy_state_template.go b/internal/mesh/internal/types/proxy_state_template.go
index 43d2148217e03..7db3dbaf55fd9 100644
--- a/internal/mesh/internal/types/proxy_state_template.go
+++ b/internal/mesh/internal/types/proxy_state_template.go
@@ -50,21 +50,25 @@ func RegisterProxyStateTemplate(r resource.Registry) {
 	})
 }
 
-var ValidateProxyStateTemplate = resource.DecodeAndValidate(validateProxyStateTemplate)
-
-func validateProxyStateTemplate(res *DecodedProxyStateTemplate) error {
+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 res.Data.ProxyState != nil {
+	if pst.ProxyState != nil {
 		wrapProxyStateErr := func(err error) error {
 			return resource.ErrInvalidField{
 				Name:    "proxy_state",
 				Wrapped: err,
 			}
 		}
-		for name, cluster := range res.Data.ProxyState.Clusters {
+		for name, cluster := range pst.ProxyState.Clusters {
 			if name == "" {
 				merr = multierror.Append(merr, wrapProxyStateErr(resource.ErrInvalidMapKey{
 					Map:     "clusters",
diff --git a/internal/mesh/internal/types/tcp_route.go b/internal/mesh/internal/types/tcp_route.go
index 02dd5aaa10fdd..c7470b14d55ae 100644
--- a/internal/mesh/internal/types/tcp_route.go
+++ b/internal/mesh/internal/types/tcp_route.go
@@ -10,6 +10,7 @@ import (
 
 	"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) {
@@ -23,16 +24,20 @@ func RegisterTCPRoute(r resource.Registry) {
 	})
 }
 
-var MutateTCPRoute = resource.DecodeAndMutate(mutateTCPRoute)
+func MutateTCPRoute(res *pbresource.Resource) error {
+	var route pbmesh.TCPRoute
+
+	if err := res.Data.UnmarshalTo(&route); err != nil {
+		return resource.NewErrDataParse(&route, err)
+	}
 
-func mutateTCPRoute(res *DecodedTCPRoute) (bool, error) {
 	changed := false
 
-	if mutateParentRefs(res.Id.Tenancy, res.Data.ParentRefs) {
+	if mutateParentRefs(res.Id.Tenancy, route.ParentRefs) {
 		changed = true
 	}
 
-	for _, rule := range res.Data.Rules {
+	for _, rule := range route.Rules {
 		for _, backend := range rule.BackendRefs {
 			if backend.BackendRef == nil || backend.BackendRef.Ref == nil {
 				continue
@@ -43,26 +48,34 @@ func mutateTCPRoute(res *DecodedTCPRoute) (bool, error) {
 		}
 	}
 
-	return changed, nil
+	if !changed {
+		return nil
+	}
+
+	return res.Data.MarshalFrom(&route)
 }
 
-var ValidateTCPRoute = resource.DecodeAndValidate(validateTCPRoute)
+func ValidateTCPRoute(res *pbresource.Resource) error {
+	var route pbmesh.TCPRoute
+
+	if err := res.Data.UnmarshalTo(&route); err != nil {
+		return resource.NewErrDataParse(&route, err)
+	}
 
-func validateTCPRoute(res *DecodedTCPRoute) error {
 	var merr error
 
-	if err := validateParentRefs(res.Id, res.Data.ParentRefs); err != nil {
+	if err := validateParentRefs(res.Id, route.ParentRefs); err != nil {
 		merr = multierror.Append(merr, err)
 	}
 
-	if len(res.Data.Rules) > 1 {
+	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 res.Data.Rules {
+	for i, rule := range route.Rules {
 		wrapRuleErr := func(err error) error {
 			return resource.ErrInvalidListElement{
 				Name:    "rules",
diff --git a/internal/mesh/internal/types/types.go b/internal/mesh/internal/types/types.go
index d98e820e82b4b..cf1443aabf18d 100644
--- a/internal/mesh/internal/types/types.go
+++ b/internal/mesh/internal/types/types.go
@@ -18,8 +18,6 @@ func Register(r resource.Registry) {
 	RegisterGRPCRoute(r)
 	RegisterDestinationPolicy(r)
 	RegisterComputedRoutes(r)
-	RegisterMeshGateway(r)
-	RegisterMeshConfiguration(r)
 	// todo (v2): uncomment once we implement it.
 	//RegisterDestinationsConfiguration(r)
 }
diff --git a/internal/mesh/internal/types/xroute.go b/internal/mesh/internal/types/xroute.go
index 92e2136cd1356..619c9cb682435 100644
--- a/internal/mesh/internal/types/xroute.go
+++ b/internal/mesh/internal/types/xroute.go
@@ -288,17 +288,28 @@ func isValidRetryCondition(retryOn string) bool {
 
 func xRouteACLHooks[R XRouteData]() *resource.ACLHooks {
 	hooks := &resource.ACLHooks{
-		Read:  resource.DecodeAndAuthorizeRead(aclReadHookXRoute[R]),
-		Write: resource.DecodeAndAuthorizeWrite(aclWriteHookXRoute[R]),
+		Read:  aclReadHookXRoute[R],
+		Write: aclWriteHookXRoute[R],
 		List:  resource.NoOpACLListHook,
 	}
 
 	return hooks
 }
 
-func aclReadHookXRoute[R XRouteData](authorizer acl.Authorizer, _ *acl.AuthorizerContext, res *resource.DecodedResource[R]) error {
+func aclReadHookXRoute[R XRouteData](authorizer acl.Authorizer, _ *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
+	if res == nil {
+		return resource.ErrNeedResource
+	}
+
+	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 res.Data.GetParentRefs() {
+	for _, parentRef := range route.GetParentRefs() {
 		parentAuthzContext := resource.AuthorizerContext(parentRef.Ref.GetTenancy())
 		parentServiceName := parentRef.Ref.GetName()
 
@@ -310,9 +321,16 @@ func aclReadHookXRoute[R XRouteData](authorizer acl.Authorizer, _ *acl.Authorize
 	return nil
 }
 
-func aclWriteHookXRoute[R XRouteData](authorizer acl.Authorizer, _ *acl.AuthorizerContext, res *resource.DecodedResource[R]) error {
+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 res.Data.GetParentRefs() {
+	for _, parentRef := range route.GetParentRefs() {
 		parentAuthzContext := resource.AuthorizerContext(parentRef.Ref.GetTenancy())
 		parentServiceName := parentRef.Ref.GetName()
 
@@ -322,7 +340,7 @@ func aclWriteHookXRoute[R XRouteData](authorizer acl.Authorizer, _ *acl.Authoriz
 	}
 
 	// Need service:read on ALL of the services this directs traffic at.
-	for _, backendRef := range res.Data.GetUnderlyingBackendRefs() {
+	for _, backendRef := range route.GetUnderlyingBackendRefs() {
 		backendAuthzContext := resource.AuthorizerContext(backendRef.Ref.GetTenancy())
 		backendServiceName := backendRef.Ref.GetName()
 
diff --git a/internal/mesh/proxy-tracker/proxy_tracker.go b/internal/mesh/proxy-tracker/proxy_tracker.go
index f60cacb5cd1e4..d9dae03a13cde 100644
--- a/internal/mesh/proxy-tracker/proxy_tracker.go
+++ b/internal/mesh/proxy-tracker/proxy_tracker.go
@@ -6,7 +6,6 @@ package proxytracker
 import (
 	"errors"
 	"fmt"
-	"github.com/hashicorp/consul/lib/channels"
 	"sync"
 
 	"github.com/hashicorp/go-hclog"
@@ -208,8 +207,32 @@ func (pt *ProxyTracker) PushChange(proxyID *pbresource.ID, proxyState proxysnaps
 
 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)
-	err := channels.DeliverLatest(proxyState, ch)
-	if err != nil {
+	// 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(),
 		)
diff --git a/internal/multicluster/exports.go b/internal/multicluster/exports.go
deleted file mode 100644
index a4fc9a6e5d7a3..0000000000000
--- a/internal/multicluster/exports.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package multicluster
-
-import (
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/multicluster/internal/controllers"
-	"github.com/hashicorp/consul/internal/multicluster/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-)
-
-var (
-	// API Group Information
-	APIGroup       = types.GroupName
-	VersionV2Beta1 = types.VersionV2Beta1
-	CurrentVersion = types.CurrentVersion
-)
-
-// RegisterTypes adds all resource types within the "multicluster" API group
-// to the given type registry
-func RegisterTypes(r resource.Registry) {
-	types.Register(r)
-}
-
-// RegisterControllers registers controllers for the multicluster types with
-// the given controller Manager.
-func RegisterControllers(mgr *controller.Manager) {
-	controllers.Register(mgr)
-}
diff --git a/internal/multicluster/internal/controllers/exportedservices/controller.go b/internal/multicluster/internal/controllers/exportedservices/controller.go
deleted file mode 100644
index ba7e42f36cce7..0000000000000
--- a/internal/multicluster/internal/controllers/exportedservices/controller.go
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package exportedservices
-
-import (
-	"context"
-	"fmt"
-	"sort"
-
-	"google.golang.org/protobuf/proto"
-	"google.golang.org/protobuf/types/known/anypb"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/multicluster/internal/types"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/storage"
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func Controller() controller.Controller {
-
-	return controller.ForType(pbmulticluster.ComputedExportedServicesType).
-		WithWatch(pbmulticluster.ExportedServicesType, ReplaceTypeForComputedExportedServices()).
-		WithWatch(pbcatalog.ServiceType, ReplaceTypeForComputedExportedServices()).
-		WithWatch(pbmulticluster.NamespaceExportedServicesType, ReplaceTypeForComputedExportedServices()).
-		WithWatch(pbmulticluster.PartitionExportedServicesType, ReplaceTypeForComputedExportedServices()).
-		WithReconciler(&reconciler{})
-}
-
-type reconciler struct{}
-
-type serviceExports struct {
-	ref        *pbresource.Reference
-	partitions map[string]struct{}
-	peers      map[string]struct{}
-}
-
-func (r *reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rt.Logger = rt.Logger.With("resource-id", req.ID)
-	rt.Logger.Trace("reconciling exported services")
-	exportedServices, err := resource.ListDecodedResource[*pbmulticluster.ExportedServices](ctx, rt.Client, &pbresource.ListRequest{
-		Tenancy: &pbresource.Tenancy{
-			Namespace: storage.Wildcard,
-			Partition: req.ID.Tenancy.Partition,
-			PeerName:  resource.DefaultPeerName,
-		},
-		Type: pbmulticluster.ExportedServicesType,
-	})
-	if err != nil {
-		rt.Logger.Error("error getting exported services", "error", err)
-		return err
-	}
-	namespaceExportedServices, err := resource.ListDecodedResource[*pbmulticluster.NamespaceExportedServices](ctx, rt.Client, &pbresource.ListRequest{
-		Tenancy: &pbresource.Tenancy{
-			Namespace: storage.Wildcard,
-			Partition: req.ID.Tenancy.Partition,
-			PeerName:  resource.DefaultPeerName,
-		},
-		Type: pbmulticluster.NamespaceExportedServicesType,
-	})
-	if err != nil {
-		rt.Logger.Error("error getting namespace exported services", "error", err)
-		return err
-	}
-	partitionedExportedServices, err := resource.ListDecodedResource[*pbmulticluster.PartitionExportedServices](ctx, rt.Client, &pbresource.ListRequest{
-		Tenancy: &pbresource.Tenancy{
-			Partition: req.ID.Tenancy.Partition,
-			PeerName:  resource.DefaultPeerName,
-		},
-		Type: pbmulticluster.PartitionExportedServicesType,
-	})
-	if err != nil {
-		rt.Logger.Error("error getting partitioned exported services", "error", err)
-		return err
-	}
-	oldComputedExportedService, err := getOldComputedExportedService(ctx, rt, req)
-	if err != nil {
-		return err
-	}
-	if len(exportedServices) == 0 && len(namespaceExportedServices) == 0 && len(partitionedExportedServices) == 0 {
-		if oldComputedExportedService.GetResource() != nil {
-			rt.Logger.Trace("deleting computed exported services")
-			if err := deleteResource(ctx, rt, oldComputedExportedService.GetResource()); err != nil {
-				rt.Logger.Error("error deleting computed exported service", "error", err)
-				return err
-			}
-		}
-		return nil
-	}
-	namespace := getNamespaceForServices(exportedServices, namespaceExportedServices, partitionedExportedServices)
-	services, err := resource.ListDecodedResource[*pbcatalog.Service](ctx, rt.Client, &pbresource.ListRequest{
-		Tenancy: &pbresource.Tenancy{
-			Namespace: namespace,
-			Partition: req.ID.Tenancy.Partition,
-			PeerName:  resource.DefaultPeerName,
-		},
-		Type: pbcatalog.ServiceType,
-	})
-	if err != nil {
-		rt.Logger.Error("error getting services", "error", err)
-		return err
-	}
-	builder := newExportedServicesBuilder()
-
-	svcs := make(map[resource.ReferenceKey]struct{}, len(services))
-	for _, svc := range services {
-		svcs[resource.NewReferenceKey(svc.Id)] = struct{}{}
-	}
-
-	for _, es := range exportedServices {
-		for _, svc := range es.Data.Services {
-			id := &pbresource.ID{
-				Type:    pbcatalog.ServiceType,
-				Tenancy: es.Id.Tenancy,
-				Name:    svc,
-			}
-			if _, ok := svcs[resource.NewReferenceKey(id)]; ok {
-				builder.track(id, es.Data.Consumers)
-			}
-		}
-	}
-
-	for _, nes := range namespaceExportedServices {
-		for _, svc := range services {
-			if svc.Id.Tenancy.Namespace != nes.Id.Tenancy.Namespace {
-				continue
-			}
-			builder.track(svc.Id, nes.Data.Consumers)
-		}
-	}
-
-	for _, pes := range partitionedExportedServices {
-		for _, svc := range services {
-			builder.track(svc.Id, pes.Data.Consumers)
-		}
-	}
-	newComputedExportedService := builder.build()
-
-	if oldComputedExportedService.GetResource() != nil && newComputedExportedService == nil {
-		rt.Logger.Trace("deleting computed exported services")
-		if err := deleteResource(ctx, rt, oldComputedExportedService.GetResource()); err != nil {
-			rt.Logger.Error("error deleting computed exported service", "error", err)
-			return err
-		}
-		return nil
-	}
-	if proto.Equal(newComputedExportedService, oldComputedExportedService.GetData()) {
-		rt.Logger.Trace("skip writing computed exported services")
-		return nil
-	}
-	newComputedExportedServiceData, err := anypb.New(newComputedExportedService)
-	if err != nil {
-		rt.Logger.Error("error marshalling latest computed exported service", "error", err)
-		return err
-	}
-
-	rt.Logger.Trace("writing computed exported services")
-	_, err = rt.Client.Write(ctx, &pbresource.WriteRequest{
-		Resource: &pbresource.Resource{
-			Id:    req.ID,
-			Owner: nil,
-			Data:  newComputedExportedServiceData,
-		},
-	})
-	if err != nil {
-		rt.Logger.Error("error writing computed exported service", "error", err)
-		return err
-	}
-	return nil
-}
-
-func ReplaceTypeForComputedExportedServices() controller.DependencyMapper {
-	return func(_ context.Context, _ controller.Runtime, res *pbresource.Resource) ([]controller.Request, error) {
-		return []controller.Request{
-			{
-				ID: &pbresource.ID{
-					Type: pbmulticluster.ComputedExportedServicesType,
-					Tenancy: &pbresource.Tenancy{
-						Partition: res.Id.Tenancy.Partition,
-					},
-					Name: "global",
-				},
-			},
-		}, nil
-	}
-}
-
-func getOldComputedExportedService(ctx context.Context, rt controller.Runtime, req controller.Request) (*resource.DecodedResource[*pbmulticluster.ComputedExportedServices], error) {
-	computedExpSvcID := &pbresource.ID{
-		Name: types.ComputedExportedServicesName,
-		Type: pbmulticluster.ComputedExportedServicesType,
-		Tenancy: &pbresource.Tenancy{
-			Partition: req.ID.Tenancy.Partition,
-		},
-	}
-	computedExpSvcRes, err := resource.GetDecodedResource[*pbmulticluster.ComputedExportedServices](ctx, rt.Client, computedExpSvcID)
-	if err != nil {
-		rt.Logger.Error("error fetching computed exported service", "error", err)
-		return nil, err
-	}
-	return computedExpSvcRes, nil
-}
-
-type exportedServicesBuilder struct {
-	data map[resource.ReferenceKey]*serviceExports
-}
-
-func newExportedServicesBuilder() *exportedServicesBuilder {
-	return &exportedServicesBuilder{
-		data: make(map[resource.ReferenceKey]*serviceExports),
-	}
-}
-
-func (b *exportedServicesBuilder) track(id *pbresource.ID, consumers []*pbmulticluster.ExportedServicesConsumer) error {
-	key := resource.NewReferenceKey(id)
-	exports, ok := b.data[key]
-
-	if !ok {
-		exports = &serviceExports{
-			ref:        resource.Reference(id, ""),
-			partitions: make(map[string]struct{}),
-			peers:      make(map[string]struct{}),
-		}
-		b.data[key] = exports
-	}
-
-	for _, c := range consumers {
-		switch v := c.ConsumerTenancy.(type) {
-		case *pbmulticluster.ExportedServicesConsumer_Peer:
-			exports.peers[v.Peer] = struct{}{}
-		case *pbmulticluster.ExportedServicesConsumer_Partition:
-			exports.partitions[v.Partition] = struct{}{}
-		case *pbmulticluster.ExportedServicesConsumer_SamenessGroup:
-			// TODO do we currently validate that sameness groups can't be set?
-			return fmt.Errorf("unexpected export to sameness group %q", v.SamenessGroup)
-		}
-	}
-
-	return nil
-}
-
-func (b *exportedServicesBuilder) build() *pbmulticluster.ComputedExportedServices {
-	if len(b.data) == 0 {
-		return nil
-	}
-
-	ces := &pbmulticluster.ComputedExportedServices{
-		Consumers: make([]*pbmulticluster.ComputedExportedService, 0, len(b.data)),
-	}
-
-	for _, svc := range sortRefValue(b.data) {
-		consumers := make([]*pbmulticluster.ComputedExportedServicesConsumer, 0, len(svc.peers)+len(svc.partitions))
-
-		for _, peer := range sortKeys(svc.peers) {
-			consumers = append(consumers, &pbmulticluster.ComputedExportedServicesConsumer{
-				ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Peer{
-					Peer: peer,
-				},
-			})
-		}
-
-		for _, partition := range sortKeys(svc.partitions) {
-			consumers = append(consumers, &pbmulticluster.ComputedExportedServicesConsumer{
-				ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Partition{
-					Partition: partition,
-				},
-			})
-		}
-
-		ces.Consumers = append(ces.Consumers, &pbmulticluster.ComputedExportedService{
-			TargetRef: svc.ref,
-			Consumers: consumers,
-		})
-	}
-
-	return ces
-}
-
-func sortKeys(m map[string]struct{}) []string {
-	keys := make([]string, 0, len(m))
-	for key := range m {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-func sortRefValue(m map[resource.ReferenceKey]*serviceExports) []*serviceExports {
-	vals := make([]*serviceExports, 0, len(m))
-	for _, val := range m {
-		vals = append(vals, val)
-	}
-	sort.Slice(vals, func(i, j int) bool {
-		return resource.ReferenceToString(vals[i].ref) < resource.ReferenceToString(vals[j].ref)
-	})
-	return vals
-}
-
-func getNamespaceForServices(exportedServices []*types.DecodedExportedServices, namespaceExportedServices []*types.DecodedNamespaceExportedServices, partitionedExportedServices []*types.DecodedPartitionExportedServices) string {
-	if len(partitionedExportedServices) > 0 {
-		return storage.Wildcard
-	}
-	resources := []*pbresource.Resource{}
-	for _, exp := range exportedServices {
-		resources = append(resources, exp.GetResource())
-	}
-	for _, exp := range namespaceExportedServices {
-		resources = append(resources, exp.GetResource())
-	}
-	return getNamespace(resources)
-}
-
-func getNamespace(resources []*pbresource.Resource) string {
-	if len(resources) == 0 {
-		// We shouldn't ever hit this.
-		panic("resources cannot be empty")
-	}
-
-	namespace := resources[0].Id.Tenancy.Namespace
-	for _, res := range resources[1:] {
-		if res.Id.Tenancy.Namespace != namespace {
-			return storage.Wildcard
-		}
-	}
-	return namespace
-}
-
-func deleteResource(ctx context.Context, rt controller.Runtime, resource *pbresource.Resource) error {
-	_, err := rt.Client.Delete(ctx, &pbresource.DeleteRequest{
-		Id:      resource.GetId(),
-		Version: resource.GetVersion(),
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/internal/multicluster/internal/controllers/exportedservices/controller_test.go b/internal/multicluster/internal/controllers/exportedservices/controller_test.go
deleted file mode 100644
index 667f4ef3a9c08..0000000000000
--- a/internal/multicluster/internal/controllers/exportedservices/controller_test.go
+++ /dev/null
@@ -1,440 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package exportedservices
-
-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/multicluster/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"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/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/version/versiontest"
-)
-
-type controllerSuite struct {
-	suite.Suite
-	ctx          context.Context
-	client       *rtest.Client
-	rt           controller.Runtime
-	isEnterprise bool
-	reconciler   *reconciler
-	tenancies    []*pbresource.Tenancy
-}
-
-func (suite *controllerSuite) SetupTest() {
-	suite.ctx = testutil.TestContext(suite.T())
-	suite.tenancies = rtest.TestTenancies()
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(types.Register, catalog.RegisterTypes).
-		WithTenancies(suite.tenancies...).
-		WithTenancies(rtest.Tenancy("default.app"), rtest.Tenancy("foo.app")).
-		Run(suite.T())
-
-	suite.client = rtest.NewClient(client)
-	suite.rt = controller.Runtime{
-		Client: suite.client,
-		Logger: testutil.Logger(suite.T()),
-	}
-	suite.reconciler = &reconciler{}
-	suite.isEnterprise = versiontest.IsEnterprise()
-}
-
-func (suite *controllerSuite) TestReconcile() {
-	suite.runTestCaseWithTenancies(suite.reconcileTest)
-}
-
-func TestController(t *testing.T) {
-	suite.Run(t, new(controllerSuite))
-}
-
-func (suite *controllerSuite) runTestCaseWithTenancies(testFunc func(*pbresource.Tenancy)) {
-	for _, tenancy := range suite.tenancies {
-		suite.Run(suite.appendTenancyInfo(tenancy), func() {
-			testFunc(tenancy)
-		})
-	}
-}
-
-func (suite *controllerSuite) appendTenancyInfo(tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_Namespace_%s_Partition", tenancy.Namespace, tenancy.Partition)
-}
-
-func (suite *controllerSuite) getComputedExportedSvc(id *pbresource.ID) *pbmulticluster.ComputedExportedServices {
-	computedExportedService := suite.client.RequireResourceExists(suite.T(), id)
-	decodedComputedExportedService := rtest.MustDecode[*pbmulticluster.ComputedExportedServices](suite.T(), computedExportedService)
-	return decodedComputedExportedService.Data
-}
-
-func (suite *controllerSuite) reconcileTest(tenancy *pbresource.Tenancy) {
-	id := rtest.Resource(pbmulticluster.ComputedExportedServicesType, "global").WithTenancy(&pbresource.Tenancy{
-		Partition: tenancy.Partition,
-	}).ID()
-	require.NotNil(suite.T(), id)
-
-	svc1 := rtest.Resource(pbcatalog.ServiceType, "svc1").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		WithTenancy(tenancy).
-		Write(suite.T(), suite.client)
-
-	exportedSvcData := &pbmulticluster.ExportedServices{
-		Services: []string{"svc1", "svcx"},
-		Consumers: []*pbmulticluster.ExportedServicesConsumer{{ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Peer{
-			Peer: "peer-0",
-		}}},
-	}
-
-	if suite.isEnterprise {
-		exportedSvcData.Consumers = append(exportedSvcData.Consumers, &pbmulticluster.ExportedServicesConsumer{ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Partition{
-			Partition: "part-0",
-		}})
-	}
-	expSvc := rtest.Resource(pbmulticluster.ExportedServicesType, "expsvc").WithData(suite.T(), exportedSvcData).WithTenancy(tenancy).Write(suite.T(), suite.client)
-	require.NotNil(suite.T(), expSvc)
-
-	err := suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-	actualComputedExportedService := suite.getComputedExportedSvc(id)
-	expectedComputedExportedService := getExpectation(tenancy, suite.isEnterprise, 0)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	rtest.Resource(pbcatalog.ServiceType, "svc2").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		WithTenancy(tenancy).
-		Write(suite.T(), suite.client)
-
-	svc0 := rtest.Resource(pbcatalog.ServiceType, "svc0").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		WithTenancy(&pbresource.Tenancy{
-			Partition: tenancy.Partition,
-			Namespace: "app",
-		}).
-		Write(suite.T(), suite.client)
-
-	exportedNamespaceSvcData := &pbmulticluster.NamespaceExportedServices{
-		Consumers: []*pbmulticluster.ExportedServicesConsumer{{ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Peer{
-			Peer: "peer-1",
-		}}},
-	}
-
-	nameexpSvc := rtest.Resource(pbmulticluster.NamespaceExportedServicesType, "namesvc").WithData(suite.T(), exportedNamespaceSvcData).WithTenancy(tenancy).Write(suite.T(), suite.client)
-	require.NotNil(suite.T(), nameexpSvc)
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 1)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	svc3 := rtest.Resource(pbcatalog.ServiceType, "svc3").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		WithTenancy(tenancy).
-		Write(suite.T(), suite.client)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 2)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	suite.client.MustDelete(suite.T(), svc3.Id)
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 3)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	partitionedExportedSvcData := &pbmulticluster.PartitionExportedServices{
-		Consumers: []*pbmulticluster.ExportedServicesConsumer{{ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Peer{
-			Peer: "peer-1",
-		}}, {ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Peer{
-			Peer: "peer-2",
-		}}},
-	}
-
-	partexpSvc := rtest.Resource(pbmulticluster.PartitionExportedServicesType, "partsvc").WithData(suite.T(), partitionedExportedSvcData).WithTenancy(&pbresource.Tenancy{Partition: tenancy.Partition}).Write(suite.T(), suite.client)
-	require.NotNil(suite.T(), partexpSvc)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 4)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	svc4 := rtest.Resource(pbcatalog.ServiceType, "svc4").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		WithTenancy(&pbresource.Tenancy{
-			Partition: tenancy.Partition,
-			Namespace: "app",
-		}).
-		Write(suite.T(), suite.client)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 5)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	suite.client.MustDelete(suite.T(), svc4.Id)
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 6)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	rtest.Resource(pbcatalog.ServiceType, "svc5").
-		WithData(suite.T(), &pbcatalog.Service{
-			Ports: []*pbcatalog.ServicePort{
-				{TargetPort: "http", Protocol: pbcatalog.Protocol_PROTOCOL_HTTP},
-			},
-		}).
-		WithTenancy(tenancy).
-		Write(suite.T(), suite.client)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 7)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	suite.client.MustDelete(suite.T(), partexpSvc.Id)
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 8)
-
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	suite.client.MustDelete(suite.T(), nameexpSvc.Id)
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 9)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	suite.client.MustDelete(suite.T(), expSvc.Id)
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireResourceNotFound(suite.T(), id)
-
-	nameexpSvc1 := rtest.Resource(pbmulticluster.NamespaceExportedServicesType, "namesvc1").WithData(suite.T(), exportedNamespaceSvcData).WithTenancy(&pbresource.Tenancy{
-		Partition: tenancy.Partition,
-		Namespace: "app",
-	}).Write(suite.T(), suite.client)
-	require.NotNil(suite.T(), nameexpSvc1)
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(&pbresource.Tenancy{
-		Partition: tenancy.Partition,
-		Namespace: "app",
-	}, suite.isEnterprise, 10)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	expSvc1 := rtest.Resource(pbmulticluster.ExportedServicesType, "expsvc1").WithData(suite.T(), exportedSvcData).WithTenancy(tenancy).Write(suite.T(), suite.client)
-	require.NotNil(suite.T(), expSvc1)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-	actualComputedExportedService = suite.getComputedExportedSvc(id)
-	expectedComputedExportedService = getExpectation(tenancy, suite.isEnterprise, 11)
-	prototest.AssertDeepEqual(suite.T(), expectedComputedExportedService, actualComputedExportedService)
-
-	suite.client.MustDelete(suite.T(), svc0.Id)
-	suite.client.MustDelete(suite.T(), svc1.Id)
-
-	err = suite.reconciler.Reconcile(suite.ctx, suite.rt, controller.Request{ID: id})
-	require.NoError(suite.T(), err)
-
-	suite.client.RequireResourceNotFound(suite.T(), id)
-
-}
-
-func getExpectation(tenancy *pbresource.Tenancy, isEnterprise bool, testCase int) *pbmulticluster.ComputedExportedServices {
-	makeCES := func(consumers ...*pbmulticluster.ComputedExportedService) *pbmulticluster.ComputedExportedServices {
-		return &pbmulticluster.ComputedExportedServices{
-			Consumers: consumers,
-		}
-	}
-	makeConsumer := func(ref *pbresource.Reference, consumers ...*pbmulticluster.ComputedExportedServicesConsumer) *pbmulticluster.ComputedExportedService {
-		var actual []*pbmulticluster.ComputedExportedServicesConsumer
-		for _, c := range consumers {
-			_, ok := c.ConsumerTenancy.(*pbmulticluster.ComputedExportedServicesConsumer_Partition)
-			if (isEnterprise && ok) || !ok {
-				actual = append(actual, c)
-			}
-		}
-
-		return &pbmulticluster.ComputedExportedService{
-			TargetRef: ref,
-			Consumers: actual,
-		}
-	}
-	svc0Ref := &pbresource.Reference{
-		Type: pbcatalog.ServiceType,
-		Tenancy: &pbresource.Tenancy{
-			Partition: tenancy.Partition,
-			Namespace: "app",
-			PeerName:  resource.DefaultPeerName,
-		},
-		Name: "svc0",
-	}
-	svc1Ref := &pbresource.Reference{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: tenancy,
-		Name:    "svc1",
-	}
-	svc2Ref := &pbresource.Reference{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: tenancy,
-		Name:    "svc2",
-	}
-	svc3Ref := &pbresource.Reference{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: tenancy,
-		Name:    "svc3",
-	}
-	svc4Ref := &pbresource.Reference{
-		Type: pbcatalog.ServiceType,
-		Tenancy: &pbresource.Tenancy{
-			Partition: tenancy.Partition,
-			Namespace: "app",
-			PeerName:  resource.DefaultPeerName,
-		},
-		Name: "svc4",
-	}
-	svc5Ref := &pbresource.Reference{
-		Type:    pbcatalog.ServiceType,
-		Tenancy: tenancy,
-		Name:    "svc5",
-	}
-
-	peer0Consumer := &pbmulticluster.ComputedExportedServicesConsumer{
-		ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Peer{
-			Peer: "peer-0",
-		},
-	}
-	peer1Consumer := &pbmulticluster.ComputedExportedServicesConsumer{
-		ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Peer{
-			Peer: "peer-1",
-		},
-	}
-	peer2Consumer := &pbmulticluster.ComputedExportedServicesConsumer{
-		ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Peer{
-			Peer: "peer-2",
-		},
-	}
-
-	part0Consumer := &pbmulticluster.ComputedExportedServicesConsumer{
-		ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Partition{
-			Partition: "part-0",
-		},
-	}
-
-	switch testCase {
-	case 0:
-		return makeCES(makeConsumer(svc1Ref, peer0Consumer, part0Consumer))
-	case 1:
-		return makeCES(
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer),
-		)
-	case 2:
-		return makeCES(
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer),
-			makeConsumer(svc3Ref, peer1Consumer),
-		)
-	case 3:
-		return makeCES(
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer),
-		)
-	case 4:
-		return makeCES(
-			makeConsumer(svc0Ref, peer1Consumer, peer2Consumer),
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, peer2Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer, peer2Consumer),
-		)
-	case 5:
-		return makeCES(
-			makeConsumer(svc0Ref, peer1Consumer, peer2Consumer),
-			makeConsumer(svc4Ref, peer1Consumer, peer2Consumer),
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, peer2Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer, peer2Consumer),
-		)
-	case 6:
-		return makeCES(
-			makeConsumer(svc0Ref, peer1Consumer, peer2Consumer),
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, peer2Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer, peer2Consumer),
-		)
-	case 7:
-		return makeCES(
-			makeConsumer(svc0Ref, peer1Consumer, peer2Consumer),
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, peer2Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer, peer2Consumer),
-			makeConsumer(svc5Ref, peer1Consumer, peer2Consumer),
-		)
-	case 8:
-		return makeCES(
-			makeConsumer(svc1Ref, peer0Consumer, peer1Consumer, part0Consumer),
-			makeConsumer(svc2Ref, peer1Consumer),
-			makeConsumer(svc5Ref, peer1Consumer),
-		)
-	case 9:
-		return makeCES(
-			makeConsumer(svc1Ref, peer0Consumer, part0Consumer),
-		)
-	case 10:
-		return makeCES(
-			makeConsumer(svc0Ref, peer1Consumer),
-		)
-	case 11:
-		return makeCES(
-			makeConsumer(svc0Ref, peer1Consumer),
-			makeConsumer(svc1Ref, peer0Consumer, part0Consumer),
-		)
-	}
-
-	return nil
-}
diff --git a/internal/multicluster/internal/controllers/register.go b/internal/multicluster/internal/controllers/register.go
deleted file mode 100644
index c3bcedcecc468..0000000000000
--- a/internal/multicluster/internal/controllers/register.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controllers
-
-import (
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/multicluster/internal/controllers/exportedservices"
-)
-
-func Register(mgr *controller.Manager) {
-	mgr.Register(exportedservices.Controller())
-}
diff --git a/internal/multicluster/internal/types/computed_exported_services.go b/internal/multicluster/internal/types/computed_exported_services.go
deleted file mode 100644
index 70c900c9b86cd..0000000000000
--- a/internal/multicluster/internal/types/computed_exported_services.go
+++ /dev/null
@@ -1,37 +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"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	ComputedExportedServicesName = "global"
-)
-
-func RegisterComputedExportedServices(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmulticluster.ComputedExportedServicesType,
-		Proto:    &pbmulticluster.ComputedExportedServices{},
-		Scope:    resource.ScopePartition,
-		Validate: ValidateComputedExportedServices,
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookComputedExportedServices,
-			Write: aclWriteHookComputedExportedServices,
-			List:  resource.NoOpACLListHook,
-		},
-	})
-}
-
-func aclReadHookComputedExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().MeshReadAllowed(authzContext)
-}
-
-func aclWriteHookComputedExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, _ *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().MeshWriteAllowed(authzContext)
-}
diff --git a/internal/multicluster/internal/types/computed_exported_services_test.go b/internal/multicluster/internal/types/computed_exported_services_test.go
deleted file mode 100644
index 0315c5788e4df..0000000000000
--- a/internal/multicluster/internal/types/computed_exported_services_test.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/version/versiontest"
-)
-
-func computedExportedServicesWithPartition(partitionName string) *pbmulticluster.ComputedExportedServices {
-	consumers := []*pbmulticluster.ComputedExportedService{
-		{
-			Consumers: []*pbmulticluster.ComputedExportedServicesConsumer{
-				{
-					ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Partition{
-						Partition: partitionName,
-					},
-				},
-			},
-		},
-	}
-	return &pbmulticluster.ComputedExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func computedExportedServicesWithPeer(peerName string) *pbmulticluster.ComputedExportedServices {
-	consumers := []*pbmulticluster.ComputedExportedService{
-		{
-			Consumers: []*pbmulticluster.ComputedExportedServicesConsumer{
-				{
-					ConsumerTenancy: &pbmulticluster.ComputedExportedServicesConsumer_Peer{
-						Peer: peerName,
-					},
-				},
-			},
-		},
-	}
-	return &pbmulticluster.ComputedExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func TestComputedExportedServicesValidations_InvalidName(t *testing.T) {
-	res := resourcetest.Resource(pbmulticluster.ComputedExportedServicesType, "computed-exported-services").
-		WithData(t, computedExportedServicesWithPeer("peer")).
-		Build()
-
-	err := ValidateComputedExportedServices(res)
-	require.Error(t, err)
-	expectedError := errors.New("invalid \"name\" field: name can only be \"global\"")
-	require.ErrorAs(t, err, &expectedError)
-}
-
-func TestComputedExportedServicesACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = resourcetest.DENY
-		ALLOW   = resourcetest.ALLOW
-		DEFAULT = resourcetest.DEFAULT
-	)
-
-	exportedServiceData := &pbmulticluster.ComputedExportedServices{}
-	res := resourcetest.Resource(pbmulticluster.ComputedExportedServicesType, "global").
-		WithData(t, exportedServiceData).
-		Build()
-	resourcetest.ValidateAndNormalize(t, registry, res)
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"mesh read policy": {
-			rules:   `mesh = "read"`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"mesh write policy": {
-			rules:   `mesh = "write"`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	for _, tc := range cases {
-		aclTestCase := resourcetest.ACLTestCase{
-			Rules:   tc.rules,
-			Res:     res,
-			ReadOK:  tc.readOK,
-			WriteOK: tc.writeOK,
-			ListOK:  tc.listOK,
-		}
-		resourcetest.RunACLTestCase(t, aclTestCase, registry)
-	}
-}
-
-func TestComputedExportedServicesValidations(t *testing.T) {
-	type testcase struct {
-		Resource       *pbresource.Resource
-		expectErrorCE  []string
-		expectErrorENT []string
-	}
-
-	isEnterprise := versiontest.IsEnterprise()
-
-	run := func(t *testing.T, tc testcase) {
-		expectError := tc.expectErrorCE
-		if isEnterprise {
-			expectError = tc.expectErrorENT
-		}
-		err := ValidateComputedExportedServices(tc.Resource)
-		if len(expectError) == 0 {
-			require.NoError(t, err)
-		} else {
-			require.Error(t, err)
-			for _, er := range expectError {
-				require.ErrorContains(t, err, er)
-			}
-		}
-	}
-
-	cases := map[string]testcase{
-		"computed exported services with peer": {
-			Resource: resourcetest.Resource(pbmulticluster.ComputedExportedServicesType, ComputedExportedServicesName).
-				WithData(t, computedExportedServicesWithPeer("peer")).
-				Build(),
-		},
-		"computed exported services with partition": {
-			Resource: resourcetest.Resource(pbmulticluster.ComputedExportedServicesType, ComputedExportedServicesName).
-				WithData(t, computedExportedServicesWithPartition("partition")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-		},
-		"computed exported services with peer empty": {
-			Resource: resourcetest.Resource(pbmulticluster.ComputedExportedServicesType, ComputedExportedServicesName).
-				WithData(t, computedExportedServicesWithPeer("")).
-				Build(),
-			expectErrorCE:  []string{`invalid element at index 0 of list "peer": can not be empty`},
-			expectErrorENT: []string{`invalid element at index 0 of list "peer": can not be empty`},
-		},
-		"computed exported services with partition empty": {
-			Resource: resourcetest.Resource(pbmulticluster.ComputedExportedServicesType, ComputedExportedServicesName).
-				WithData(t, computedExportedServicesWithPartition("")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can not be empty`,
-				`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-			expectErrorENT: []string{`invalid element at index 0 of list "partition": can not be empty`},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/multicluster/internal/types/decoded.go b/internal/multicluster/internal/types/decoded.go
deleted file mode 100644
index 6a1b545f0faf0..0000000000000
--- a/internal/multicluster/internal/types/decoded.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-)
-
-type (
-	DecodedExportedServices          = resource.DecodedResource[*pbmulticluster.ExportedServices]
-	DecodedNamespaceExportedServices = resource.DecodedResource[*pbmulticluster.NamespaceExportedServices]
-	DecodedPartitionExportedServices = resource.DecodedResource[*pbmulticluster.PartitionExportedServices]
-)
diff --git a/internal/multicluster/internal/types/exported_services.go b/internal/multicluster/internal/types/exported_services.go
deleted file mode 100644
index 87cebb244ab4e..0000000000000
--- a/internal/multicluster/internal/types/exported_services.go
+++ /dev/null
@@ -1,59 +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"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterExportedServices(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmulticluster.ExportedServicesType,
-		Proto:    &pbmulticluster.ExportedServices{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateExportedServices,
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookExportedServices,
-			Write: aclWriteHookExportedServices,
-			List:  resource.NoOpACLListHook,
-		},
-	})
-}
-
-func aclReadHookExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
-	if res == nil {
-		return resource.ErrNeedResource
-	}
-
-	var exportedService pbmulticluster.ExportedServices
-
-	if err := res.Data.UnmarshalTo(&exportedService); err != nil {
-		return resource.NewErrDataParse(&exportedService, err)
-	}
-
-	for _, serviceName := range exportedService.Services {
-		if err := authorizer.ToAllowAuthorizer().ServiceReadAllowed(serviceName, authzContext); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func aclWriteHookExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	var exportedService pbmulticluster.ExportedServices
-
-	if err := res.Data.UnmarshalTo(&exportedService); err != nil {
-		return resource.NewErrDataParse(&exportedService, err)
-	}
-
-	for _, serviceName := range exportedService.Services {
-		if err := authorizer.ToAllowAuthorizer().ServiceWriteAllowed(serviceName, authzContext); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/internal/multicluster/internal/types/exported_services_test.go b/internal/multicluster/internal/types/exported_services_test.go
deleted file mode 100644
index 23d9453264a56..0000000000000
--- a/internal/multicluster/internal/types/exported_services_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/version/versiontest"
-)
-
-func inValidExportedServices() *pbmulticluster.ExportedServices {
-	return &pbmulticluster.ExportedServices{}
-}
-
-func exportedServicesWithPeer(peerName string) *pbmulticluster.ExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Peer{
-				Peer: peerName,
-			},
-		},
-	}
-	return &pbmulticluster.ExportedServices{
-		Services:  []string{"api", "frontend", "backend"},
-		Consumers: consumers,
-	}
-}
-
-func exportedServicesWithPartition(partitionName string) *pbmulticluster.ExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Partition{
-				Partition: partitionName,
-			},
-		},
-	}
-	return &pbmulticluster.ExportedServices{
-		Services:  []string{"api", "frontend", "backend"},
-		Consumers: consumers,
-	}
-}
-
-func exportedServicesWithSamenessGroup(samenessGroupName string) *pbmulticluster.ExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_SamenessGroup{
-				SamenessGroup: samenessGroupName,
-			},
-		},
-	}
-	return &pbmulticluster.ExportedServices{
-		Services:  []string{"api", "frontend", "backend"},
-		Consumers: consumers,
-	}
-}
-
-func TestExportedServicesValidation_NoServices(t *testing.T) {
-	res := resourcetest.Resource(pbmulticluster.ExportedServicesType, "exportedservices1").
-		WithData(t, inValidExportedServices()).
-		Build()
-
-	err := ValidateExportedServices(res)
-	require.Error(t, err)
-	expectedError := errors.New("invalid \"services\" field: at least one service must be set")
-	require.ErrorAs(t, err, &expectedError)
-}
-
-func TestExportedServicesACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = resourcetest.DENY
-		ALLOW   = resourcetest.ALLOW
-		DEFAULT = resourcetest.DEFAULT
-	)
-
-	exportedServiceData := &pbmulticluster.ExportedServices{
-		Services: []string{"api", "backend"},
-	}
-	res := resourcetest.Resource(pbmulticluster.ExportedServicesType, "exps").
-		WithData(t, exportedServiceData).
-		Build()
-	resourcetest.ValidateAndNormalize(t, registry, res)
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"all services has read policy": {
-			rules:   `service "api" { policy = "read" } service "backend" {policy = "read"}`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"all services has write policy": {
-			rules:   `service "api" { policy = "write" } service "backend" {policy = "write"}`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-		"only one services has read policy": {
-			rules:   `service "api" { policy = "read" }`,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"only one services has write policy": {
-			rules:   `service "api" { policy = "write" }`,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-	}
-
-	for _, tc := range cases {
-		aclTestCase := resourcetest.ACLTestCase{
-			Rules:   tc.rules,
-			Res:     res,
-			ReadOK:  tc.readOK,
-			WriteOK: tc.writeOK,
-			ListOK:  tc.listOK,
-		}
-		resourcetest.RunACLTestCase(t, aclTestCase, registry)
-	}
-}
-
-func TestExportedServicesValidation(t *testing.T) {
-	type testcase struct {
-		Resource       *pbresource.Resource
-		expectErrorCE  []string
-		expectErrorENT []string
-	}
-
-	isEnterprise := versiontest.IsEnterprise()
-
-	run := func(t *testing.T, tc testcase) {
-		expectError := tc.expectErrorCE
-		if isEnterprise {
-			expectError = tc.expectErrorENT
-		}
-		err := ValidateExportedServices(tc.Resource)
-		if len(expectError) == 0 {
-			require.NoError(t, err)
-		} else {
-			require.Error(t, err)
-			for _, er := range expectError {
-				require.ErrorContains(t, err, er)
-			}
-		}
-	}
-
-	cases := map[string]testcase{
-		"exported services with peer": {
-			Resource: resourcetest.Resource(pbmulticluster.ExportedServicesType, "exported-services").
-				WithData(t, exportedServicesWithPeer("peer")).
-				Build(),
-		},
-		"exported services with partition": {
-			Resource: resourcetest.Resource(pbmulticluster.ExportedServicesType, "exported-services").
-				WithData(t, exportedServicesWithPartition("partition")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-		},
-		"exported services with sameness_group": {
-			Resource: resourcetest.Resource(pbmulticluster.ExportedServicesType, "exported-services").
-				WithData(t, exportedServicesWithSamenessGroup("sameness_group")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "sameness_group": can only be set in Enterprise`},
-		},
-		"exported services with peer empty": {
-			Resource: resourcetest.Resource(pbmulticluster.ExportedServicesType, "exported-services").
-				WithData(t, exportedServicesWithPeer("")).
-				Build(),
-			expectErrorCE:  []string{`invalid element at index 0 of list "peer": can not be empty or local`},
-			expectErrorENT: []string{`invalid element at index 0 of list "peer": can not be empty or local`},
-		},
-		"exported services with partition empty": {
-			Resource: resourcetest.Resource(pbmulticluster.ExportedServicesType, "exported-services").
-				WithData(t, exportedServicesWithPartition("")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can not be empty`,
-				`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-			expectErrorENT: []string{`invalid element at index 0 of list "partition": can not be empty`},
-		},
-		"exported services with sameness_group empty": {
-			Resource: resourcetest.Resource(pbmulticluster.ExportedServicesType, "exported-services").
-				WithData(t, exportedServicesWithSamenessGroup("")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "sameness_group": can not be empty`,
-				`invalid element at index 0 of list "sameness_group": can only be set in Enterprise`},
-			expectErrorENT: []string{`invalid element at index 0 of list "sameness_group": can not be empty`},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/multicluster/internal/types/helpers.go b/internal/multicluster/internal/types/helpers.go
deleted file mode 100644
index 5dac17f1e7a97..0000000000000
--- a/internal/multicluster/internal/types/helpers.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package types
-
-import (
-	"fmt"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/go-multierror"
-)
-
-func validateExportedServiceConsumerCommon(consumer *pbmulticluster.ExportedServicesConsumer, indx int) error {
-	switch consumer.GetConsumerTenancy().(type) {
-	case *pbmulticluster.ExportedServicesConsumer_Peer:
-		{
-			if consumer.GetPeer() == "" || consumer.GetPeer() == "local" {
-				return resource.ErrInvalidListElement{
-					Name:    "peer",
-					Index:   indx,
-					Wrapped: fmt.Errorf("can not be empty or local"),
-				}
-			}
-		}
-	case *pbmulticluster.ExportedServicesConsumer_Partition:
-		{
-			if consumer.GetPartition() == "" {
-				return resource.ErrInvalidListElement{
-					Name:    "partition",
-					Index:   indx,
-					Wrapped: fmt.Errorf("can not be empty"),
-				}
-			}
-		}
-	case *pbmulticluster.ExportedServicesConsumer_SamenessGroup:
-		{
-			if consumer.GetSamenessGroup() == "" {
-				return resource.ErrInvalidListElement{
-					Name:    "sameness_group",
-					Index:   indx,
-					Wrapped: fmt.Errorf("can not be empty"),
-				}
-			}
-		}
-	}
-	return nil
-}
-
-func validateExportedServicesConsumersEnterprise(consumers []*pbmulticluster.ExportedServicesConsumer) error {
-	var merr error
-
-	for indx, consumer := range consumers {
-		vmerr := validateExportedServiceConsumerCommon(consumer, indx)
-		if vmerr != nil {
-			merr = multierror.Append(merr, vmerr)
-		}
-		vmerr = validateExportedServicesConsumer(consumer, indx)
-		if vmerr != nil {
-			merr = multierror.Append(merr, vmerr)
-		}
-	}
-
-	return merr
-}
-
-func ValidateExportedServices(res *pbresource.Resource) error {
-	var exportedService pbmulticluster.ExportedServices
-
-	if err := res.Data.UnmarshalTo(&exportedService); err != nil {
-		return resource.NewErrDataParse(&exportedService, err)
-	}
-
-	var merr error
-
-	if len(exportedService.Services) == 0 {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "services",
-			Wrapped: fmt.Errorf("at least one service must be set"),
-		})
-	}
-
-	vmerr := validateExportedServicesConsumersEnterprise(exportedService.Consumers)
-
-	if vmerr != nil {
-		merr = multierror.Append(merr, vmerr)
-	}
-
-	return merr
-}
-
-func ValidateNamespaceExportedServices(res *pbresource.Resource) error {
-	var exportedService pbmulticluster.NamespaceExportedServices
-
-	if err := res.Data.UnmarshalTo(&exportedService); err != nil {
-		return resource.NewErrDataParse(&exportedService, err)
-	}
-
-	return validateExportedServicesConsumersEnterprise(exportedService.Consumers)
-}
-
-func ValidatePartitionExportedServices(res *pbresource.Resource) error {
-	var exportedService pbmulticluster.PartitionExportedServices
-
-	if err := res.Data.UnmarshalTo(&exportedService); err != nil {
-		return resource.NewErrDataParse(&exportedService, err)
-	}
-
-	return validateExportedServicesConsumersEnterprise(exportedService.Consumers)
-}
-
-func ValidateComputedExportedServices(res *pbresource.Resource) error {
-	var computedExportedServices pbmulticluster.ComputedExportedServices
-
-	if err := res.Data.UnmarshalTo(&computedExportedServices); err != nil {
-		return resource.NewErrDataParse(&computedExportedServices, err)
-	}
-
-	var merr error
-
-	if res.Id.Name != ComputedExportedServicesName {
-		merr = multierror.Append(merr, resource.ErrInvalidField{
-			Name:    "name",
-			Wrapped: fmt.Errorf("name can only be \"global\""),
-		})
-	}
-
-	vmerr := ValidateComputedExportedServicesEnterprise(&computedExportedServices)
-
-	if vmerr != nil {
-		merr = multierror.Append(merr, vmerr)
-	}
-
-	return merr
-}
diff --git a/internal/multicluster/internal/types/helpers_ce.go b/internal/multicluster/internal/types/helpers_ce.go
deleted file mode 100644
index b997b8671ad05..0000000000000
--- a/internal/multicluster/internal/types/helpers_ce.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package types
-
-import (
-	"fmt"
-	"github.com/hashicorp/consul/internal/resource"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/go-multierror"
-)
-
-func validateExportedServicesConsumer(consumer *pbmulticluster.ExportedServicesConsumer, indx int) error {
-	switch consumer.GetConsumerTenancy().(type) {
-	case *pbmulticluster.ExportedServicesConsumer_Partition:
-		return resource.ErrInvalidListElement{
-			Name:    "partition",
-			Index:   indx,
-			Wrapped: fmt.Errorf("can only be set in Enterprise"),
-		}
-	case *pbmulticluster.ExportedServicesConsumer_SamenessGroup:
-		return resource.ErrInvalidListElement{
-			Name:    "sameness_group",
-			Index:   indx,
-			Wrapped: fmt.Errorf("can only be set in Enterprise"),
-		}
-	}
-	return nil
-}
-
-func ValidateComputedExportedServicesEnterprise(computedExportedServices *pbmulticluster.ComputedExportedServices) error {
-
-	var merr error
-
-	for indx, consumer := range computedExportedServices.GetConsumers() {
-		for _, computedExportedServiceConsumer := range consumer.GetConsumers() {
-			switch computedExportedServiceConsumer.GetConsumerTenancy().(type) {
-			case *pbmulticluster.ComputedExportedServicesConsumer_Partition:
-				merr = multierror.Append(merr, resource.ErrInvalidListElement{
-					Name:    "partition",
-					Index:   indx,
-					Wrapped: fmt.Errorf("can only be set in Enterprise"),
-				})
-				if computedExportedServiceConsumer.GetPartition() == "" {
-					merr = multierror.Append(merr, resource.ErrInvalidListElement{
-						Name:    "partition",
-						Index:   indx,
-						Wrapped: fmt.Errorf("can not be empty"),
-					})
-				}
-			case *pbmulticluster.ComputedExportedServicesConsumer_Peer:
-				if computedExportedServiceConsumer.GetPeer() == "" {
-					merr = multierror.Append(merr, resource.ErrInvalidListElement{
-						Name:    "peer",
-						Index:   indx,
-						Wrapped: fmt.Errorf("can not be empty"),
-					})
-				}
-			}
-		}
-	}
-
-	return merr
-}
diff --git a/internal/multicluster/internal/types/namespace_exported_services.go b/internal/multicluster/internal/types/namespace_exported_services.go
deleted file mode 100644
index 857ea868b8e96..0000000000000
--- a/internal/multicluster/internal/types/namespace_exported_services.go
+++ /dev/null
@@ -1,33 +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"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterNamespaceExportedServices(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmulticluster.NamespaceExportedServicesType,
-		Proto:    &pbmulticluster.NamespaceExportedServices{},
-		Scope:    resource.ScopeNamespace,
-		Validate: ValidateNamespaceExportedServices,
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookNamespaceExportedServices,
-			Write: aclWriteHookNamespaceExportedServices,
-			List:  resource.NoOpACLListHook,
-		},
-	})
-}
-
-func aclReadHookNamespaceExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, res *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().MeshReadAllowed(authzContext)
-}
-
-func aclWriteHookNamespaceExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().MeshWriteAllowed(authzContext)
-}
diff --git a/internal/multicluster/internal/types/namespace_exported_services_test.go b/internal/multicluster/internal/types/namespace_exported_services_test.go
deleted file mode 100644
index 06864997b3c2a..0000000000000
--- a/internal/multicluster/internal/types/namespace_exported_services_test.go
+++ /dev/null
@@ -1,187 +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"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/version/versiontest"
-)
-
-func validNamespaceExportedServicesWithPeer(peerName string) *pbmulticluster.NamespaceExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Peer{
-				Peer: peerName,
-			},
-		},
-	}
-	return &pbmulticluster.NamespaceExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func validNamespaceExportedServicesWithPartition(partitionName string) *pbmulticluster.NamespaceExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Partition{
-				Partition: partitionName,
-			},
-		},
-	}
-	return &pbmulticluster.NamespaceExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func validNamespaceExportedServicesWithSamenessGroup(samenessGroupName string) *pbmulticluster.NamespaceExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_SamenessGroup{
-				SamenessGroup: samenessGroupName,
-			},
-		},
-	}
-	return &pbmulticluster.NamespaceExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func TestNamespaceExportedServicesACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = resourcetest.DENY
-		ALLOW   = resourcetest.ALLOW
-		DEFAULT = resourcetest.DEFAULT
-	)
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"mesh read policy": {
-			rules:   `mesh = "read"`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"mesh write policy": {
-			rules:   `mesh = "write"`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	exportedServiceData := &pbmulticluster.NamespaceExportedServices{}
-	res := resourcetest.Resource(pbmulticluster.NamespaceExportedServicesType, "namespace-exported-services").
-		WithData(t, exportedServiceData).
-		Build()
-	resourcetest.ValidateAndNormalize(t, registry, res)
-
-	for _, tc := range cases {
-		aclTestCase := resourcetest.ACLTestCase{
-			Rules:   tc.rules,
-			Res:     res,
-			ReadOK:  tc.readOK,
-			WriteOK: tc.writeOK,
-			ListOK:  tc.listOK,
-		}
-		resourcetest.RunACLTestCase(t, aclTestCase, registry)
-	}
-}
-
-func TestNamespaceExportedServicesValidations(t *testing.T) {
-	type testcase struct {
-		Resource       *pbresource.Resource
-		expectErrorCE  []string
-		expectErrorENT []string
-	}
-
-	isEnterprise := versiontest.IsEnterprise()
-
-	run := func(t *testing.T, tc testcase) {
-		expectError := tc.expectErrorCE
-		if isEnterprise {
-			expectError = tc.expectErrorENT
-		}
-		err := ValidateNamespaceExportedServices(tc.Resource)
-		if len(expectError) == 0 {
-			require.NoError(t, err)
-		} else {
-			require.Error(t, err)
-			for _, er := range expectError {
-				require.ErrorContains(t, err, er)
-			}
-		}
-	}
-
-	cases := map[string]testcase{
-		"namespace exported services with peer": {
-			Resource: resourcetest.Resource(pbmulticluster.NamespaceExportedServicesType, "namespace-exported-services").
-				WithData(t, validNamespaceExportedServicesWithPeer("peer")).
-				Build(),
-		},
-		"namespace exported services with partition": {
-			Resource: resourcetest.Resource(pbmulticluster.NamespaceExportedServicesType, "namespace-exported-services").
-				WithData(t, validNamespaceExportedServicesWithPartition("partition")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-		},
-		"namespace exported services with sameness_group": {
-			Resource: resourcetest.Resource(pbmulticluster.NamespaceExportedServicesType, "namespace-exported-services").
-				WithData(t, validNamespaceExportedServicesWithSamenessGroup("sameness_group")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "sameness_group": can only be set in Enterprise`},
-		},
-		"namespace exported services with peer empty": {
-			Resource: resourcetest.Resource(pbmulticluster.NamespaceExportedServicesType, "namespace-exported-services").
-				WithData(t, validNamespaceExportedServicesWithPeer("")).
-				Build(),
-			expectErrorCE:  []string{`invalid element at index 0 of list "peer": can not be empty or local`},
-			expectErrorENT: []string{`invalid element at index 0 of list "peer": can not be empty or local`},
-		},
-		"namespace exported services with partition empty": {
-			Resource: resourcetest.Resource(pbmulticluster.NamespaceExportedServicesType, "namespace-exported-services").
-				WithData(t, validNamespaceExportedServicesWithPartition("")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can not be empty`,
-				`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-			expectErrorENT: []string{`invalid element at index 0 of list "partition": can not be empty`},
-		},
-		"namespace exported services with sameness_group empty": {
-			Resource: resourcetest.Resource(pbmulticluster.NamespaceExportedServicesType, "namespace-exported-services").
-				WithData(t, validNamespaceExportedServicesWithSamenessGroup("")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "sameness_group": can not be empty`,
-				`invalid element at index 0 of list "sameness_group": can only be set in Enterprise`},
-			expectErrorENT: []string{`invalid element at index 0 of list "sameness_group": can not be empty`},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/multicluster/internal/types/partition_exported_services.go b/internal/multicluster/internal/types/partition_exported_services.go
deleted file mode 100644
index 110eb5d6efa13..0000000000000
--- a/internal/multicluster/internal/types/partition_exported_services.go
+++ /dev/null
@@ -1,33 +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"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-func RegisterPartitionExportedServices(r resource.Registry) {
-	r.Register(resource.Registration{
-		Type:     pbmulticluster.PartitionExportedServicesType,
-		Proto:    &pbmulticluster.PartitionExportedServices{},
-		Scope:    resource.ScopePartition,
-		Validate: ValidatePartitionExportedServices,
-		ACLs: &resource.ACLHooks{
-			Read:  aclReadHookPartitionExportedServices,
-			Write: aclWriteHookPartitionExportedServices,
-			List:  resource.NoOpACLListHook,
-		},
-	})
-}
-
-func aclReadHookPartitionExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, id *pbresource.ID, res *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().MeshReadAllowed(authzContext)
-}
-
-func aclWriteHookPartitionExportedServices(authorizer acl.Authorizer, authzContext *acl.AuthorizerContext, res *pbresource.Resource) error {
-	return authorizer.ToAllowAuthorizer().MeshWriteAllowed(authzContext)
-}
diff --git a/internal/multicluster/internal/types/partition_exported_services_test.go b/internal/multicluster/internal/types/partition_exported_services_test.go
deleted file mode 100644
index ff557aae8fd2c..0000000000000
--- a/internal/multicluster/internal/types/partition_exported_services_test.go
+++ /dev/null
@@ -1,187 +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"
-	pbmulticluster "github.com/hashicorp/consul/proto-public/pbmulticluster/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/version/versiontest"
-)
-
-func validPartitionExportedServicesWithPeer(peerName string) *pbmulticluster.PartitionExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Peer{
-				Peer: peerName,
-			},
-		},
-	}
-	return &pbmulticluster.PartitionExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func validPartitionExportedServicesWithPartition(partitionName string) *pbmulticluster.PartitionExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_Partition{
-				Partition: partitionName,
-			},
-		},
-	}
-	return &pbmulticluster.PartitionExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func validPartitionExportedServicesWithSamenessGroup(samenessGroupName string) *pbmulticluster.PartitionExportedServices {
-	consumers := []*pbmulticluster.ExportedServicesConsumer{
-		{
-			ConsumerTenancy: &pbmulticluster.ExportedServicesConsumer_SamenessGroup{
-				SamenessGroup: samenessGroupName,
-			},
-		},
-	}
-	return &pbmulticluster.PartitionExportedServices{
-		Consumers: consumers,
-	}
-}
-
-func TestPartitionExportedServicesACLs(t *testing.T) {
-	// Wire up a registry to generically invoke hooks
-	registry := resource.NewRegistry()
-	Register(registry)
-
-	type testcase struct {
-		rules   string
-		readOK  string
-		writeOK string
-		listOK  string
-	}
-
-	const (
-		DENY    = resourcetest.DENY
-		ALLOW   = resourcetest.ALLOW
-		DEFAULT = resourcetest.DEFAULT
-	)
-
-	cases := map[string]testcase{
-		"no rules": {
-			rules:   ``,
-			readOK:  DENY,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"mesh read policy": {
-			rules:   `mesh = "read"`,
-			readOK:  ALLOW,
-			writeOK: DENY,
-			listOK:  DEFAULT,
-		},
-		"mesh write policy": {
-			rules:   `mesh = "write"`,
-			readOK:  ALLOW,
-			writeOK: ALLOW,
-			listOK:  DEFAULT,
-		},
-	}
-
-	exportedServiceData := &pbmulticluster.PartitionExportedServices{}
-	res := resourcetest.Resource(pbmulticluster.PartitionExportedServicesType, "partition-exported-services").
-		WithData(t, exportedServiceData).
-		Build()
-	resourcetest.ValidateAndNormalize(t, registry, res)
-
-	for _, tc := range cases {
-		aclTestCase := resourcetest.ACLTestCase{
-			Rules:   tc.rules,
-			Res:     res,
-			ReadOK:  tc.readOK,
-			WriteOK: tc.writeOK,
-			ListOK:  tc.listOK,
-		}
-		resourcetest.RunACLTestCase(t, aclTestCase, registry)
-	}
-}
-
-func TestPartitionExportedServicesValidations(t *testing.T) {
-	type testcase struct {
-		Resource       *pbresource.Resource
-		expectErrorCE  []string
-		expectErrorENT []string
-	}
-
-	isEnterprise := versiontest.IsEnterprise()
-
-	run := func(t *testing.T, tc testcase) {
-		expectError := tc.expectErrorCE
-		if isEnterprise {
-			expectError = tc.expectErrorENT
-		}
-		err := ValidatePartitionExportedServices(tc.Resource)
-		if len(expectError) == 0 {
-			require.NoError(t, err)
-		} else {
-			require.Error(t, err)
-			for _, er := range expectError {
-				require.ErrorContains(t, err, er)
-			}
-		}
-	}
-
-	cases := map[string]testcase{
-		"partition exported services with peer": {
-			Resource: resourcetest.Resource(pbmulticluster.PartitionExportedServicesType, "partition-exported-services").
-				WithData(t, validPartitionExportedServicesWithPeer("peer")).
-				Build(),
-		},
-		"partition exported services with partition": {
-			Resource: resourcetest.Resource(pbmulticluster.PartitionExportedServicesType, "partition-exported-services").
-				WithData(t, validPartitionExportedServicesWithPartition("partition")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-		},
-		"partition exported services with sameness_group": {
-			Resource: resourcetest.Resource(pbmulticluster.PartitionExportedServicesType, "partition-exported-services").
-				WithData(t, validPartitionExportedServicesWithSamenessGroup("sameness_group")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "sameness_group": can only be set in Enterprise`},
-		},
-		"partition exported services with peer empty": {
-			Resource: resourcetest.Resource(pbmulticluster.PartitionExportedServicesType, "partition-exported-services").
-				WithData(t, validPartitionExportedServicesWithPeer("")).
-				Build(),
-			expectErrorCE:  []string{`invalid element at index 0 of list "peer": can not be empty or local`},
-			expectErrorENT: []string{`invalid element at index 0 of list "peer": can not be empty or local`},
-		},
-		"partition exported services with partition empty": {
-			Resource: resourcetest.Resource(pbmulticluster.PartitionExportedServicesType, "partition-exported-services").
-				WithData(t, validPartitionExportedServicesWithPartition("")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "partition": can not be empty`,
-				`invalid element at index 0 of list "partition": can only be set in Enterprise`},
-			expectErrorENT: []string{`invalid element at index 0 of list "partition": can not be empty`},
-		},
-		"partition exported services with sameness_group empty": {
-			Resource: resourcetest.Resource(pbmulticluster.PartitionExportedServicesType, "partition-exported-services").
-				WithData(t, validPartitionExportedServicesWithSamenessGroup("")).
-				Build(),
-			expectErrorCE: []string{`invalid element at index 0 of list "sameness_group": can not be empty`,
-				`invalid element at index 0 of list "sameness_group": can only be set in Enterprise`},
-			expectErrorENT: []string{`invalid element at index 0 of list "sameness_group": can not be empty`},
-		},
-	}
-
-	for name, tc := range cases {
-		t.Run(name, func(t *testing.T) {
-			run(t, tc)
-		})
-	}
-}
diff --git a/internal/multicluster/internal/types/types.go b/internal/multicluster/internal/types/types.go
deleted file mode 100644
index 9ee6691e19ec8..0000000000000
--- a/internal/multicluster/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"
-)
-
-const (
-	GroupName      = "multicluster"
-	VersionV2Beta1 = "v2beta1"
-	CurrentVersion = VersionV2Beta1
-)
-
-func Register(r resource.Registry) {
-	RegisterExportedServices(r)
-	RegisterNamespaceExportedServices(r)
-	RegisterPartitionExportedServices(r)
-	RegisterComputedExportedServices(r)
-}
diff --git a/internal/resource/decode.go b/internal/resource/decode.go
index 2b96853f1e13d..ba9abd87d60d9 100644
--- a/internal/resource/decode.go
+++ b/internal/resource/decode.go
@@ -16,10 +16,8 @@ import (
 // DecodedResource is a generic holder to contain an original Resource and its
 // decoded contents.
 type DecodedResource[T proto.Message] struct {
-	// Embedding here allows us to shadow the Resource.Data Any field to fake out
-	// using a single struct with inlined data.
-	*pbresource.Resource
-	Data T
+	Resource *pbresource.Resource
+	Data     T
 }
 
 func (d *DecodedResource[T]) GetResource() *pbresource.Resource {
@@ -70,20 +68,3 @@ func GetDecodedResource[T proto.Message](ctx context.Context, client pbresource.
 	}
 	return Decode[T](rsp.Resource)
 }
-
-func ListDecodedResource[T proto.Message](ctx context.Context, client pbresource.ResourceServiceClient, req *pbresource.ListRequest) ([]*DecodedResource[T], error) {
-	rsp, err := client.List(ctx, req)
-	if err != nil {
-		return nil, err
-	}
-
-	results := make([]*DecodedResource[T], len(rsp.Resources))
-	for idx, rsc := range rsp.Resources {
-		d, err := Decode[T](rsc)
-		if err != nil {
-			return nil, err
-		}
-		results[idx] = d
-	}
-	return results, nil
-}
diff --git a/internal/resource/decode_test.go b/internal/resource/decode_test.go
index 31db247c70882..02e86fddfbf7d 100644
--- a/internal/resource/decode_test.go
+++ b/internal/resource/decode_test.go
@@ -22,7 +22,7 @@ import (
 
 func TestGetDecodedResource(t *testing.T) {
 	var (
-		baseClient = svctest.NewResourceServiceBuilder().WithRegisterFns(demo.RegisterTypes).Run(t)
+		baseClient = svctest.RunResourceService(t, demo.RegisterTypes)
 		client     = rtest.NewClient(baseClient)
 		ctx        = testutil.TestContext(t)
 	)
diff --git a/internal/resource/demo/controller.go b/internal/resource/demo/controller.go
index a8757fcae2624..7f1bba902ea51 100644
--- a/internal/resource/demo/controller.go
+++ b/internal/resource/demo/controller.go
@@ -71,7 +71,7 @@ func (r *artistReconciler) Reconcile(ctx context.Context, rt controller.Runtime,
 	actualAlbums, err := rt.Client.List(ctx, &pbresource.ListRequest{
 		Type:       TypeV2Album,
 		Tenancy:    res.Id.Tenancy,
-		NamePrefix: fmt.Sprintf("%s-", res.Id.Name),
+		NamePrefix: fmt.Sprintf("%s/", res.Id.Name),
 	})
 	if err != nil {
 		return err
diff --git a/internal/resource/demo/controller_test.go b/internal/resource/demo/controller_test.go
index 303ecfe235892..a8c2640d615a8 100644
--- a/internal/resource/demo/controller_test.go
+++ b/internal/resource/demo/controller_test.go
@@ -16,9 +16,7 @@ import (
 )
 
 func TestArtistReconciler(t *testing.T) {
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(RegisterTypes).
-		Run(t)
+	client := svctest.RunResourceService(t, RegisterTypes)
 
 	// Seed the database with an artist.
 	res, err := GenerateV2Artist()
diff --git a/internal/resource/demo/demo.go b/internal/resource/demo/demo.go
index 12fced6718e61..8e978c9fb49ab 100644
--- a/internal/resource/demo/demo.go
+++ b/internal/resource/demo/demo.go
@@ -354,7 +354,7 @@ func generateV2Album(artistID *pbresource.ID, rand *rand.Rand) (*pbresource.Reso
 		Id: &pbresource.ID{
 			Type:    TypeV2Album,
 			Tenancy: clone(artistID.Tenancy),
-			Name:    fmt.Sprintf("%s-%s-%s", artistID.Name, strings.ToLower(adjective), strings.ToLower(noun)),
+			Name:    fmt.Sprintf("%s/%s-%s", artistID.Name, strings.ToLower(adjective), strings.ToLower(noun)),
 		},
 		Owner: artistID,
 		Data:  data,
diff --git a/internal/resource/hooks.go b/internal/resource/hooks.go
deleted file mode 100644
index 2b9d72b88925f..0000000000000
--- a/internal/resource/hooks.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"github.com/hashicorp/consul/acl"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"google.golang.org/protobuf/proto"
-)
-
-// DecodedValidationHook is the function signature needed for usage with the DecodeAndValidate function
-type DecodedValidationHook[T proto.Message] func(*DecodedResource[T]) error
-
-// DecodeAndValidate will generate a validation hook function that decodes the specified type and
-// passes it off to another validation hook. This is mainly a convenience to avoid many other
-// validation hooks needing to attempt decoding the data and erroring in a consistent manner.
-func DecodeAndValidate[T proto.Message](fn DecodedValidationHook[T]) ValidationHook {
-	return func(res *pbresource.Resource) error {
-		decoded, err := Decode[T](res)
-		if err != nil {
-			return err
-		}
-
-		return fn(decoded)
-	}
-}
-
-// DecodedMutationHook is the function signature needed for usage with the DecodeAndMutate function
-// The boolean return value indicates whether the Data field within the DecodedResource was modified.
-// When true, the DecodeAndMutate hook function will automatically re-encode the Any data and store
-// it on the internal Resource's Data field.
-type DecodedMutationHook[T proto.Message] func(*DecodedResource[T]) (bool, error)
-
-// DecodeAndMutate will generate a MutationHook that decodes the specified type and passes it
-// off to another mutation hook. This is mainly a convenience to avoid other mutation hooks
-// needing to decode and potentially reencode the Any data. When the inner mutation hook returns
-// no error and that the Data was modified (true for the boolean return value), the generated
-// hook will reencode the Any data back into the Resource wrapper
-func DecodeAndMutate[T proto.Message](fn DecodedMutationHook[T]) MutationHook {
-	return func(res *pbresource.Resource) error {
-		decoded, err := Decode[T](res)
-		if err != nil {
-			return err
-		}
-
-		modified, err := fn(decoded)
-		if err != nil {
-			return err
-		}
-
-		if modified {
-			return decoded.Resource.Data.MarshalFrom(decoded.Data)
-		}
-		return nil
-	}
-}
-
-// DecodedAuthorizationHook is the function signature needed for usage with the DecodeAndAuthorizeWrite
-// and DecodeAndAuthorizeRead functions.
-type DecodedAuthorizationHook[T proto.Message] func(acl.Authorizer, *acl.AuthorizerContext, *DecodedResource[T]) error
-
-// DecodeAndAuthorizeWrite will generate an ACLAuthorizeWriteHook that decodes the specified type and passes
-// it off to another authorization hook. This is mainly a convenience to avoid many other write authorization
-// hooks needing to attempt decoding the data and erroring in a consistent manner.
-func DecodeAndAuthorizeWrite[T proto.Message](fn DecodedAuthorizationHook[T]) ACLAuthorizeWriteHook {
-	return func(authz acl.Authorizer, ctx *acl.AuthorizerContext, res *pbresource.Resource) error {
-		decoded, err := Decode[T](res)
-		if err != nil {
-			return err
-		}
-
-		return fn(authz, ctx, decoded)
-	}
-}
-
-// DecodeAndAuthorizeRead will generate an ACLAuthorizeReadHook that decodes the specified type and passes
-// it off to another authorization hook. This is mainly a convenience to avoid many other read authorization
-// hooks needing to attempt decoding the data and erroring in a consistent manner.
-func DecodeAndAuthorizeRead[T proto.Message](fn DecodedAuthorizationHook[T]) ACLAuthorizeReadHook {
-	return func(authz acl.Authorizer, ctx *acl.AuthorizerContext, _ *pbresource.ID, res *pbresource.Resource) error {
-		if res == nil {
-			return ErrNeedResource
-		}
-
-		decoded, err := Decode[T](res)
-		if err != nil {
-			return err
-		}
-
-		return fn(authz, ctx, decoded)
-	}
-}
-
-type ReadAuthorizationWithResourceHook func(acl.Authorizer, *acl.AuthorizerContext, *pbresource.Resource) error
-
-// AuthorizeReadWithResource is a small wrapper to ensure that the authorization function is
-// invoked with the full resource being read instead of just an id.
-func AuthorizeReadWithResource(fn ReadAuthorizationWithResourceHook) ACLAuthorizeReadHook {
-	return func(authz acl.Authorizer, ctx *acl.AuthorizerContext, id *pbresource.ID, res *pbresource.Resource) error {
-		if res == nil {
-			return ErrNeedResource
-		}
-
-		return fn(authz, ctx, res)
-	}
-}
diff --git a/internal/resource/hooks_test.go b/internal/resource/hooks_test.go
deleted file mode 100644
index d9fa4d4272b74..0000000000000
--- a/internal/resource/hooks_test.go
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/hashicorp/consul/acl"
-	"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/stretchr/testify/require"
-)
-
-func TestDecodeAndValidate(t *testing.T) {
-	res := rtest.Resource(demo.TypeV2Artist, "babypants").
-		WithData(t, &pbdemo.Artist{Name: "caspar babypants"}).
-		Build()
-
-	t.Run("ok", func(t *testing.T) {
-		err := resource.DecodeAndValidate[*pbdemo.Artist](func(dec *resource.DecodedResource[*pbdemo.Artist]) error {
-			require.NotNil(t, dec.Resource)
-			require.NotNil(t, dec.Data)
-
-			return nil
-		})(res)
-
-		require.NoError(t, err)
-	})
-
-	t.Run("inner-validation-error", func(t *testing.T) {
-		fakeErr := fmt.Errorf("fake")
-
-		err := resource.DecodeAndValidate[*pbdemo.Artist](func(dec *resource.DecodedResource[*pbdemo.Artist]) error {
-			return fakeErr
-		})(res)
-
-		require.Error(t, err)
-		require.Equal(t, fakeErr, err)
-	})
-
-	t.Run("decode-error", func(t *testing.T) {
-		err := resource.DecodeAndValidate[*pbdemo.Album](func(dec *resource.DecodedResource[*pbdemo.Album]) error {
-			require.Fail(t, "callback should not be called when decoding fails")
-			return nil
-		})(res)
-
-		require.Error(t, err)
-		require.ErrorAs(t, err, &resource.ErrDataParse{})
-	})
-}
-
-func TestDecodeAndMutate(t *testing.T) {
-	res := rtest.Resource(demo.TypeV2Artist, "babypants").
-		WithData(t, &pbdemo.Artist{Name: "caspar babypants"}).
-		Build()
-
-	t.Run("no-writeback", func(t *testing.T) {
-		original := res.Data.Value
-
-		err := resource.DecodeAndMutate[*pbdemo.Artist](func(dec *resource.DecodedResource[*pbdemo.Artist]) (bool, error) {
-			require.NotNil(t, dec.Resource)
-			require.NotNil(t, dec.Data)
-
-			// we are going to change the data but not tell the outer hook about it
-			dec.Data.Name = "changed"
-
-			return false, nil
-		})(res)
-
-		require.NoError(t, err)
-		// Ensure that the outer hook didn't overwrite the resources data because we told it not to
-		require.Equal(t, original, res.Data.Value)
-	})
-
-	t.Run("writeback", func(t *testing.T) {
-		original := res.Data.Value
-
-		err := resource.DecodeAndMutate[*pbdemo.Artist](func(dec *resource.DecodedResource[*pbdemo.Artist]) (bool, error) {
-			require.NotNil(t, dec.Resource)
-			require.NotNil(t, dec.Data)
-
-			dec.Data.Name = "changed"
-
-			return true, nil
-		})(res)
-
-		require.NoError(t, err)
-		// Ensure that the outer hook reencoded the Any data because we told it to.
-		require.NotEqual(t, original, res.Data.Value)
-	})
-
-	t.Run("inner-mutation-error", func(t *testing.T) {
-		fakeErr := fmt.Errorf("fake")
-
-		err := resource.DecodeAndMutate[*pbdemo.Artist](func(dec *resource.DecodedResource[*pbdemo.Artist]) (bool, error) {
-			return false, fakeErr
-		})(res)
-
-		require.Error(t, err)
-		require.Equal(t, fakeErr, err)
-	})
-
-	t.Run("decode-error", func(t *testing.T) {
-		err := resource.DecodeAndMutate[*pbdemo.Album](func(dec *resource.DecodedResource[*pbdemo.Album]) (bool, error) {
-			require.Fail(t, "callback should not be called when decoding fails")
-			return false, nil
-		})(res)
-
-		require.Error(t, err)
-		require.ErrorAs(t, err, &resource.ErrDataParse{})
-	})
-}
-
-func TestDecodeAndAuthorizeWrite(t *testing.T) {
-	res := rtest.Resource(demo.TypeV2Artist, "babypants").
-		WithData(t, &pbdemo.Artist{Name: "caspar babypants"}).
-		Build()
-
-	t.Run("allowed", func(t *testing.T) {
-		err := resource.DecodeAndAuthorizeWrite[*pbdemo.Artist](func(a acl.Authorizer, c *acl.AuthorizerContext, dec *resource.DecodedResource[*pbdemo.Artist]) error {
-			require.NotNil(t, a)
-			require.NotNil(t, c)
-			require.NotNil(t, dec.Resource)
-			require.NotNil(t, dec.Data)
-
-			// access allowed
-			return nil
-		})(acl.DenyAll(), &acl.AuthorizerContext{}, res)
-
-		require.NoError(t, err)
-	})
-
-	t.Run("denied", func(t *testing.T) {
-		err := resource.DecodeAndAuthorizeWrite[*pbdemo.Artist](func(a acl.Authorizer, c *acl.AuthorizerContext, dec *resource.DecodedResource[*pbdemo.Artist]) error {
-			return acl.PermissionDenied("fake")
-		})(acl.DenyAll(), nil, res)
-
-		require.Error(t, err)
-		require.True(t, acl.IsErrPermissionDenied(err))
-	})
-
-	t.Run("decode-error", func(t *testing.T) {
-		err := resource.DecodeAndAuthorizeWrite[*pbdemo.Album](func(a acl.Authorizer, c *acl.AuthorizerContext, dec *resource.DecodedResource[*pbdemo.Album]) error {
-			require.Fail(t, "callback should not be called when decoding fails")
-			return nil
-		})(acl.DenyAll(), &acl.AuthorizerContext{}, res)
-
-		require.Error(t, err)
-		require.ErrorAs(t, err, &resource.ErrDataParse{})
-	})
-}
-
-func TestDecodeAndAuthorizeRead(t *testing.T) {
-	res := rtest.Resource(demo.TypeV2Artist, "babypants").
-		WithData(t, &pbdemo.Artist{Name: "caspar babypants"}).
-		Build()
-
-	t.Run("allowed", func(t *testing.T) {
-		err := resource.DecodeAndAuthorizeRead[*pbdemo.Artist](func(a acl.Authorizer, c *acl.AuthorizerContext, dec *resource.DecodedResource[*pbdemo.Artist]) error {
-			require.NotNil(t, a)
-			require.NotNil(t, c)
-			require.NotNil(t, dec.Resource)
-			require.NotNil(t, dec.Data)
-
-			// access allowed
-			return nil
-		})(acl.DenyAll(), &acl.AuthorizerContext{}, nil, res)
-
-		require.NoError(t, err)
-	})
-
-	t.Run("denied", func(t *testing.T) {
-		err := resource.DecodeAndAuthorizeRead[*pbdemo.Artist](func(a acl.Authorizer, c *acl.AuthorizerContext, dec *resource.DecodedResource[*pbdemo.Artist]) error {
-			return acl.PermissionDenied("fake")
-		})(acl.DenyAll(), nil, nil, res)
-
-		require.Error(t, err)
-		require.True(t, acl.IsErrPermissionDenied(err))
-	})
-
-	t.Run("decode-error", func(t *testing.T) {
-		err := resource.DecodeAndAuthorizeRead[*pbdemo.Album](func(a acl.Authorizer, c *acl.AuthorizerContext, dec *resource.DecodedResource[*pbdemo.Album]) error {
-			require.Fail(t, "callback should not be called when decoding fails")
-			return nil
-		})(acl.DenyAll(), &acl.AuthorizerContext{}, nil, res)
-
-		require.Error(t, err)
-		require.ErrorAs(t, err, &resource.ErrDataParse{})
-	})
-
-	t.Run("err-need-resource", func(t *testing.T) {
-		err := resource.DecodeAndAuthorizeRead[*pbdemo.Artist](func(a acl.Authorizer, c *acl.AuthorizerContext, dec *resource.DecodedResource[*pbdemo.Artist]) error {
-			require.Fail(t, "callback should not be called when no resource was provided to be decoded")
-			return nil
-		})(acl.DenyAll(), &acl.AuthorizerContext{}, nil, nil)
-
-		require.Error(t, err)
-		require.ErrorIs(t, err, resource.ErrNeedResource)
-	})
-}
-
-func TestAuthorizeReadWithResource(t *testing.T) {
-	res := rtest.Resource(demo.TypeV2Artist, "babypants").
-		WithData(t, &pbdemo.Artist{Name: "caspar babypants"}).
-		Build()
-
-	t.Run("allowed", func(t *testing.T) {
-		err := resource.AuthorizeReadWithResource(func(a acl.Authorizer, c *acl.AuthorizerContext, res *pbresource.Resource) error {
-			require.NotNil(t, a)
-			require.NotNil(t, c)
-			require.NotNil(t, res)
-
-			// access allowed
-			return nil
-		})(acl.DenyAll(), &acl.AuthorizerContext{}, nil, res)
-
-		require.NoError(t, err)
-	})
-
-	t.Run("denied", func(t *testing.T) {
-		err := resource.AuthorizeReadWithResource(func(a acl.Authorizer, c *acl.AuthorizerContext, res *pbresource.Resource) error {
-			return acl.PermissionDenied("fake")
-		})(acl.DenyAll(), nil, nil, res)
-
-		require.Error(t, err)
-		require.True(t, acl.IsErrPermissionDenied(err))
-	})
-
-	t.Run("err-need-resource", func(t *testing.T) {
-		err := resource.AuthorizeReadWithResource(func(a acl.Authorizer, c *acl.AuthorizerContext, res *pbresource.Resource) error {
-			require.Fail(t, "callback should not be called when no resource was provided to be decoded")
-			return nil
-		})(acl.DenyAll(), &acl.AuthorizerContext{}, nil, nil)
-
-		require.Error(t, err)
-		require.ErrorIs(t, err, resource.ErrNeedResource)
-	})
-}
diff --git a/internal/resource/http/http_test.go b/internal/resource/http/http_test.go
index aa36b8a38cbdd..50f50fbe39488 100644
--- a/internal/resource/http/http_test.go
+++ b/internal/resource/http/http_test.go
@@ -12,17 +12,17 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/hashicorp/go-hclog"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 
-	"github.com/hashicorp/go-hclog"
-
-	svc "github.com/hashicorp/consul/agent/grpc-external/services/resource"
+	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"
-	pbdemov1 "github.com/hashicorp/consul/proto/private/pbdemo/v1"
 	pbdemov2 "github.com/hashicorp/consul/proto/private/pbdemo/v2"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
@@ -42,13 +42,9 @@ func TestResourceHandler_InputValidation(t *testing.T) {
 		request              *http.Request
 		response             *httptest.ResponseRecorder
 		expectedResponseCode int
-		responseBodyContains string
+		expectedErrorMessage string
 	}
-
-	client := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		Run(t)
-
+	client := svctest.RunResourceService(t, demo.RegisterTypes)
 	resourceHandler := resourceHandler{
 		resource.Registration{
 			Type:  demo.TypeV2Artist,
@@ -76,7 +72,7 @@ func TestResourceHandler_InputValidation(t *testing.T) {
 			`)),
 			response:             httptest.NewRecorder(),
 			expectedResponseCode: http.StatusBadRequest,
-			responseBodyContains: "resource.id.name invalid",
+			expectedErrorMessage: "rpc error: code = InvalidArgument desc = resource.id.name is required",
 		},
 		{
 			description: "wrong schema",
@@ -93,21 +89,21 @@ func TestResourceHandler_InputValidation(t *testing.T) {
 			`)),
 			response:             httptest.NewRecorder(),
 			expectedResponseCode: http.StatusBadRequest,
-			responseBodyContains: "Request body didn't follow the resource schema",
+			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,
-			responseBodyContains: "Request body format is invalid",
+			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,
-			responseBodyContains: "id.name invalid",
+			expectedErrorMessage: "rpc error: code = InvalidArgument desc = id.name is required",
 		},
 	}
 
@@ -123,23 +119,23 @@ func TestResourceHandler_InputValidation(t *testing.T) {
 			require.NoError(t, err)
 
 			require.Equal(t, tc.expectedResponseCode, tc.response.Result().StatusCode)
-			require.Contains(t, string(b), tc.responseBodyContains)
+			require.Equal(t, tc.expectedErrorMessage, string(b))
 		})
 	}
 }
 
 func TestResourceWriteHandler(t *testing.T) {
-	aclResolver := &svc.MockACLResolver{}
+	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)
 
-	builder := svctest.NewResourceServiceBuilder().
-		WithACLResolver(aclResolver).
-		WithRegisterFns(demo.RegisterTypes)
-	client := builder.Run(t)
-	handler := NewHandler(client, builder.Registry(), parseToken, hclog.NewNullLogger())
+	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()
@@ -162,7 +158,6 @@ func TestResourceWriteHandler(t *testing.T) {
 		require.Equal(t, http.StatusForbidden, rsp.Result().StatusCode)
 	})
 
-	var readRsp *pbresource.ReadResponse
 	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(`
@@ -188,8 +183,7 @@ func TestResourceWriteHandler(t *testing.T) {
 		require.Equal(t, "Keith Urban", result["data"].(map[string]any)["name"])
 		require.Equal(t, "keith-urban", result["id"].(map[string]any)["name"])
 
-		var err error
-		readRsp, err = client.Read(testutil.TestContext(t), &pbresource.ReadRequest{
+		readRsp, err := client.Read(testutil.TestContext(t), &pbresource.ReadRequest{
 			Id: &pbresource.ID{
 				Type:    demo.TypeV2Artist,
 				Tenancy: resource.DefaultNamespacedTenancy(),
@@ -206,7 +200,7 @@ func TestResourceWriteHandler(t *testing.T) {
 
 	t.Run("should update the record with version parameter", func(t *testing.T) {
 		rsp := httptest.NewRecorder()
-		req := httptest.NewRequest("PUT", fmt.Sprintf("/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default&version=%s", readRsp.Resource.Version), strings.NewReader(`
+		req := httptest.NewRequest("PUT", "/demo/v2/artist/keith-urban?partition=default&peer_name=local&namespace=default&version=1", strings.NewReader(`
 			{
 				"metadata": {
 					"foo": "bar"
@@ -357,7 +351,7 @@ func deleteResource(t *testing.T, artistHandler http.Handler, resourceUri *Resou
 }
 
 func TestResourceReadHandler(t *testing.T) {
-	aclResolver := &svc.MockACLResolver{}
+	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).
@@ -365,11 +359,11 @@ func TestResourceReadHandler(t *testing.T) {
 	aclResolver.On("ResolveTokenAndDefaultMeta", fakeToken, mock.Anything, mock.Anything).
 		Return(svctest.AuthorizerFrom(t, ""), nil)
 
-	builder := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		WithACLResolver(aclResolver)
-	client := builder.Run(t)
-	handler := NewHandler(client, builder.Registry(), parseToken, hclog.NewNullLogger())
+	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)
 
@@ -412,17 +406,18 @@ func TestResourceReadHandler(t *testing.T) {
 }
 
 func TestResourceDeleteHandler(t *testing.T) {
-	aclResolver := &svc.MockACLResolver{}
+	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)
 
-	builder := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		WithACLResolver(aclResolver)
-	client := builder.Run(t)
-	handler := NewHandler(client, builder.Registry(), parseToken, hclog.NewNullLogger())
+	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)
@@ -488,17 +483,18 @@ func TestResourceDeleteHandler(t *testing.T) {
 }
 
 func TestResourceListHandler(t *testing.T) {
-	aclResolver := &svc.MockACLResolver{}
+	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)
 
-	builder := svctest.NewResourceServiceBuilder().
-		WithRegisterFns(demo.RegisterTypes).
-		WithACLResolver(aclResolver)
-	client := builder.Run(t)
-	handler := NewHandler(client, builder.Registry(), parseToken, hclog.NewNullLogger())
+	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()
diff --git a/internal/resource/reaper/controller.go b/internal/resource/reaper/controller.go
index c79dde5551122..f8de86f92196e 100644
--- a/internal/resource/reaper/controller.go
+++ b/internal/resource/reaper/controller.go
@@ -7,12 +7,11 @@ import (
 	"context"
 	"time"
 
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
 	"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 (
diff --git a/internal/resource/reaper/controller_test.go b/internal/resource/reaper/controller_test.go
index 58ed2564fe3f6..c06ccedab582d 100644
--- a/internal/resource/reaper/controller_test.go
+++ b/internal/resource/reaper/controller_test.go
@@ -15,209 +15,179 @@ import (
 	"github.com/hashicorp/consul/internal/controller"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/internal/resource/demo"
-	"github.com/hashicorp/consul/internal/resource/resourcetest"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
 	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/consul/sdk/testutil"
 )
 
 func TestReconcile_ResourceWithNoChildren(t *testing.T) {
-	client := setupResourceService(t)
-	runReaperTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Seed the database with an artist.
-		res, err := demo.GenerateV2Artist()
-
-		// set resource tenancy from default to test tenancy
-		res.Id.Tenancy = tenancy
-
-		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: 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))
+	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 := setupResourceService(t)
-	runReaperTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Seed the database with an artist
-		res, err := demo.GenerateV2Artist()
+	client := svctest.RunResourceService(t, demo.RegisterTypes)
 
-		// set resource tenancy from default to test tenancy
-		res.Id.Tenancy = tenancy
+	// 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)
-		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})
+		_, err := client.Write(ctx, &pbresource.WriteRequest{Resource: res})
 		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)
+	// Delete the artist to create a tombstone
+	_, err = client.Delete(ctx, &pbresource.DeleteRequest{Id: writeRsp.Resource.Id})
+	require.NoError(t, err)
 
-		// 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)
+	// Retrieve the tombstone
+	listRsp, err := client.List(ctx, &pbresource.ListRequest{
+		Type:    resource.TypeV1Tombstone,
+		Tenancy: writeRsp.Resource.Id.Tenancy,
 	})
-}
-
-func TestReconcile_RequeueWithDelayWhenSecondPassDelayNotElapsed(t *testing.T) {
-	client := setupResourceService(t)
-	runReaperTestCaseWithTenancies(func(tenancy *pbresource.Tenancy) {
-		// Seed the database with an artist.
-		res, err := demo.GenerateV2Artist()
-
-		// set resource tenancy from default to test tenancy
-		res.Id.Tenancy = tenancy
-
-		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)
+	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 requeued for second pass since secondPassDelay time has not elapsed
-		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 runReaperTestCaseWithTenancies(testCase func(tenancy *pbresource.Tenancy)) {
-	for _, tenancy := range resourcetest.TestTenancies() {
-		testCase(tenancy)
+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),
 	}
-}
-
-func setupResourceService(t *testing.T) pbresource.ResourceServiceClient {
-	return svctest.NewResourceServiceBuilder().
-		WithTenancies(rtest.TestTenancies()...).
-		WithRegisterFns(demo.RegisterTypes).
-		Run(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/registry.go b/internal/resource/registry.go
index 7897ffb1b4bce..20c1f4dc41a85 100644
--- a/internal/resource/registry.go
+++ b/internal/resource/registry.go
@@ -42,17 +42,6 @@ type Registry interface {
 	Types() []Registration
 }
 
-// ValidationHook is the function signature for a validation hook. These hooks can inspect
-// the data as they see fit but are expected to not mutate the data in any way. If Go
-// supported it, we would pass something akin to a const pointer into the callback to have
-// the compiler enforce this immutability.
-type ValidationHook func(*pbresource.Resource) error
-
-// MutationHook is the function signature for a validation hook. These hooks can inspect
-// and mutate the resource. If modifying the resources Data, the hook needs to ensure that
-// the data gets reencoded and stored back to the Data field.
-type MutationHook func(*pbresource.Resource) error
-
 type Registration struct {
 	// Type is the GVK of the resource type.
 	Type *pbresource.Type
@@ -67,13 +56,13 @@ type Registration struct {
 	// Validate is called to structurally validate the resource (e.g.
 	// check for required fields). Validate can assume that Mutate
 	// has been called.
-	Validate ValidationHook
+	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 MutationHook
+	Mutate func(*pbresource.Resource) error
 
 	// Scope describes the tenancy scope of a resource.
 	Scope Scope
@@ -81,10 +70,6 @@ type Registration struct {
 
 var ErrNeedResource = errors.New("authorization check requires the entire resource")
 
-type ACLAuthorizeReadHook func(acl.Authorizer, *acl.AuthorizerContext, *pbresource.ID, *pbresource.Resource) error
-type ACLAuthorizeWriteHook func(acl.Authorizer, *acl.AuthorizerContext, *pbresource.Resource) error
-type ACLAuthorizeListHook func(acl.Authorizer, *acl.AuthorizerContext) error
-
 type ACLHooks struct {
 	// Read is used to authorize Read RPCs and to filter results in List
 	// RPCs.
@@ -94,17 +79,17 @@ type ACLHooks struct {
 	// check will be deferred until the data is fetched from the storage layer.
 	//
 	// If it is omitted, `operator:read` permission is assumed.
-	Read ACLAuthorizeReadHook
+	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 ACLAuthorizeWriteHook
+	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 ACLAuthorizeListHook
+	List func(acl.Authorizer, *acl.AuthorizerContext) error
 }
 
 // Resource type registry
diff --git a/internal/resource/resource.go b/internal/resource/resource.go
deleted file mode 100644
index 6830f10931204..0000000000000
--- a/internal/resource/resource.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource
-
-import (
-	"fmt"
-	"strings"
-
-	mapset "github.com/deckarep/golang-set/v2"
-
-	"github.com/hashicorp/consul/agent/dns"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-// MaxNameLength is the maximum length of a resource name.
-const MaxNameLength = 63
-
-// DeletionTimestampKey is the key in a resource's metadata that stores the timestamp
-// when a resource was marked for deletion. This only applies to resources with finalizers.
-const DeletionTimestampKey = "deletionTimestamp"
-
-// FinalizerKey is the key in resource's metadata that stores the whitespace separated
-// list of finalizers.
-const FinalizerKey = "finalizers"
-
-// ValidateName returns an error a name is not a valid resource name.
-// The error will contain reference to what constitutes a valid resource name.
-func ValidateName(name string) error {
-	if !dns.IsValidLabel(name) || strings.ToLower(name) != name || len(name) > MaxNameLength {
-		return fmt.Errorf("a resource name must consist of lower case alphanumeric characters or '-', must start and end with an alphanumeric character and be less than %d characters, got: %q", MaxNameLength+1, name)
-	}
-	return nil
-}
-
-// IsMarkedForDeletion returns true if a resource has been marked for deletion,
-// false otherwise.
-func IsMarkedForDeletion(res *pbresource.Resource) bool {
-	if res.Metadata == nil {
-		return false
-	}
-	_, ok := res.Metadata[DeletionTimestampKey]
-	return ok
-}
-
-// HasFinalizers returns true if a resource has one or more finalizers, false otherwise.
-func HasFinalizers(res *pbresource.Resource) bool {
-	return GetFinalizers(res).Cardinality() >= 1
-}
-
-// HasFinalizer returns true if a resource has a given finalizers, false otherwise.
-func HasFinalizer(res *pbresource.Resource, finalizer string) bool {
-	return GetFinalizers(res).Contains(finalizer)
-}
-
-// AddFinalizer adds a finalizer to the given resource.
-func AddFinalizer(res *pbresource.Resource, finalizer string) {
-	finalizerSet := GetFinalizers(res)
-	finalizerSet.Add(finalizer)
-	if res.Metadata == nil {
-		res.Metadata = map[string]string{}
-	}
-	res.Metadata[FinalizerKey] = strings.Join(finalizerSet.ToSlice(), " ")
-}
-
-// RemoveFinalizer removes a finalizer from the given resource.
-func RemoveFinalizer(res *pbresource.Resource, finalizer string) {
-	finalizerSet := GetFinalizers(res)
-	finalizerSet.Remove(finalizer)
-
-	if finalizerSet.Cardinality() == 0 {
-		// Remove key if no finalizers to prevent dual representations of
-		// the same state.
-		_, keyExists := res.Metadata[FinalizerKey]
-		if keyExists {
-			delete(res.Metadata, FinalizerKey)
-		}
-	} else {
-		// Add/update key
-		if res.Metadata == nil {
-			res.Metadata = map[string]string{}
-		}
-		res.Metadata[FinalizerKey] = strings.Join(finalizerSet.ToSlice(), " ")
-	}
-}
-
-// GetFinalizers returns the set of finalizers for the given resource.
-func GetFinalizers(res *pbresource.Resource) mapset.Set[string] {
-	if res.Metadata == nil {
-		return mapset.NewSet[string]()
-	}
-	finalizers, ok := res.Metadata[FinalizerKey]
-	if !ok {
-		return mapset.NewSet[string]()
-	}
-	return mapset.NewSet[string](strings.Fields(finalizers)...)
-}
diff --git a/internal/resource/resource_test.go b/internal/resource/resource_test.go
deleted file mode 100644
index 5057bd4cf8f36..0000000000000
--- a/internal/resource/resource_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package resource_test
-
-import (
-	"testing"
-
-	mapset "github.com/deckarep/golang-set/v2"
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/internal/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-)
-
-func TestFinalizer(t *testing.T) {
-	t.Run("no finalizers", func(t *testing.T) {
-		res := rtest.Resource(pbtenancy.NamespaceType, "ns1").Build()
-		require.False(t, resource.HasFinalizers(res))
-		require.False(t, resource.HasFinalizer(res, "finalizer1"))
-		require.Equal(t, mapset.NewSet[string](), resource.GetFinalizers(res))
-		resource.RemoveFinalizer(res, "finalizer")
-	})
-
-	t.Run("add finalizer", func(t *testing.T) {
-		res := rtest.Resource(pbtenancy.NamespaceType, "ns1").Build()
-		resource.AddFinalizer(res, "finalizer1")
-		require.True(t, resource.HasFinalizers(res))
-		require.True(t, resource.HasFinalizer(res, "finalizer1"))
-		require.False(t, resource.HasFinalizer(res, "finalizer2"))
-		require.Equal(t, mapset.NewSet[string]("finalizer1"), resource.GetFinalizers(res))
-
-		// add duplicate -> noop
-		resource.AddFinalizer(res, "finalizer1")
-		require.Equal(t, mapset.NewSet[string]("finalizer1"), resource.GetFinalizers(res))
-	})
-
-	t.Run("remove finalizer", func(t *testing.T) {
-		res := rtest.Resource(pbtenancy.NamespaceType, "ns1").Build()
-		resource.AddFinalizer(res, "finalizer1")
-		resource.AddFinalizer(res, "finalizer2")
-		resource.RemoveFinalizer(res, "finalizer1")
-		require.False(t, resource.HasFinalizer(res, "finalizer1"))
-		require.True(t, resource.HasFinalizer(res, "finalizer2"))
-		require.Equal(t, mapset.NewSet[string]("finalizer2"), resource.GetFinalizers(res))
-
-		// remove non-existent -> noop
-		resource.RemoveFinalizer(res, "finalizer3")
-		require.Equal(t, mapset.NewSet[string]("finalizer2"), resource.GetFinalizers(res))
-	})
-
-}
diff --git a/internal/resource/resourcetest/client.go b/internal/resource/resourcetest/client.go
index 894f6e7e5b861..a9ad08f5358de 100644
--- a/internal/resource/resourcetest/client.go
+++ b/internal/resource/resourcetest/client.go
@@ -280,17 +280,6 @@ func (client *Client) WaitForStatusCondition(t T, id *pbresource.ID, statusKey s
 	return res
 }
 
-func (client *Client) WaitForStatusConditionAnyGen(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.RequireStatusCondition(r, id, statusKey, condition)
-	})
-
-	return res
-}
-
 func (client *Client) WaitForStatusConditions(t T, id *pbresource.ID, statusKey string, conditions ...*pbresource.Condition) *pbresource.Resource {
 	t.Helper()
 
@@ -324,17 +313,6 @@ func (client *Client) WaitForResourceState(t T, id *pbresource.ID, verify func(T
 	return res
 }
 
-func (client *Client) WaitForResourceExists(t T, id *pbresource.ID) *pbresource.Resource {
-	t.Helper()
-
-	var res *pbresource.Resource
-	client.retry(t, func(r *retry.R) {
-		res = client.RequireResourceExists(r, id)
-	})
-
-	return res
-}
-
 func (client *Client) WaitForDeletion(t T, id *pbresource.ID) {
 	t.Helper()
 
@@ -366,7 +344,7 @@ func (client *Client) MustDelete(t T, id *pbresource.ID) {
 // to the delete.
 func (client *Client) CleanupDelete(t T, id *pbresource.ID) {
 	t.Helper()
-	client.retryDelete(t, id, false)
+	client.retryDelete(t, id, true)
 }
 
 func (client *Client) retryDelete(t T, id *pbresource.ID, shouldDelay bool) {
diff --git a/internal/resource/resourcetest/tenancy.go b/internal/resource/resourcetest/tenancy.go
index 72757466ed200..5f5c0525b6f43 100644
--- a/internal/resource/resourcetest/tenancy.go
+++ b/internal/resource/resourcetest/tenancy.go
@@ -4,28 +4,13 @@
 package resourcetest
 
 import (
-	"fmt"
 	"strings"
 	"testing"
 
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/version/versiontest"
 )
 
-// TestTenancies returns a list of tenancies which represent
-// the namespace and partition combinations that can be used in unit tests
-func TestTenancies() []*pbresource.Tenancy {
-	isEnterprise := versiontest.IsEnterprise()
-
-	tenancies := []*pbresource.Tenancy{Tenancy("default.default")}
-	if isEnterprise {
-		tenancies = append(tenancies, Tenancy("default.bar"), Tenancy("foo.default"), Tenancy("foo.bar"))
-	}
-
-	return tenancies
-}
-
 // Tenancy constructs a pbresource.Tenancy from a concise string representation
 // suitable for use in unit tests.
 //
@@ -65,19 +50,3 @@ func DefaultTenancyForType(t *testing.T, reg resource.Registration) *pbresource.
 		return nil
 	}
 }
-
-func AppendTenancyInfoSubtest(name string, subtestName string, tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_%s_Namespace_%s_Partition/%s", name, tenancy.Namespace, tenancy.Partition, subtestName)
-}
-
-func AppendTenancyInfo(name string, tenancy *pbresource.Tenancy) string {
-	return fmt.Sprintf("%s_%s_Namespace_%s_Partition", name, tenancy.Namespace, tenancy.Partition)
-}
-
-func RunWithTenancies(testFunc func(tenancy *pbresource.Tenancy), t *testing.T) {
-	for _, tenancy := range TestTenancies() {
-		t.Run(AppendTenancyInfo(t.Name(), tenancy), func(t *testing.T) {
-			testFunc(tenancy)
-		})
-	}
-}
diff --git a/internal/resource/resourcetest/testing.go b/internal/resource/resourcetest/testing.go
index 6ea5ce910365d..1be9947226bd2 100644
--- a/internal/resource/resourcetest/testing.go
+++ b/internal/resource/resourcetest/testing.go
@@ -3,10 +3,14 @@
 
 package resourcetest
 
-import "github.com/hashicorp/consul/sdk/testutil"
-
 // T represents the subset of testing.T methods that will be used
 // by the various functionality in this package
 type T interface {
-	testutil.TestingTB
+	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/sort_test.go b/internal/resource/sort_test.go
index 3b7622adb1a91..e319266d9a925 100644
--- a/internal/resource/sort_test.go
+++ b/internal/resource/sort_test.go
@@ -17,9 +17,6 @@ import (
 )
 
 func TestLessReference(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
 	parseTenancy := func(s string) *pbresource.Tenancy {
 		// format is: <partition>.<peerName>.<namespace>
 		parts := strings.Split(s, ".")
diff --git a/internal/resource/tenancy.go b/internal/resource/tenancy.go
index 597253aa8dc13..126e12413f6a8 100644
--- a/internal/resource/tenancy.go
+++ b/internal/resource/tenancy.go
@@ -5,6 +5,7 @@ package resource
 
 import (
 	"fmt"
+	"strings"
 
 	"google.golang.org/protobuf/proto"
 
@@ -24,6 +25,15 @@ const (
 	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
 
@@ -52,6 +62,20 @@ func (s Scope) String() string {
 	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{
@@ -132,6 +156,7 @@ func defaultTenancy(itemTenancy, parentTenancy, scopeTenancy *pbresource.Tenancy
 	if itemTenancy.PeerName == "" {
 		itemTenancy.PeerName = DefaultPeerName
 	}
+	Normalize(itemTenancy)
 
 	if parentTenancy != nil {
 		// Recursively normalize this tenancy as well.
@@ -142,6 +167,7 @@ func defaultTenancy(itemTenancy, parentTenancy, scopeTenancy *pbresource.Tenancy
 	if parentTenancy == nil {
 		parentTenancy = scopeTenancy
 	}
+	Normalize(parentTenancy)
 
 	if !equalOrEmpty(itemTenancy.PeerName, DefaultPeerName) {
 		panic("peering is not supported yet for resource tenancies")
diff --git a/internal/resource/tenancy_bridge_ce.go b/internal/resource/tenancy_bridge_ce.go
new file mode 100644
index 0000000000000..9f88c22361998
--- /dev/null
+++ b/internal/resource/tenancy_bridge_ce.go
@@ -0,0 +1,28 @@
+// 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/storage/inmem/backend_test.go b/internal/storage/inmem/backend_test.go
index c1aa13b70e4cc..7978dcdf29935 100644
--- a/internal/storage/inmem/backend_test.go
+++ b/internal/storage/inmem/backend_test.go
@@ -15,9 +15,6 @@ import (
 )
 
 func TestBackend_Conformance(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
 	conformance.Test(t, conformance.TestOptions{
 		NewBackend: func(t *testing.T) storage.Backend {
 			backend, err := inmem.NewBackend()
diff --git a/internal/storage/raft/conformance_test.go b/internal/storage/raft/conformance_test.go
index d76ae1b456cb8..6c75e462d21c3 100644
--- a/internal/storage/raft/conformance_test.go
+++ b/internal/storage/raft/conformance_test.go
@@ -23,9 +23,6 @@ import (
 )
 
 func TestBackend_Conformance(t *testing.T) {
-	if testing.Short() {
-		t.Skip("too slow for testing.Short")
-	}
 	t.Run("Leader", func(t *testing.T) {
 		conformance.Test(t, conformance.TestOptions{
 			NewBackend: func(t *testing.T) storage.Backend {
diff --git a/internal/tenancy/exports.go b/internal/tenancy/exports.go
index 18340ce039240..aadd7efb59beb 100644
--- a/internal/tenancy/exports.go
+++ b/internal/tenancy/exports.go
@@ -4,15 +4,21 @@
 package tenancy
 
 import (
-	"github.com/hashicorp/consul/internal/controller"
 	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/tenancy/internal/bridge"
-	"github.com/hashicorp/consul/internal/tenancy/internal/controllers"
 	"github.com/hashicorp/consul/internal/tenancy/internal/types"
 )
 
-type (
-	V2TenancyBridge = bridge.V2TenancyBridge
+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
@@ -20,15 +26,3 @@ type (
 func RegisterTypes(r resource.Registry) {
 	types.Register(r)
 }
-
-// RegisterControllers registers controllers for the tenancy types with
-// the given controller manager.
-func RegisterControllers(mgr *controller.Manager, deps Dependencies) {
-	controllers.Register(mgr, deps)
-}
-
-func NewV2TenancyBridge() *V2TenancyBridge {
-	return bridge.NewV2TenancyBridge()
-}
-
-type Dependencies = controllers.Dependencies
diff --git a/internal/tenancy/internal/bridge/tenancy_bridge.go b/internal/tenancy/internal/bridge/tenancy_bridge.go
deleted file mode 100644
index 9e369457a55d3..0000000000000
--- a/internal/tenancy/internal/bridge/tenancy_bridge.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package bridge
-
-import (
-	"context"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-)
-
-// V2TenancyBridge is used by the resource service to access V2 implementations of
-// partitions and namespaces.
-type V2TenancyBridge struct {
-	client pbresource.ResourceServiceClient
-}
-
-// WithClient inject a ResourceServiceClient in the V2TenancyBridge.
-// This is needed to break a circular dependency between
-// the ResourceServiceServer, ResourceServiceClient and the TenancyBridge
-func (b *V2TenancyBridge) WithClient(client pbresource.ResourceServiceClient) *V2TenancyBridge {
-	b.client = client
-	return b
-}
-
-func NewV2TenancyBridge() *V2TenancyBridge {
-	return &V2TenancyBridge{}
-}
-
-func (b *V2TenancyBridge) NamespaceExists(partition, namespace string) (bool, error) {
-	if namespace == resource.DefaultNamespaceName {
-		// The default namespace implicitly exists in all partitions regardless of whether
-		// the resource has actually been created yet. Therefore all we need to do is check
-		// if the partition exists to know whether the namespace exists.
-		return b.PartitionExists(partition)
-	}
-
-	_, err := b.client.Read(context.Background(), &pbresource.ReadRequest{
-		Id: &pbresource.ID{
-			Name: namespace,
-			Tenancy: &pbresource.Tenancy{
-				Partition: partition,
-			},
-			Type: pbtenancy.NamespaceType,
-		},
-	})
-	switch {
-	case err == nil:
-		return true, nil
-	case status.Code(err) == codes.NotFound:
-		return false, nil
-	default:
-		return false, err
-	}
-}
-
-func (b *V2TenancyBridge) IsNamespaceMarkedForDeletion(partition, namespace string) (bool, error) {
-	rsp, err := b.client.Read(context.Background(), &pbresource.ReadRequest{
-		Id: &pbresource.ID{
-			Name: namespace,
-			Tenancy: &pbresource.Tenancy{
-				Partition: partition,
-			},
-			Type: pbtenancy.NamespaceType,
-		},
-	})
-	if err != nil {
-		return false, err
-	}
-	return resource.IsMarkedForDeletion(rsp.Resource), nil
-}
diff --git a/internal/tenancy/internal/bridge/tenancy_bridge_ce.go b/internal/tenancy/internal/bridge/tenancy_bridge_ce.go
deleted file mode 100644
index 168ee643b8c06..0000000000000
--- a/internal/tenancy/internal/bridge/tenancy_bridge_ce.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package bridge
-
-import "github.com/hashicorp/consul/internal/resource"
-
-func (b *V2TenancyBridge) PartitionExists(partition string) (bool, error) {
-	if partition == resource.DefaultPartitionName {
-		// In CE partition resources are never actually created. However, conceptually
-		// the default partition always exists.
-		return true, nil
-	}
-	return false, nil
-}
-
-func (b *V2TenancyBridge) IsPartitionMarkedForDeletion(partition string) (bool, error) {
-	return false, nil
-}
diff --git a/internal/tenancy/internal/controllers/common/common.go b/internal/tenancy/internal/controllers/common/common.go
deleted file mode 100644
index 38b8af862d938..0000000000000
--- a/internal/tenancy/internal/controllers/common/common.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-// Common code shared by the partition and namespace controllers.
-package common
-
-import (
-	"context"
-	"errors"
-	"fmt"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	// ConditionAccepted indicates the tenancy unit has a finalizer
-	// and contains a default namespace if a partition.
-	ConditionAccepted              = "accepted"
-	ReasonAcceptedOK               = "Ok"
-	ReasonEnsureHasFinalizerFailed = "EnsureHasFinalizerFailed"
-
-	// ConditionDeleted indicates that the units tenants have been
-	// deleted. It never has a state other than false because the
-	// resource no longer exists at that point.
-	ConditionDeleted         = "deleted"
-	ReasonDeletionInProgress = "DeletionInProgress"
-)
-
-var (
-	ErrStillHasTenants = errors.New("still has tenants")
-)
-
-func EnsureHasFinalizer(ctx context.Context, rt controller.Runtime, res *pbresource.Resource, statusKey string) error {
-	// The statusKey doubles as the finalizer name for tenancy resources.
-	if resource.HasFinalizer(res, statusKey) {
-		rt.Logger.Trace("already has finalizer")
-		return nil
-	}
-
-	// Finalizer hasn't been written, so add it.
-	resource.AddFinalizer(res, statusKey)
-	_, err := rt.Client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-	if err != nil {
-		return WriteStatus(ctx, rt, res, statusKey, ConditionAccepted, ReasonEnsureHasFinalizerFailed, err)
-	}
-	rt.Logger.Trace("added finalizer")
-	return err
-}
-
-func EnsureTenantsDeleted(ctx context.Context, rt controller.Runtime, registry resource.Registry, res *pbresource.Resource, tenantScope resource.Scope, tenancy *pbresource.Tenancy) error {
-	// Useful stats to keep track of on every sweep
-	numExistingHasFinalizer := 0
-	numExistingOwned := 0
-	numImmediateDeletes := 0
-	numDeferredDeletes := 0
-
-	// List doesn't support querying across all types so iterate through each one.
-	for _, reg := range registry.Types() {
-		// Skip tenants that aren't scoped to the tenancy unit.
-		if reg.Scope != tenantScope {
-			continue
-		}
-
-		// Get all tenants of the current type.
-		rsp, err := rt.Client.List(ctx, &pbresource.ListRequest{Type: reg.Type, Tenancy: tenancy})
-		if err != nil {
-			return err
-		}
-
-		if len(rsp.Resources) > 0 {
-			rt.Logger.Trace(fmt.Sprintf("found %d tenant %s", len(rsp.Resources), reg.Type.Kind))
-		}
-
-		// Delete each qualified tenant.
-		for _, tenant := range rsp.Resources {
-			// Owned resources will be deleted when the parent resource is deleted (tombstone reaper)
-			// so just skip over them.
-			if tenant.Owner != nil {
-				numExistingOwned++
-				continue
-			}
-
-			// Skip anything that is already marked for deletion and has finalizers
-			// since deletion of those resource is out of our control.
-			if resource.IsMarkedForDeletion(tenant) && resource.HasFinalizers(tenant) {
-				numExistingHasFinalizer++
-				continue
-			}
-
-			// Delete tenant with a blanket non-CAS delete since we don't care about the version that
-			// is deleted. Since we don't know whether the delete was immediate or deferred due to the
-			// presense of a finalizer, we can't assume that the tenant is really deleted.
-			_, err = rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: tenant.Id, Version: ""})
-			if err != nil {
-				// Bail on the first sign of trouble and retry in future reconciles.
-				return err
-			}
-
-			// Classify the just deleted tenant since we're not fully vacated if a deferred delete occurred.
-			if resource.HasFinalizers(tenant) {
-				rt.Logger.Trace(fmt.Sprintf("deferred delete of %s tenant %q", res.Id.Type.Kind, tenant.Id.Name))
-				numDeferredDeletes++
-			} else {
-				rt.Logger.Trace(fmt.Sprintf("immediate delete of %s tenant %q", res.Id.Type.Kind, tenant.Id.Name))
-				numImmediateDeletes++
-			}
-		}
-	}
-
-	// Force re-reconcile if we have any lingering tenants by returning an error.
-	if numExistingOwned+numExistingHasFinalizer+numDeferredDeletes > 0 {
-		if numExistingOwned > 0 {
-			rt.Logger.Debug(fmt.Sprintf("delete blocked on %d remaining owned tenants", numExistingOwned))
-		}
-		if numExistingHasFinalizer > 0 {
-			rt.Logger.Debug(fmt.Sprintf("delete blocked on %d remaining tenants with finalizers", numExistingHasFinalizer))
-		}
-		if numDeferredDeletes > 0 {
-			rt.Logger.Debug(fmt.Sprintf("delete blocked on %d tenants which were just marked for deletion", numDeferredDeletes))
-		}
-		return ErrStillHasTenants
-	}
-
-	// We should have zero tenants and be good to continue.
-	rt.Logger.Debug("no tenants - green light the delete")
-	return nil
-}
-
-// EnsureResourceDelete makes sure a tenancy unit (partition or namespace) with no tenants is finally deleted.
-func EnsureResourceDeleted(ctx context.Context, rt controller.Runtime, res *pbresource.Resource, statusKey string) error {
-	// Remove finalizer if present
-	if resource.HasFinalizer(res, statusKey) {
-		resource.RemoveFinalizer(res, statusKey)
-		_, err := rt.Client.Write(ctx, &pbresource.WriteRequest{Resource: res})
-		if err != nil {
-			rt.Logger.Error("failed write to remove finalizer")
-			return WriteStatus(ctx, rt, res, statusKey, ConditionDeleted, ReasonDeletionInProgress, err)
-		}
-		rt.Logger.Trace("removed finalizer")
-	}
-
-	// Finally, delete the tenancy unit.
-	_, err := rt.Client.Delete(ctx, &pbresource.DeleteRequest{Id: res.Id})
-	if err != nil {
-		rt.Logger.Error("failed final delete", "error", err)
-		return WriteStatus(ctx, rt, res, statusKey, ConditionDeleted, ReasonDeletionInProgress, err)
-	}
-
-	// Success
-	rt.Logger.Trace("finally deleted")
-	return nil
-}
-
-// WriteStatus writes the tenancy resource status only if the status has changed.
-// The state and message are based on whether the passed in error is nil
-// (state=TRUE, message="") or not (state=FALSE, message=error). The passed in
-// error is always returned unless the delegated call to client.WriteStatus
-// itself fails.
-func WriteStatus(ctx context.Context, rt controller.Runtime, res *pbresource.Resource, statusKey string, condition string, reason string, err error) error {
-	state := pbresource.Condition_STATE_TRUE
-	message := ""
-	if err != nil {
-		state = pbresource.Condition_STATE_FALSE
-		message = err.Error()
-	}
-
-	newStatus := &pbresource.Status{
-		ObservedGeneration: res.Generation,
-		Conditions: []*pbresource.Condition{{
-			Type:    condition,
-			State:   state,
-			Reason:  reason,
-			Message: message,
-		}},
-	}
-
-	// Skip the write if the status hasn't changed to keep write amplificiation in check.
-	if resource.EqualStatus(res.Status[statusKey], newStatus, false) {
-		return err
-	}
-
-	_, statusErr := rt.Client.WriteStatus(ctx, &pbresource.WriteStatusRequest{
-		Id:     res.Id,
-		Key:    statusKey,
-		Status: newStatus,
-	})
-
-	if statusErr != nil {
-		rt.Logger.Error("failed writing status", "error", statusErr)
-		return statusErr
-	}
-	rt.Logger.Trace("wrote status", "status", newStatus)
-	return err
-}
diff --git a/internal/tenancy/internal/controllers/namespace/controller.go b/internal/tenancy/internal/controllers/namespace/controller.go
deleted file mode 100644
index 0d7a73e135741..0000000000000
--- a/internal/tenancy/internal/controllers/namespace/controller.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package namespace
-
-import (
-	"context"
-
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/resource"
-	"github.com/hashicorp/consul/internal/tenancy/internal/controllers/common"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-)
-
-const (
-	// StatusKey also serves as the finalizer name.
-	StatusKey = "consul.io/namespace-controller"
-
-	// Conditions and reasons are shared with partitions. See
-	// common.go for the full list.
-)
-
-func Controller(registry resource.Registry) controller.Controller {
-	return controller.ForType(pbtenancy.NamespaceType).
-		WithReconciler(&Reconciler{Registry: registry})
-}
-
-type Reconciler struct {
-	Registry resource.Registry
-}
-
-// Reconcile is responsible for reconciling a namespace resource.
-//
-// When a namespace is created, ensures a finalizer is added for cleanup.
-//
-// When a namespace is marked for deletion, ensures tenants are deleted and
-// the finalizer is removed.
-func (r *Reconciler) Reconcile(ctx context.Context, rt controller.Runtime, req controller.Request) error {
-	rt.Logger = rt.Logger.With("resource", req.ID.Name, "controller", "namespace")
-
-	// Never reconcile the default namespace in the default partition since it is
-	// created on system startup or snapshot restoration. Resource validation rules
-	// protect them being deleted.
-	if req.ID.Tenancy.Partition == resource.DefaultPartitionName && req.ID.Name == resource.DefaultNamespaceName {
-		rt.Logger.Trace("skipping reconcile of default namespace")
-		return nil
-	}
-
-	// Read namespace to make sure we have the latest version.
-	rsp, err := rt.Client.Read(ctx, &pbresource.ReadRequest{Id: req.ID})
-	switch {
-	case status.Code(err) == codes.NotFound:
-		// Namespace deleted - nothing to do.
-		rt.Logger.Trace("namespace not found, nothing to do")
-		return nil
-	case err != nil:
-		rt.Logger.Error("failed read", "error", err)
-		return err
-	}
-	res := rsp.Resource
-
-	if resource.IsMarkedForDeletion(res) {
-		return ensureDeleted(ctx, rt, r.Registry, res)
-	}
-
-	if err = common.EnsureHasFinalizer(ctx, rt, res, StatusKey); err != nil {
-		return err
-	}
-
-	return common.WriteStatus(ctx, rt, res, StatusKey, common.ConditionAccepted, common.ReasonAcceptedOK, err)
-}
-
-func ensureDeleted(ctx context.Context, rt controller.Runtime, registry resource.Registry, res *pbresource.Resource) error {
-	tenancy := &pbresource.Tenancy{
-		Partition: res.Id.Tenancy.Partition,
-		Namespace: res.Id.Name,
-		PeerName:  resource.DefaultPeerName,
-	}
-	// Delete namespace scoped tenants
-	if err := common.EnsureTenantsDeleted(ctx, rt, registry, res, resource.ScopeNamespace, tenancy); err != nil {
-		rt.Logger.Error("failed deleting tenants", "error", err)
-		return common.WriteStatus(ctx, rt, res, StatusKey, common.ConditionDeleted, common.ReasonDeletionInProgress, err)
-	}
-
-	// Delete namespace resource since all namespace scoped tenants are deleted
-	if err := common.EnsureResourceDeleted(ctx, rt, res, StatusKey); err != nil {
-		rt.Logger.Error("failed deleting namespace", "error", err)
-		return err
-	}
-	return nil
-}
diff --git a/internal/tenancy/internal/controllers/register.go b/internal/tenancy/internal/controllers/register.go
deleted file mode 100644
index 94b4255baeb57..0000000000000
--- a/internal/tenancy/internal/controllers/register.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package controllers
-
-import (
-	"github.com/hashicorp/consul/internal/resource"
-)
-
-type Dependencies struct {
-	Registry resource.Registry
-}
diff --git a/internal/tenancy/internal/controllers/register_ce.go b/internal/tenancy/internal/controllers/register_ce.go
deleted file mode 100644
index 6d346de9b0731..0000000000000
--- a/internal/tenancy/internal/controllers/register_ce.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package controllers
-
-import (
-	"github.com/hashicorp/consul/internal/controller"
-	"github.com/hashicorp/consul/internal/tenancy/internal/controllers/namespace"
-)
-
-func Register(mgr *controller.Manager, deps Dependencies) {
-	mgr.Register(namespace.Controller(deps.Registry))
-}
diff --git a/internal/tenancy/internal/types/namespace.go b/internal/tenancy/internal/types/namespace.go
index e96aee96190dc..4bc95d1505f7d 100644
--- a/internal/tenancy/internal/types/namespace.go
+++ b/internal/tenancy/internal/types/namespace.go
@@ -5,43 +5,44 @@ package types
 
 import (
 	"fmt"
-	"strings"
-
-	"google.golang.org/protobuf/types/known/anypb"
-
 	"github.com/hashicorp/consul/agent/dns"
 	"github.com/hashicorp/consul/internal/resource"
 	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
+	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:     pbtenancy.NamespaceType,
-		Proto:    &pbtenancy.Namespace{},
+		Type:     NamespaceV1Alpha1Type,
+		Proto:    &tenancyv1alpha1.Namespace{},
 		Scope:    resource.ScopePartition,
-		Mutate:   MutateNamespace,
 		Validate: ValidateNamespace,
+		Mutate:   MutateNamespace,
 		// ACLs: TODO
 	})
 }
 
-// MutateNamespace sets the resource data if nil since description and
-// other fields are optional.
 func MutateNamespace(res *pbresource.Resource) error {
-	if res.Data != nil {
-		return nil
-	}
-	data, err := anypb.New(&pbtenancy.Namespace{})
-	if err != nil {
-		return err
-	}
-	res.Data = data
+	res.Id.Name = strings.ToLower(res.Id.Name)
 	return nil
 }
 
 func ValidateNamespace(res *pbresource.Resource) error {
-	var ns pbtenancy.Namespace
+	var ns tenancyv1alpha1.Namespace
 
 	if err := res.Data.UnmarshalTo(&ns); err != nil {
 		return resource.NewErrDataParse(&ns, err)
diff --git a/internal/tenancy/internal/types/types_test.go b/internal/tenancy/internal/types/namespace_test.go
similarity index 54%
rename from internal/tenancy/internal/types/types_test.go
rename to internal/tenancy/internal/types/namespace_test.go
index df22b71f13a27..b64f86d5212bc 100644
--- a/internal/tenancy/internal/types/types_test.go
+++ b/internal/tenancy/internal/types/namespace_test.go
@@ -4,6 +4,14 @@
 package types
 
 import (
+	"context"
+	"errors"
+	svctest "github.com/hashicorp/consul/agent/grpc-external/services/resource/testing"
+	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
+	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
+	"github.com/hashicorp/consul/proto/private/prototest"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 	"testing"
 
 	"github.com/stretchr/testify/require"
@@ -11,15 +19,14 @@ import (
 	"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"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
+	pbtenancy "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:    pbtenancy.NamespaceType,
+			Type:    NamespaceV1Alpha1Type,
 			Tenancy: resource.DefaultPartitionedTenancy(),
 			Name:    "ns1234",
 		},
@@ -86,6 +93,28 @@ func TestValidateNamespace_ParseError(t *testing.T) {
 	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
@@ -114,6 +143,64 @@ func TestValidateNamespace(t *testing.T) {
 	}
 }
 
+func TestRead_Success(t *testing.T) {
+	client := svctest.RunResourceService(t, Register)
+	client = rtest.NewClient(client)
+
+	res := rtest.Resource(NamespaceType, "ns1").
+		WithData(t, validNamespace()).
+		Write(t, client)
+
+	readRsp, err := client.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
+	require.NoError(t, err)
+	prototest.AssertDeepEqual(t, res.Id, readRsp.Resource.Id)
+}
+
+func TestRead_NotFound(t *testing.T) {
+	client := svctest.RunResourceService(t, Register)
+	client = rtest.NewClient(client)
+
+	res := rtest.Resource(NamespaceType, "ns1").
+		WithData(t, validNamespace()).Build()
+
+	_, err := client.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
+	require.Error(t, err)
+	require.Equal(t, codes.NotFound.String(), status.Code(err).String())
+}
+
+func TestDelete_Success(t *testing.T) {
+	client := svctest.RunResourceService(t, Register)
+	client = rtest.NewClient(client)
+
+	res := rtest.Resource(NamespaceType, "ns1").
+		WithData(t, validNamespace()).Write(t, client)
+
+	readRsp, err := client.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
+	require.NoError(t, err)
+	prototest.AssertDeepEqual(t, res.Id, readRsp.Resource.Id)
+
+	_, err = client.Delete(context.Background(), &pbresource.DeleteRequest{Id: res.Id})
+	require.NoError(t, err)
+
+	_, err = client.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
+	require.Error(t, err)
+	require.Equal(t, codes.NotFound.String(), status.Code(err).String())
+
+}
+
+func TestRead_MixedCases_Success(t *testing.T) {
+	client := svctest.RunResourceService(t, Register)
+	client = rtest.NewClient(client)
+
+	res := rtest.Resource(NamespaceType, "nS1").
+		WithData(t, validNamespace()).Write(t, client)
+
+	readRsp, err := client.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
+	require.NoError(t, err)
+	prototest.AssertDeepEqual(t, res.Id, readRsp.Resource.Id)
+
+}
+
 func validNamespace() *pbtenancy.Namespace {
 	return &pbtenancy.Namespace{
 		Description: "ns namespace",
diff --git a/internal/tenancy/internal/types/types.go b/internal/tenancy/internal/types/types.go
index 5955ade8a5d7b..be0a615153fd0 100644
--- a/internal/tenancy/internal/types/types.go
+++ b/internal/tenancy/internal/types/types.go
@@ -4,7 +4,7 @@
 package types
 
 const (
-	GroupName      = "tenancy"
-	VersionV2Beta1 = "v2beta1"
-	CurrentVersion = VersionV2Beta1
+	GroupName       = "tenancy"
+	VersionV1Alpha1 = "v1alpha1"
+	CurrentVersion  = VersionV1Alpha1
 )
diff --git a/internal/tenancy/tenancytest/namespace_controller_test.go b/internal/tenancy/tenancytest/namespace_controller_test.go
deleted file mode 100644
index 574ee92cd4716..0000000000000
--- a/internal/tenancy/tenancytest/namespace_controller_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tenancytest
-
-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/controller"
-	"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/internal/tenancy/internal/controllers/common"
-	"github.com/hashicorp/consul/internal/tenancy/internal/controllers/namespace"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-	pbdemo "github.com/hashicorp/consul/proto/private/pbdemo/v1"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-// Due to a circular dependency, this test can't reside in the package next to the controller it is testing.
-
-type nsTestSuite struct {
-	suite.Suite
-
-	client  *rtest.Client
-	runtime controller.Runtime
-	ctx     context.Context
-}
-
-func (ts *nsTestSuite) SetupTest() {
-	builder := svctest.NewResourceServiceBuilder().
-		WithV2Tenancy(true).
-		WithRegisterFns(demo.RegisterTypes)
-	ts.client = rtest.NewClient(builder.Run(ts.T()))
-	ts.runtime = controller.Runtime{Client: ts.client, Logger: testutil.Logger(ts.T())}
-	ts.ctx = testutil.TestContext(ts.T())
-
-	mgr := controller.NewManager(ts.client, testutil.Logger(ts.T()))
-	mgr.Register(namespace.Controller(builder.Registry()))
-	mgr.SetRaftLeader(true)
-	ctx, cancel := context.WithCancel(context.Background())
-	ts.T().Cleanup(cancel)
-	go mgr.Run(ctx)
-}
-
-func (ts *nsTestSuite) waitForReconciliation(id *pbresource.ID, reason string) {
-	ts.T().Helper()
-
-	retry.Run(ts.T(), func(r *retry.R) {
-		rsp, err := ts.client.Read(context.Background(), &pbresource.ReadRequest{
-			Id: id,
-		})
-		require.NoError(r, err)
-
-		status, found := rsp.Resource.Status[namespace.StatusKey]
-		require.True(r, found)
-		require.Len(r, status.Conditions, 1)
-		require.Equal(r, reason, status.Conditions[0].Reason)
-	})
-}
-
-func (ts *nsTestSuite) TestNamespaceController_HappyPath() {
-	// Create namespace ns1
-	ns1 := rtest.Resource(pbtenancy.NamespaceType, "ns1").
-		// Keep this CE friendly by using default partition
-		WithTenancy(resource.DefaultPartitionedTenancy()).
-		WithData(ts.T(), &pbtenancy.Namespace{Description: "namespace ns1"}).
-		Write(ts.T(), ts.client)
-
-	// Wait for it to be accepted
-	ts.waitForReconciliation(ns1.Id, common.ReasonAcceptedOK)
-
-	// Verify namespace finalizer added
-	ns1 = ts.client.RequireResourceMeta(ts.T(), ns1.Id, resource.FinalizerKey, namespace.StatusKey)
-
-	// Add a namespace scoped tenant to the namespace
-	artist1 := rtest.Resource(demo.TypeV1Artist, "moonchild").
-		WithTenancy(&pbresource.Tenancy{
-			Partition: resource.DefaultPartitionName,
-			Namespace: ns1.Id.Name,
-			PeerName:  resource.DefaultPeerName,
-		}).
-		WithData(ts.T(), &pbdemo.Artist{Name: "Moonchild"}).
-		Write(ts.T(), ts.client)
-
-	// Delete the namespace
-	_, err := ts.client.Delete(ts.ctx, &pbresource.DeleteRequest{Id: ns1.Id})
-	require.NoError(ts.T(), err)
-
-	// Wait for the namespace to be deleted
-	ts.client.WaitForDeletion(ts.T(), ns1.Id)
-
-	// Verify tenants deleted.
-	ts.client.RequireResourceNotFound(ts.T(), artist1.Id)
-}
-
-func (ts *nsTestSuite) TestNamespaceController_DeleteBlockedByTenantsWithFinalizers() {
-	// Create namespace ns1
-	ns1 := rtest.Resource(pbtenancy.NamespaceType, "ns1").
-		WithTenancy(resource.DefaultPartitionedTenancy()).
-		WithData(ts.T(), &pbtenancy.Namespace{Description: "namespace ns1"}).
-		Write(ts.T(), ts.client)
-
-	// Wait for it to be accepted
-	ts.waitForReconciliation(ns1.Id, common.ReasonAcceptedOK)
-
-	// Add artist to namespace
-	_ = rtest.Resource(demo.TypeV1Artist, "weezer").
-		WithTenancy(&pbresource.Tenancy{
-			Partition: resource.DefaultPartitionName,
-			Namespace: ns1.Id.Name,
-			PeerName:  resource.DefaultPeerName,
-		}).
-		WithData(ts.T(), &pbdemo.Artist{Name: "Weezer"}).
-		Write(ts.T(), ts.client)
-
-	// Add another artist to namespace with a finalizer so that is blocks namespace deletion.
-	artist2 := rtest.Resource(demo.TypeV1Artist, "foofighters").
-		WithTenancy(&pbresource.Tenancy{
-			Partition: resource.DefaultPartitionName,
-			Namespace: ns1.Id.Name,
-			PeerName:  resource.DefaultPeerName,
-		}).
-		WithData(ts.T(), &pbdemo.Artist{Name: "Foo Fighters"}).
-		WithMeta(resource.FinalizerKey, "finalizer2").
-		Write(ts.T(), ts.client)
-
-	// Delete the namespace - this activates the controller logic to delete all tenants
-	ts.client.Delete(ts.ctx, &pbresource.DeleteRequest{Id: ns1.Id})
-
-	// Delete should be blocked by artist2 tenant with finalizer
-	ts.client.WaitForStatusConditionAnyGen(ts.T(), ns1.Id, namespace.StatusKey, &pbresource.Condition{
-		Type:    common.ConditionDeleted,
-		State:   pbresource.Condition_STATE_FALSE,
-		Reason:  common.ReasonDeletionInProgress,
-		Message: common.ErrStillHasTenants.Error(),
-	})
-
-	// Remove the finalizer on artist2 to unblock deletion of ns1
-	artist2 = ts.client.RequireResourceExists(ts.T(), artist2.Id)
-	resource.RemoveFinalizer(artist2, "finalizer2")
-	_, err := ts.client.Write(ts.ctx, &pbresource.WriteRequest{Resource: artist2})
-	require.NoError(ts.T(), err)
-
-	// The final reconcile should delete artist since it was marked for deletion and
-	// and has no finalizers. Given no more tenants, wait for namespace to be deleted.
-	ts.client.WaitForDeletion(ts.T(), ns1.Id)
-}
-
-func TestNamespaceControllerSuite(t *testing.T) {
-	suite.Run(t, new(nsTestSuite))
-}
diff --git a/internal/tenancy/tenancytest/namespace_test.go b/internal/tenancy/tenancytest/namespace_test.go
deleted file mode 100644
index 45beca9a6b12b..0000000000000
--- a/internal/tenancy/tenancytest/namespace_test.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tenancytest
-
-import (
-	"context"
-	"testing"
-
-	"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/resource"
-	rtest "github.com/hashicorp/consul/internal/resource/resourcetest"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-	"github.com/hashicorp/consul/proto/private/prototest"
-)
-
-func TestWriteNamespace_Success(t *testing.T) {
-	cl := rtest.NewClient(svctest.NewResourceServiceBuilder().WithV2Tenancy(true).Run(t))
-
-	res := rtest.Resource(pbtenancy.NamespaceType, "ns1").
-		WithTenancy(resource.DefaultPartitionedTenancy()).
-		WithData(t, validNamespace()).
-		Build()
-
-	writeRsp, err := cl.Write(context.Background(), &pbresource.WriteRequest{Resource: res})
-	require.NoError(t, err)
-	prototest.AssertDeepEqual(t, res.Id.Type, writeRsp.Resource.Id.Type)
-	prototest.AssertDeepEqual(t, res.Id.Tenancy, writeRsp.Resource.Id.Tenancy)
-	prototest.AssertDeepEqual(t, res.Id.Name, writeRsp.Resource.Id.Name)
-	prototest.AssertDeepEqual(t, res.Data, writeRsp.Resource.Data)
-}
-
-func TestReadNamespace_Success(t *testing.T) {
-	cl := rtest.NewClient(svctest.NewResourceServiceBuilder().WithV2Tenancy(true).Run(t))
-
-	res := rtest.Resource(pbtenancy.NamespaceType, "ns1").
-		WithData(t, validNamespace()).
-		Write(t, cl)
-
-	cases := []struct {
-		name     string
-		resource *pbresource.Resource
-		errMsg   string
-	}{
-		{
-			name: "read namespace",
-			resource: rtest.Resource(pbtenancy.NamespaceType, "ns1").
-				WithData(t, validNamespace()).
-				Build(),
-		},
-	}
-
-	for _, tc := range cases {
-		t.Run(tc.name, func(t *testing.T) {
-			readRsp, err := cl.Read(context.Background(), &pbresource.ReadRequest{Id: tc.resource.Id})
-			require.NoError(t, err)
-			prototest.AssertDeepEqual(t, res.Id, readRsp.Resource.Id)
-			prototest.AssertDeepEqual(t, res.Data, readRsp.Resource.Data)
-		})
-	}
-}
-
-func TestDeleteNamespace_Success(t *testing.T) {
-	cl := rtest.NewClient(svctest.NewResourceServiceBuilder().WithV2Tenancy(true).Run(t))
-
-	res := rtest.Resource(pbtenancy.NamespaceType, "ns1").
-		WithData(t, validNamespace()).Write(t, cl)
-
-	readRsp, err := cl.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
-	require.NoError(t, err)
-	prototest.AssertDeepEqual(t, res.Id, readRsp.Resource.Id)
-
-	_, err = cl.Delete(context.Background(), &pbresource.DeleteRequest{Id: res.Id})
-	require.NoError(t, err)
-
-	_, err = cl.Read(context.Background(), &pbresource.ReadRequest{Id: res.Id})
-	require.Error(t, err)
-	require.Equal(t, codes.NotFound.String(), status.Code(err).String())
-
-}
-
-func TestListNamespace_Success(t *testing.T) {
-	cl := rtest.NewClient(svctest.NewResourceServiceBuilder().WithV2Tenancy(true).Run(t))
-
-	res := rtest.Resource(pbtenancy.NamespaceType, "ns1").
-		WithData(t, validNamespace()).Write(t, cl)
-
-	require.NotNil(t, res)
-	res = rtest.Resource(pbtenancy.NamespaceType, "ns2").
-		WithData(t, validNamespace()).Write(t, cl)
-
-	require.NotNil(t, res)
-
-	listRsp, err := cl.List(context.Background(), &pbresource.ListRequest{Type: pbtenancy.NamespaceType, Tenancy: resource.DefaultPartitionedTenancy()})
-	require.NoError(t, err)
-	require.Len(t, listRsp.Resources, 3)
-	names := []string{
-		listRsp.Resources[0].Id.Name,
-		listRsp.Resources[1].Id.Name,
-		listRsp.Resources[2].Id.Name,
-	}
-	require.Contains(t, names, "default")
-	require.Contains(t, names, "ns1")
-	require.Contains(t, names, "ns2")
-}
-
-func validNamespace() *pbtenancy.Namespace {
-	return &pbtenancy.Namespace{
-		Description: "ns namespace",
-	}
-}
diff --git a/lib/channels/deliver_latest.go b/lib/channels/deliver_latest.go
deleted file mode 100644
index 2e43c135e9e13..0000000000000
--- a/lib/channels/deliver_latest.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-package channels
-
-import "fmt"
-
-// DeliverLatest will drain the channel discarding any messages if there are any and sends the current message.
-func DeliverLatest[T any](val T, ch chan T) error {
-	// Send if chan is empty
-	select {
-	case ch <- val:
-		return nil
-	default:
-	}
-
-	// If it falls through to here, the channel is not empty.
-	// Drain the channel.
-	done := false
-	for !done {
-		select {
-		case <-ch:
-			continue
-		default:
-			done = true
-		}
-	}
-
-	// Attempt to send again.  If it is not empty, throw an error
-	select {
-	case ch <- val:
-		return nil
-	default:
-		return fmt.Errorf("failed to deliver latest event: chan full again after draining")
-	}
-}
diff --git a/logging/logfile_bsd.go b/logging/logfile_bsd.go
index 21e5794245638..df599358d0478 100644
--- a/logging/logfile_bsd.go
+++ b/logging/logfile_bsd.go
@@ -14,5 +14,5 @@ import (
 func (l *LogFile) createTime(stat os.FileInfo) time.Time {
 	stat_t := stat.Sys().(*syscall.Stat_t)
 	createTime := stat_t.Ctimespec
-	return time.Unix(int64(createTime.Sec), int64(createTime.Nsec)) //nolint:unconvert
+	return time.Unix(int64(createTime.Sec), int64(createTime.Nsec))
 }
diff --git a/proto-public/buf.gen.yaml b/proto-public/buf.gen.yaml
index 98d07d57726c0..a58bd2511935f 100644
--- a/proto-public/buf.gen.yaml
+++ b/proto-public/buf.gen.yaml
@@ -6,9 +6,6 @@ managed:
   enabled: true
   go_package_prefix:
     default: github.com/hashicorp/consul/proto-public
-    except:
-      - buf.build/k8s/api
-
 plugins:
   - name: go
     out: .
diff --git a/proto-public/buf.lock b/proto-public/buf.lock
deleted file mode 100644
index 8efc15e857d5d..0000000000000
--- a/proto-public/buf.lock
+++ /dev/null
@@ -1,8 +0,0 @@
-# Generated by buf. DO NOT EDIT.
-version: v1
-deps:
-  - remote: buf.build
-    owner: k8s
-    repository: api
-    commit: 8f68e41b943c4de8a5e9c9a921c889a7
-    digest: shake256:38ab77d24cf737d1204719a0ffc654056c29499f26b1546cc5af9ddb34e33799930d79d1f5a4a04b0f5c149097eabbeed37a5d2abf9552169a7d52011f6a8d6f
diff --git a/proto-public/buf.yaml b/proto-public/buf.yaml
index 514843327354c..878225723ea34 100644
--- a/proto-public/buf.yaml
+++ b/proto-public/buf.yaml
@@ -2,8 +2,6 @@
 # SPDX-License-Identifier: MPL-2.0
 
 version: v1
-deps:
-  - buf.build/k8s/api
 name: buf.build/hashicorp/consul
 lint:
   use:
@@ -21,4 +19,3 @@ lint:
 breaking:
   use:
     - FILE
-
diff --git a/proto-public/go.mod b/proto-public/go.mod
index 8ac41fa9406dd..ab00c6c62e2ce 100644
--- a/proto-public/go.mod
+++ b/proto-public/go.mod
@@ -7,30 +7,19 @@ require (
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
 	google.golang.org/grpc v1.56.3
 	google.golang.org/protobuf v1.30.0
-	k8s.io/api v0.26.2
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
-	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // 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
 	golang.org/x/net v0.17.0 // indirect
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	gopkg.in/inf.v0 v0.9.1 // indirect
-	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apimachinery v0.26.2 // indirect
-	k8s.io/klog/v2 v2.100.1 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
diff --git a/proto-public/go.sum b/proto-public/go.sum
index 135da88aac60a..f11647a8490ed 100644
--- a/proto-public/go.sum
+++ b/proto-public/go.sum
@@ -1,79 +1,44 @@
+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=
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-logr/logr v1.2.0/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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 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.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
-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/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-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/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/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 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 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/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+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/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.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 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=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-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-20230817173708-d852ddb80c63 h1:m64FZMko/V45gv0bNmrNYoDEq8U5YUhetc9cBWKS1TQ=
 golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63/go.mod h1:0v4NqG35kSWCMzLaMeX+IQrlSnVE/bqGSyC2cz/9Le8=
-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-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
-golang.org/x/net v0.0.0-20190620200207-3b0461eec859/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-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
 golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
-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-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.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-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-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/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.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc=
@@ -83,25 +48,10 @@ google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQ
 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/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
-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/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=
-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/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
-k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/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=
diff --git a/proto-public/pbcatalog/v2beta1/failover_policy.pb.go b/proto-public/pbcatalog/v2beta1/failover_policy.pb.go
index b97535df0ff12..7819ed5f2dfd6 100644
--- a/proto-public/pbcatalog/v2beta1/failover_policy.pb.go
+++ b/proto-public/pbcatalog/v2beta1/failover_policy.pb.go
@@ -24,8 +24,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// +kubebuilder:validation:Enum=FAILOVER_MODE_UNSPECIFIED;FAILOVER_MODE_SEQUENTIAL;FAILOVER_MODE_ORDER_BY_LOCALITY
-// +kubebuilder:validation:Type=string
 type FailoverMode int32
 
 const (
diff --git a/proto-public/pbcatalog/v2beta1/failover_policy.proto b/proto-public/pbcatalog/v2beta1/failover_policy.proto
index abbeb46a3ae8b..dec86807f7543 100644
--- a/proto-public/pbcatalog/v2beta1/failover_policy.proto
+++ b/proto-public/pbcatalog/v2beta1/failover_policy.proto
@@ -43,8 +43,6 @@ message FailoverDestination {
   string datacenter = 3;
 }
 
-// +kubebuilder:validation:Enum=FAILOVER_MODE_UNSPECIFIED;FAILOVER_MODE_SEQUENTIAL;FAILOVER_MODE_ORDER_BY_LOCALITY
-// +kubebuilder:validation:Type=string
 enum FailoverMode {
   FAILOVER_MODE_UNSPECIFIED = 0;
   FAILOVER_MODE_SEQUENTIAL = 1;
diff --git a/proto-public/pbcatalog/v2beta1/health.pb.binary.go b/proto-public/pbcatalog/v2beta1/health.pb.binary.go
index 1bb5bc00b4ad5..b5592db6c4647 100644
--- a/proto-public/pbcatalog/v2beta1/health.pb.binary.go
+++ b/proto-public/pbcatalog/v2beta1/health.pb.binary.go
@@ -96,13 +96,3 @@ func (msg *CheckTLSConfig) MarshalBinary() ([]byte, error) {
 func (msg *CheckTLSConfig) UnmarshalBinary(b []byte) error {
 	return proto.Unmarshal(b, msg)
 }
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *NodeHealthStatus) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *NodeHealthStatus) 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
index 7160253694606..68899af76bd3f 100644
--- a/proto-public/pbcatalog/v2beta1/health.pb.go
+++ b/proto-public/pbcatalog/v2beta1/health.pb.go
@@ -25,8 +25,6 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
-// +kubebuilder:validation:Enum=HEALTH_ANY;HEALTH_PASSING;HEALTH_WARNING;HEALTH_CRITICAL;HEALTH_MAINTENANCE
-// +kubebuilder:validation:Type=string
 type Health int32
 
 const (
@@ -83,7 +81,7 @@ func (Health) EnumDescriptor() ([]byte, []int) {
 	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{0}
 }
 
-// This resource will belong to a workload and will have an ownership relationship.
+// 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
@@ -718,82 +716,6 @@ func (x *CheckTLSConfig) GetUseTls() bool {
 	return false
 }
 
-// This resource will belong to a node and will have an ownership relationship.
-type NodeHealthStatus 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 *NodeHealthStatus) Reset() {
-	*x = NodeHealthStatus{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbcatalog_v2beta1_health_proto_msgTypes[9]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NodeHealthStatus) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NodeHealthStatus) ProtoMessage() {}
-
-func (x *NodeHealthStatus) ProtoReflect() protoreflect.Message {
-	mi := &file_pbcatalog_v2beta1_health_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 NodeHealthStatus.ProtoReflect.Descriptor instead.
-func (*NodeHealthStatus) Descriptor() ([]byte, []int) {
-	return file_pbcatalog_v2beta1_health_proto_rawDescGZIP(), []int{9}
-}
-
-func (x *NodeHealthStatus) GetType() string {
-	if x != nil {
-		return x.Type
-	}
-	return ""
-}
-
-func (x *NodeHealthStatus) GetStatus() Health {
-	if x != nil {
-		return x.Status
-	}
-	return Health_HEALTH_ANY
-}
-
-func (x *NodeHealthStatus) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-func (x *NodeHealthStatus) GetOutput() string {
-	if x != nil {
-		return x.Output
-	}
-	return ""
-}
-
 var File_pbcatalog_v2beta1_health_proto protoreflect.FileDescriptor
 
 var file_pbcatalog_v2beta1_health_proto_rawDesc = []byte{
@@ -908,44 +830,33 @@ var file_pbcatalog_v2beta1_health_proto_rawDesc = []byte{
 	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, 0x22,
-	0xaa, 0x01, 0x0a, 0x10, 0x4e, 0x6f, 0x64, 0x65, 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, 0x02, 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,
+	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, 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,
+	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 (
@@ -961,7 +872,7 @@ func file_pbcatalog_v2beta1_health_proto_rawDescGZIP() []byte {
 }
 
 var file_pbcatalog_v2beta1_health_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
-var file_pbcatalog_v2beta1_health_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
+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
@@ -973,32 +884,30 @@ var file_pbcatalog_v2beta1_health_proto_goTypes = []interface{}{
 	(*GRPCCheck)(nil),           // 7: hashicorp.consul.catalog.v2beta1.GRPCCheck
 	(*OSServiceCheck)(nil),      // 8: hashicorp.consul.catalog.v2beta1.OSServiceCheck
 	(*CheckTLSConfig)(nil),      // 9: hashicorp.consul.catalog.v2beta1.CheckTLSConfig
-	(*NodeHealthStatus)(nil),    // 10: hashicorp.consul.catalog.v2beta1.NodeHealthStatus
-	nil,                         // 11: hashicorp.consul.catalog.v2beta1.HTTPCheck.HeaderEntry
-	(*WorkloadSelector)(nil),    // 12: hashicorp.consul.catalog.v2beta1.WorkloadSelector
-	(*durationpb.Duration)(nil), // 13: google.protobuf.Duration
+	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
-	12, // 1: hashicorp.consul.catalog.v2beta1.HealthChecks.workloads:type_name -> hashicorp.consul.catalog.v2beta1.WorkloadSelector
+	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
-	13, // 8: hashicorp.consul.catalog.v2beta1.HealthCheck.interval:type_name -> google.protobuf.Duration
-	13, // 9: hashicorp.consul.catalog.v2beta1.HealthCheck.timeout:type_name -> google.protobuf.Duration
-	13, // 10: hashicorp.consul.catalog.v2beta1.HealthCheck.deregister_critical_after:type_name -> google.protobuf.Duration
-	11, // 11: hashicorp.consul.catalog.v2beta1.HTTPCheck.header:type_name -> hashicorp.consul.catalog.v2beta1.HTTPCheck.HeaderEntry
+	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
-	0,  // 14: hashicorp.consul.catalog.v2beta1.NodeHealthStatus.status:type_name -> hashicorp.consul.catalog.v2beta1.Health
-	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
+	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() }
@@ -1116,18 +1025,6 @@ func file_pbcatalog_v2beta1_health_proto_init() {
 				return nil
 			}
 		}
-		file_pbcatalog_v2beta1_health_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NodeHealthStatus); 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),
@@ -1142,7 +1039,7 @@ func file_pbcatalog_v2beta1_health_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_pbcatalog_v2beta1_health_proto_rawDesc,
 			NumEnums:      1,
-			NumMessages:   11,
+			NumMessages:   10,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/proto-public/pbcatalog/v2beta1/health.proto b/proto-public/pbcatalog/v2beta1/health.proto
index 9d3faf9c986d5..316c58d5d197f 100644
--- a/proto-public/pbcatalog/v2beta1/health.proto
+++ b/proto-public/pbcatalog/v2beta1/health.proto
@@ -9,7 +9,7 @@ import "google/protobuf/duration.proto";
 import "pbcatalog/v2beta1/selector.proto";
 import "pbresource/annotations.proto";
 
-// This resource will belong to a workload and will have an ownership relationship.
+// 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};
 
@@ -23,8 +23,6 @@ message HealthStatus {
   string output = 4;
 }
 
-// +kubebuilder:validation:Enum=HEALTH_ANY;HEALTH_PASSING;HEALTH_WARNING;HEALTH_CRITICAL;HEALTH_MAINTENANCE
-// +kubebuilder:validation:Type=string
 enum Health {
   // buf:lint:ignore ENUM_ZERO_VALUE_SUFFIX
   HEALTH_ANY = 0;
@@ -89,17 +87,3 @@ message CheckTLSConfig {
   bool tls_skip_verify = 2;
   bool use_tls = 3;
 }
-
-// This resource will belong to a node and will have an ownership relationship.
-message NodeHealthStatus {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_PARTITION};
-
-  // 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;
-}
diff --git a/proto-public/pbcatalog/v2beta1/health_deepcopy.gen.go b/proto-public/pbcatalog/v2beta1/health_deepcopy.gen.go
index 50225676f9f15..677a1af1056d3 100644
--- a/proto-public/pbcatalog/v2beta1/health_deepcopy.gen.go
+++ b/proto-public/pbcatalog/v2beta1/health_deepcopy.gen.go
@@ -193,24 +193,3 @@ func (in *CheckTLSConfig) DeepCopy() *CheckTLSConfig {
 func (in *CheckTLSConfig) DeepCopyInterface() interface{} {
 	return in.DeepCopy()
 }
-
-// DeepCopyInto supports using NodeHealthStatus within kubernetes types, where deepcopy-gen is used.
-func (in *NodeHealthStatus) DeepCopyInto(out *NodeHealthStatus) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NodeHealthStatus. Required by controller-gen.
-func (in *NodeHealthStatus) DeepCopy() *NodeHealthStatus {
-	if in == nil {
-		return nil
-	}
-	out := new(NodeHealthStatus)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new NodeHealthStatus. Required by controller-gen.
-func (in *NodeHealthStatus) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbcatalog/v2beta1/health_json.gen.go b/proto-public/pbcatalog/v2beta1/health_json.gen.go
index 0952df822e501..7c0065d922b44 100644
--- a/proto-public/pbcatalog/v2beta1/health_json.gen.go
+++ b/proto-public/pbcatalog/v2beta1/health_json.gen.go
@@ -104,17 +104,6 @@ func (this *CheckTLSConfig) UnmarshalJSON(b []byte) error {
 	return HealthUnmarshaler.Unmarshal(b, this)
 }
 
-// MarshalJSON is a custom marshaler for NodeHealthStatus
-func (this *NodeHealthStatus) MarshalJSON() ([]byte, error) {
-	str, err := HealthMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for NodeHealthStatus
-func (this *NodeHealthStatus) UnmarshalJSON(b []byte) error {
-	return HealthUnmarshaler.Unmarshal(b, this)
-}
-
 var (
 	HealthMarshaler   = &protojson.MarshalOptions{}
 	HealthUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
diff --git a/proto-public/pbcatalog/v2beta1/node.pb.go b/proto-public/pbcatalog/v2beta1/node.pb.go
index 191debe0759d3..cf38a7be7ab33 100644
--- a/proto-public/pbcatalog/v2beta1/node.pb.go
+++ b/proto-public/pbcatalog/v2beta1/node.pb.go
@@ -143,7 +143,7 @@ var file_pbcatalog_v2beta1_node_proto_rawDesc = []byte{
 	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, 0x02, 0x22, 0x3d, 0x0a, 0x0b, 0x4e,
+	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,
diff --git a/proto-public/pbcatalog/v2beta1/node.proto b/proto-public/pbcatalog/v2beta1/node.proto
index baf548c1bcd70..99c54ae48b749 100644
--- a/proto-public/pbcatalog/v2beta1/node.proto
+++ b/proto-public/pbcatalog/v2beta1/node.proto
@@ -8,7 +8,10 @@ package hashicorp.consul.catalog.v2beta1;
 import "pbresource/annotations.proto";
 
 message Node {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_PARTITION};
+  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;
 }
diff --git a/proto-public/pbcatalog/v2beta1/resource_types.gen.go b/proto-public/pbcatalog/v2beta1/resource_types.gen.go
index aed62dc6bf739..c71a38ac70cda 100644
--- a/proto-public/pbcatalog/v2beta1/resource_types.gen.go
+++ b/proto-public/pbcatalog/v2beta1/resource_types.gen.go
@@ -15,7 +15,6 @@ const (
 	HealthChecksKind     = "HealthChecks"
 	HealthStatusKind     = "HealthStatus"
 	NodeKind             = "Node"
-	NodeHealthStatusKind = "NodeHealthStatus"
 	ServiceKind          = "Service"
 	ServiceEndpointsKind = "ServiceEndpoints"
 	VirtualIPsKind       = "VirtualIPs"
@@ -53,12 +52,6 @@ var (
 		Kind:         NodeKind,
 	}
 
-	NodeHealthStatusType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         NodeHealthStatusKind,
-	}
-
 	ServiceType = &pbresource.Type{
 		Group:        GroupName,
 		GroupVersion: Version,
diff --git a/proto-public/pbmesh/v2beta1/gateway_class.pb.binary.go b/proto-public/pbmesh/v2beta1/gateway_class.pb.binary.go
deleted file mode 100644
index 571b376668bea..0000000000000
--- a/proto-public/pbmesh/v2beta1/gateway_class.pb.binary.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/gateway_class.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GatewayClass) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GatewayClass) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ParametersReference) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ParametersReference) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/gateway_class.pb.go b/proto-public/pbmesh/v2beta1/gateway_class.pb.go
deleted file mode 100644
index f8b076d0699fe..0000000000000
--- a/proto-public/pbmesh/v2beta1/gateway_class.pb.go
+++ /dev/null
@@ -1,311 +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.31.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/gateway_class.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/reference/spec/#gateway.networking.k8s.io/v1.GatewayClass
-//
-// This is a Resource type.
-type GatewayClass struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// ControllerName is the name of the Kubernetes controller that manages Gateways of this class
-	ControllerName string `protobuf:"bytes,1,opt,name=controller_name,json=controllerName,proto3" json:"controller_name,omitempty"`
-	// ParametersRef refers to a resource responsible for configuring
-	// the behavior of the GatewayClass.
-	ParametersRef *ParametersReference `protobuf:"bytes,2,opt,name=parameters_ref,json=parametersRef,proto3,oneof" json:"parameters_ref,omitempty"`
-	// Description of GatewayClass
-	Description *string `protobuf:"bytes,3,opt,name=description,proto3,oneof" json:"description,omitempty"`
-}
-
-func (x *GatewayClass) Reset() {
-	*x = GatewayClass{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_gateway_class_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GatewayClass) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GatewayClass) ProtoMessage() {}
-
-func (x *GatewayClass) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_gateway_class_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 GatewayClass.ProtoReflect.Descriptor instead.
-func (*GatewayClass) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_gateway_class_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *GatewayClass) GetControllerName() string {
-	if x != nil {
-		return x.ControllerName
-	}
-	return ""
-}
-
-func (x *GatewayClass) GetParametersRef() *ParametersReference {
-	if x != nil {
-		return x.ParametersRef
-	}
-	return nil
-}
-
-func (x *GatewayClass) GetDescription() string {
-	if x != nil && x.Description != nil {
-		return *x.Description
-	}
-	return ""
-}
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// ParametersReference specifies a resource that contains Kubernetes controller-specific configuration
-// for a resource
-// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.ParametersReference
-type ParametersReference struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// The Kubernetes Group that the referred object belongs to
-	Group string `protobuf:"bytes,1,opt,name=group,proto3" json:"group,omitempty"`
-	// The Kubernetes Kind that the referred object is
-	Kind string `protobuf:"bytes,2,opt,name=kind,proto3" json:"kind,omitempty"`
-	// The name of the referred object
-	Name string `protobuf:"bytes,3,opt,name=name,proto3" json:"name,omitempty"`
-	// The kubernetes namespace that the referred object is in
-	Namespace *string `protobuf:"bytes,4,opt,name=namespace,proto3,oneof" json:"namespace,omitempty"`
-}
-
-func (x *ParametersReference) Reset() {
-	*x = ParametersReference{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_gateway_class_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ParametersReference) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ParametersReference) ProtoMessage() {}
-
-func (x *ParametersReference) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_gateway_class_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 ParametersReference.ProtoReflect.Descriptor instead.
-func (*ParametersReference) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_gateway_class_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *ParametersReference) GetGroup() string {
-	if x != nil {
-		return x.Group
-	}
-	return ""
-}
-
-func (x *ParametersReference) GetKind() string {
-	if x != nil {
-		return x.Kind
-	}
-	return ""
-}
-
-func (x *ParametersReference) GetName() string {
-	if x != nil {
-		return x.Name
-	}
-	return ""
-}
-
-func (x *ParametersReference) GetNamespace() string {
-	if x != nil && x.Namespace != nil {
-		return *x.Namespace
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_gateway_class_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_gateway_class_proto_rawDesc = []byte{
-	0x0a, 0x22, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x5f, 0x63, 0x6c, 0x61, 0x73, 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, 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, 0xe9, 0x01, 0x0a, 0x0c, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6c, 0x61,
-	0x73, 0x73, 0x12, 0x27, 0x0a, 0x0f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x63, 0x6f, 0x6e,
-	0x74, 0x72, 0x6f, 0x6c, 0x6c, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x5e, 0x0a, 0x0e, 0x70,
-	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x5f, 0x72, 0x65, 0x66, 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, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2e, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65,
-	0x66, 0x65, 0x72, 0x65, 0x6e, 0x63, 0x65, 0x48, 0x00, 0x52, 0x0d, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x66, 0x88, 0x01, 0x01, 0x12, 0x25, 0x0a, 0x0b, 0x64,
-	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x48, 0x01, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x88,
-	0x01, 0x01, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x01, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x70,
-	0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x5f, 0x72, 0x65, 0x66, 0x42, 0x0e, 0x0a,
-	0x0c, 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x84, 0x01,
-	0x0a, 0x13, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x65, 0x74, 0x65, 0x72, 0x73, 0x52, 0x65, 0x66, 0x65,
-	0x72, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x6b,
-	0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12,
-	0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e,
-	0x61, 0x6d, 0x65, 0x12, 0x21, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65,
-	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70,
-	0x61, 0x63, 0x65, 0x88, 0x01, 0x01, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73,
-	0x70, 0x61, 0x63, 0x65, 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, 0x47, 0x61, 0x74, 0x65,
-	0x77, 0x61, 0x79, 0x43, 0x6c, 0x61, 0x73, 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_gateway_class_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_gateway_class_proto_rawDescData = file_pbmesh_v2beta1_gateway_class_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_gateway_class_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_gateway_class_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_gateway_class_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_gateway_class_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_gateway_class_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_gateway_class_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
-var file_pbmesh_v2beta1_gateway_class_proto_goTypes = []interface{}{
-	(*GatewayClass)(nil),        // 0: hashicorp.consul.mesh.v2beta1.GatewayClass
-	(*ParametersReference)(nil), // 1: hashicorp.consul.mesh.v2beta1.ParametersReference
-}
-var file_pbmesh_v2beta1_gateway_class_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.mesh.v2beta1.GatewayClass.parameters_ref:type_name -> hashicorp.consul.mesh.v2beta1.ParametersReference
-	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_gateway_class_proto_init() }
-func file_pbmesh_v2beta1_gateway_class_proto_init() {
-	if File_pbmesh_v2beta1_gateway_class_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_gateway_class_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GatewayClass); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_gateway_class_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ParametersReference); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_gateway_class_proto_msgTypes[0].OneofWrappers = []interface{}{}
-	file_pbmesh_v2beta1_gateway_class_proto_msgTypes[1].OneofWrappers = []interface{}{}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_gateway_class_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   2,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_gateway_class_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_gateway_class_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_gateway_class_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_gateway_class_proto = out.File
-	file_pbmesh_v2beta1_gateway_class_proto_rawDesc = nil
-	file_pbmesh_v2beta1_gateway_class_proto_goTypes = nil
-	file_pbmesh_v2beta1_gateway_class_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/gateway_class.proto b/proto-public/pbmesh/v2beta1/gateway_class.proto
deleted file mode 100644
index 8bba03c416dd7..0000000000000
--- a/proto-public/pbmesh/v2beta1/gateway_class.proto
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-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/reference/spec/#gateway.networking.k8s.io/v1.GatewayClass
-//
-// This is a Resource type.
-message GatewayClass {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_CLUSTER};
-
-  // ControllerName is the name of the Kubernetes controller that manages Gateways of this class
-  string controller_name = 1;
-
-  // ParametersRef refers to a resource responsible for configuring
-  // the behavior of the GatewayClass.
-  optional ParametersReference parameters_ref = 2;
-
-  // Description of GatewayClass
-  optional string description = 3;
-}
-
-// NOTE: this should align to the GAMMA/gateway-api version, or at least be
-// easily translatable.
-//
-// ParametersReference specifies a resource that contains Kubernetes controller-specific configuration
-// for a resource
-// https://gateway-api.sigs.k8s.io/reference/spec/#gateway.networking.k8s.io/v1.ParametersReference
-//
-message ParametersReference {
-  // The Kubernetes Group that the referred object belongs to
-  string group = 1;
-
-  // The Kubernetes Kind that the referred object is
-  string kind = 2;
-
-  // The name of the referred object
-  string name = 3;
-
-  // The kubernetes namespace that the referred object is in
-  optional string namespace = 4;
-}
diff --git a/proto-public/pbmesh/v2beta1/gateway_class_deepcopy.gen.go b/proto-public/pbmesh/v2beta1/gateway_class_deepcopy.gen.go
deleted file mode 100644
index c09a4cbe20055..0000000000000
--- a/proto-public/pbmesh/v2beta1/gateway_class_deepcopy.gen.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using GatewayClass within kubernetes types, where deepcopy-gen is used.
-func (in *GatewayClass) DeepCopyInto(out *GatewayClass) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GatewayClass. Required by controller-gen.
-func (in *GatewayClass) DeepCopy() *GatewayClass {
-	if in == nil {
-		return nil
-	}
-	out := new(GatewayClass)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new GatewayClass. Required by controller-gen.
-func (in *GatewayClass) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using ParametersReference within kubernetes types, where deepcopy-gen is used.
-func (in *ParametersReference) DeepCopyInto(out *ParametersReference) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ParametersReference. Required by controller-gen.
-func (in *ParametersReference) DeepCopy() *ParametersReference {
-	if in == nil {
-		return nil
-	}
-	out := new(ParametersReference)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ParametersReference. Required by controller-gen.
-func (in *ParametersReference) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmesh/v2beta1/gateway_class_json.gen.go b/proto-public/pbmesh/v2beta1/gateway_class_json.gen.go
deleted file mode 100644
index 0b3bdea9d01a5..0000000000000
--- a/proto-public/pbmesh/v2beta1/gateway_class_json.gen.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for GatewayClass
-func (this *GatewayClass) MarshalJSON() ([]byte, error) {
-	str, err := GatewayClassMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for GatewayClass
-func (this *GatewayClass) UnmarshalJSON(b []byte) error {
-	return GatewayClassUnmarshaler.Unmarshal(b, this)
-}
-
-// MarshalJSON is a custom marshaler for ParametersReference
-func (this *ParametersReference) MarshalJSON() ([]byte, error) {
-	str, err := GatewayClassMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for ParametersReference
-func (this *ParametersReference) UnmarshalJSON(b []byte) error {
-	return GatewayClassUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	GatewayClassMarshaler   = &protojson.MarshalOptions{}
-	GatewayClassUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmesh/v2beta1/gatewayclassconfig.pb.binary.go b/proto-public/pbmesh/v2beta1/gatewayclassconfig.pb.binary.go
deleted file mode 100644
index 8ea39522b0640..0000000000000
--- a/proto-public/pbmesh/v2beta1/gatewayclassconfig.pb.binary.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/gatewayclassconfig.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *GatewayClassConfig) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *GatewayClassConfig) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *CopyAnnotations) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *CopyAnnotations) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *Deployment) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *Deployment) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/gatewayclassconfig.pb.go b/proto-public/pbmesh/v2beta1/gatewayclassconfig.pb.go
deleted file mode 100644
index 7ab34e03e4450..0000000000000
--- a/proto-public/pbmesh/v2beta1/gatewayclassconfig.pb.go
+++ /dev/null
@@ -1,465 +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.31.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/gatewayclassconfig.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"
-	v1 "k8s.io/api/core/v1"
-	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)
-)
-
-// This is a Resource type.
-type GatewayClassConfig struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// +kubebuilder:validation:Enum=ClusterIP;NodePort;LoadBalancer
-	ServiceType *string `protobuf:"bytes,1,opt,name=service_type,json=serviceType,proto3,oneof" json:"service_type,omitempty"`
-	// NodeSelector is a selector which must be true for the pod to fit on a node.
-	// Selector which must match a node's labels for the pod to be scheduled on that node.
-	// More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-	NodeSelector map[string]string `protobuf:"bytes,2,rep,name=node_selector,json=nodeSelector,proto3" json:"node_selector,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Tolerations allow the scheduler to schedule nodes with matching taints.
-	// More Info: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-	Tolerations       []*v1.Toleration `protobuf:"bytes,3,rep,name=tolerations,proto3" json:"tolerations,omitempty"`
-	Deployment        *Deployment      `protobuf:"bytes,4,opt,name=deployment,proto3,oneof" json:"deployment,omitempty"`
-	CopyAnnotations   *CopyAnnotations `protobuf:"bytes,5,opt,name=copy_annotations,json=copyAnnotations,proto3,oneof" json:"copy_annotations,omitempty"`
-	PodSecurityPolicy *string          `protobuf:"bytes,6,opt,name=pod_security_policy,json=podSecurityPolicy,proto3,oneof" json:"pod_security_policy,omitempty"`
-	OpenshiftSccName  *string          `protobuf:"bytes,7,opt,name=openshift_scc_name,json=openshiftSccName,proto3,oneof" json:"openshift_scc_name,omitempty"`
-	UseHostPorts      *bool            `protobuf:"varint,8,opt,name=use_host_ports,json=useHostPorts,proto3,oneof" json:"use_host_ports,omitempty"`
-}
-
-func (x *GatewayClassConfig) Reset() {
-	*x = GatewayClassConfig{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *GatewayClassConfig) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*GatewayClassConfig) ProtoMessage() {}
-
-func (x *GatewayClassConfig) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_gatewayclassconfig_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 GatewayClassConfig.ProtoReflect.Descriptor instead.
-func (*GatewayClassConfig) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *GatewayClassConfig) GetServiceType() string {
-	if x != nil && x.ServiceType != nil {
-		return *x.ServiceType
-	}
-	return ""
-}
-
-func (x *GatewayClassConfig) GetNodeSelector() map[string]string {
-	if x != nil {
-		return x.NodeSelector
-	}
-	return nil
-}
-
-func (x *GatewayClassConfig) GetTolerations() []*v1.Toleration {
-	if x != nil {
-		return x.Tolerations
-	}
-	return nil
-}
-
-func (x *GatewayClassConfig) GetDeployment() *Deployment {
-	if x != nil {
-		return x.Deployment
-	}
-	return nil
-}
-
-func (x *GatewayClassConfig) GetCopyAnnotations() *CopyAnnotations {
-	if x != nil {
-		return x.CopyAnnotations
-	}
-	return nil
-}
-
-func (x *GatewayClassConfig) GetPodSecurityPolicy() string {
-	if x != nil && x.PodSecurityPolicy != nil {
-		return *x.PodSecurityPolicy
-	}
-	return ""
-}
-
-func (x *GatewayClassConfig) GetOpenshiftSccName() string {
-	if x != nil && x.OpenshiftSccName != nil {
-		return *x.OpenshiftSccName
-	}
-	return ""
-}
-
-func (x *GatewayClassConfig) GetUseHostPorts() bool {
-	if x != nil && x.UseHostPorts != nil {
-		return *x.UseHostPorts
-	}
-	return false
-}
-
-type CopyAnnotations struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Service []string `protobuf:"bytes,1,rep,name=service,proto3" json:"service,omitempty"`
-}
-
-func (x *CopyAnnotations) Reset() {
-	*x = CopyAnnotations{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *CopyAnnotations) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*CopyAnnotations) ProtoMessage() {}
-
-func (x *CopyAnnotations) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_gatewayclassconfig_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 CopyAnnotations.ProtoReflect.Descriptor instead.
-func (*CopyAnnotations) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *CopyAnnotations) GetService() []string {
-	if x != nil {
-		return x.Service
-	}
-	return nil
-}
-
-type Deployment struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// +kubebuilder:default:=1
-	// +kubebuilder:validation:Maximum=8
-	// +kubebuilder:validation:Minimum=1
-	// Number of gateway instances that should be deployed by default
-	DefaultInstances *uint32 `protobuf:"varint,1,opt,name=default_instances,json=defaultInstances,proto3,oneof" json:"default_instances,omitempty"`
-	// +kubebuilder:default:=1
-	// +kubebuilder:validation:Maximum=8
-	// +kubebuilder:validation:Minimum=1
-	// Minimum allowed number of gateway instances
-	MinInstances *uint32 `protobuf:"varint,2,opt,name=min_instances,json=minInstances,proto3,oneof" json:"min_instances,omitempty"`
-	// +kubebuilder:default:=8
-	// +kubebuilder:validation:Maximum=8
-	// +kubebuilder:validation:Minimum=1
-	// Max allowed number of gateway instances
-	MaxInstances *uint32 `protobuf:"varint,3,opt,name=max_instances,json=maxInstances,proto3,oneof" json:"max_instances,omitempty"`
-	// Resources defines the resource requirements for the gateway.
-	Resources *v1.ResourceRequirements `protobuf:"bytes,4,opt,name=resources,proto3" json:"resources,omitempty"`
-}
-
-func (x *Deployment) Reset() {
-	*x = Deployment{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Deployment) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Deployment) ProtoMessage() {}
-
-func (x *Deployment) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_gatewayclassconfig_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 Deployment.ProtoReflect.Descriptor instead.
-func (*Deployment) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescGZIP(), []int{2}
-}
-
-func (x *Deployment) GetDefaultInstances() uint32 {
-	if x != nil && x.DefaultInstances != nil {
-		return *x.DefaultInstances
-	}
-	return 0
-}
-
-func (x *Deployment) GetMinInstances() uint32 {
-	if x != nil && x.MinInstances != nil {
-		return *x.MinInstances
-	}
-	return 0
-}
-
-func (x *Deployment) GetMaxInstances() uint32 {
-	if x != nil && x.MaxInstances != nil {
-		return *x.MaxInstances
-	}
-	return 0
-}
-
-func (x *Deployment) GetResources() *v1.ResourceRequirements {
-	if x != nil {
-		return x.Resources
-	}
-	return nil
-}
-
-var File_pbmesh_v2beta1_gatewayclassconfig_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x63, 0x6c, 0x61, 0x73, 0x73, 0x63, 0x6f, 0x6e,
-	0x66, 0x69, 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, 0x1a, 0x22, 0x6b, 0x38, 0x73, 0x2e, 0x69, 0x6f,
-	0x2f, 0x61, 0x70, 0x69, 0x2f, 0x63, 0x6f, 0x72, 0x65, 0x2f, 0x76, 0x31, 0x2f, 0x67, 0x65, 0x6e,
-	0x65, 0x72, 0x61, 0x74, 0x65, 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, 0x22, 0xeb, 0x05, 0x0a, 0x12, 0x47,
-	0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x43, 0x6f, 0x6e, 0x66, 0x69,
-	0x67, 0x12, 0x26, 0x0a, 0x0c, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x54, 0x79, 0x70, 0x65, 0x88, 0x01, 0x01, 0x12, 0x68, 0x0a, 0x0d, 0x6e, 0x6f, 0x64,
-	0x65, 0x5f, 0x73, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 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, 0x6d, 0x65, 0x73, 0x68, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2e, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x43, 0x6f, 0x6e,
-	0x66, 0x69, 0x67, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72,
-	0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0c, 0x6e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x6c, 0x65, 0x63,
-	0x74, 0x6f, 0x72, 0x12, 0x40, 0x0a, 0x0b, 0x74, 0x6f, 0x6c, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x6b, 0x38, 0x73, 0x2e, 0x69,
-	0x6f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x76, 0x31, 0x2e, 0x54, 0x6f,
-	0x6c, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x74, 0x6f, 0x6c, 0x65, 0x72, 0x61,
-	0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x4e, 0x0a, 0x0a, 0x64, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d,
-	0x65, 0x6e, 0x74, 0x18, 0x04, 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, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79,
-	0x6d, 0x65, 0x6e, 0x74, 0x48, 0x01, 0x52, 0x0a, 0x64, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65,
-	0x6e, 0x74, 0x88, 0x01, 0x01, 0x12, 0x5e, 0x0a, 0x10, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x61, 0x6e,
-	0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 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,
-	0x43, 0x6f, 0x70, 0x79, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x48,
-	0x02, 0x52, 0x0f, 0x63, 0x6f, 0x70, 0x79, 0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f,
-	0x6e, 0x73, 0x88, 0x01, 0x01, 0x12, 0x33, 0x0a, 0x13, 0x70, 0x6f, 0x64, 0x5f, 0x73, 0x65, 0x63,
-	0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01,
-	0x28, 0x09, 0x48, 0x03, 0x52, 0x11, 0x70, 0x6f, 0x64, 0x53, 0x65, 0x63, 0x75, 0x72, 0x69, 0x74,
-	0x79, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x88, 0x01, 0x01, 0x12, 0x31, 0x0a, 0x12, 0x6f, 0x70,
-	0x65, 0x6e, 0x73, 0x68, 0x69, 0x66, 0x74, 0x5f, 0x73, 0x63, 0x63, 0x5f, 0x6e, 0x61, 0x6d, 0x65,
-	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x48, 0x04, 0x52, 0x10, 0x6f, 0x70, 0x65, 0x6e, 0x73, 0x68,
-	0x69, 0x66, 0x74, 0x53, 0x63, 0x63, 0x4e, 0x61, 0x6d, 0x65, 0x88, 0x01, 0x01, 0x12, 0x29, 0x0a,
-	0x0e, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f, 0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x18,
-	0x08, 0x20, 0x01, 0x28, 0x08, 0x48, 0x05, 0x52, 0x0c, 0x75, 0x73, 0x65, 0x48, 0x6f, 0x73, 0x74,
-	0x50, 0x6f, 0x72, 0x74, 0x73, 0x88, 0x01, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4e, 0x6f, 0x64, 0x65,
-	0x53, 0x65, 0x6c, 0x65, 0x63, 0x74, 0x6f, 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, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08,
-	0x01, 0x42, 0x0f, 0x0a, 0x0d, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x74, 0x79,
-	0x70, 0x65, 0x42, 0x0d, 0x0a, 0x0b, 0x5f, 0x64, 0x65, 0x70, 0x6c, 0x6f, 0x79, 0x6d, 0x65, 0x6e,
-	0x74, 0x42, 0x13, 0x0a, 0x11, 0x5f, 0x63, 0x6f, 0x70, 0x79, 0x5f, 0x61, 0x6e, 0x6e, 0x6f, 0x74,
-	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x42, 0x16, 0x0a, 0x14, 0x5f, 0x70, 0x6f, 0x64, 0x5f, 0x73,
-	0x65, 0x63, 0x75, 0x72, 0x69, 0x74, 0x79, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x15,
-	0x0a, 0x13, 0x5f, 0x6f, 0x70, 0x65, 0x6e, 0x73, 0x68, 0x69, 0x66, 0x74, 0x5f, 0x73, 0x63, 0x63,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x42, 0x11, 0x0a, 0x0f, 0x5f, 0x75, 0x73, 0x65, 0x5f, 0x68, 0x6f,
-	0x73, 0x74, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x73, 0x22, 0x2b, 0x0a, 0x0f, 0x43, 0x6f, 0x70, 0x79,
-	0x41, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x73,
-	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x07, 0x73, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x94, 0x02, 0x0a, 0x0a, 0x44, 0x65, 0x70, 0x6c, 0x6f, 0x79,
-	0x6d, 0x65, 0x6e, 0x74, 0x12, 0x30, 0x0a, 0x11, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f,
-	0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x48,
-	0x00, 0x52, 0x10, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e,
-	0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x28, 0x0a, 0x0d, 0x6d, 0x69, 0x6e, 0x5f, 0x69, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x01, 0x52,
-	0x0c, 0x6d, 0x69, 0x6e, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01,
-	0x12, 0x28, 0x0a, 0x0d, 0x6d, 0x61, 0x78, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65,
-	0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x48, 0x02, 0x52, 0x0c, 0x6d, 0x61, 0x78, 0x49, 0x6e,
-	0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x88, 0x01, 0x01, 0x12, 0x46, 0x0a, 0x09, 0x72, 0x65,
-	0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x28, 0x2e,
-	0x6b, 0x38, 0x73, 0x2e, 0x69, 0x6f, 0x2e, 0x61, 0x70, 0x69, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e,
-	0x76, 0x31, 0x2e, 0x52, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x52, 0x65, 0x71, 0x75, 0x69,
-	0x72, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x73, 0x52, 0x09, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63,
-	0x65, 0x73, 0x42, 0x14, 0x0a, 0x12, 0x5f, 0x64, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x69,
-	0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x6d, 0x69, 0x6e,
-	0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 0x42, 0x10, 0x0a, 0x0e, 0x5f, 0x6d,
-	0x61, 0x78, 0x5f, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x73, 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, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x63, 0x6c, 0x61, 0x73, 0x73,
-	0x63, 0x6f, 0x6e, 0x66, 0x69, 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_gatewayclassconfig_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescData = file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
-var file_pbmesh_v2beta1_gatewayclassconfig_proto_goTypes = []interface{}{
-	(*GatewayClassConfig)(nil),      // 0: hashicorp.consul.mesh.v2beta1.GatewayClassConfig
-	(*CopyAnnotations)(nil),         // 1: hashicorp.consul.mesh.v2beta1.CopyAnnotations
-	(*Deployment)(nil),              // 2: hashicorp.consul.mesh.v2beta1.Deployment
-	nil,                             // 3: hashicorp.consul.mesh.v2beta1.GatewayClassConfig.NodeSelectorEntry
-	(*v1.Toleration)(nil),           // 4: k8s.io.api.core.v1.Toleration
-	(*v1.ResourceRequirements)(nil), // 5: k8s.io.api.core.v1.ResourceRequirements
-}
-var file_pbmesh_v2beta1_gatewayclassconfig_proto_depIdxs = []int32{
-	3, // 0: hashicorp.consul.mesh.v2beta1.GatewayClassConfig.node_selector:type_name -> hashicorp.consul.mesh.v2beta1.GatewayClassConfig.NodeSelectorEntry
-	4, // 1: hashicorp.consul.mesh.v2beta1.GatewayClassConfig.tolerations:type_name -> k8s.io.api.core.v1.Toleration
-	2, // 2: hashicorp.consul.mesh.v2beta1.GatewayClassConfig.deployment:type_name -> hashicorp.consul.mesh.v2beta1.Deployment
-	1, // 3: hashicorp.consul.mesh.v2beta1.GatewayClassConfig.copy_annotations:type_name -> hashicorp.consul.mesh.v2beta1.CopyAnnotations
-	5, // 4: hashicorp.consul.mesh.v2beta1.Deployment.resources:type_name -> k8s.io.api.core.v1.ResourceRequirements
-	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_gatewayclassconfig_proto_init() }
-func file_pbmesh_v2beta1_gatewayclassconfig_proto_init() {
-	if File_pbmesh_v2beta1_gatewayclassconfig_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*GatewayClassConfig); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*CopyAnnotations); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Deployment); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[0].OneofWrappers = []interface{}{}
-	file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes[2].OneofWrappers = []interface{}{}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   4,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_gatewayclassconfig_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_gatewayclassconfig_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_gatewayclassconfig_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_gatewayclassconfig_proto = out.File
-	file_pbmesh_v2beta1_gatewayclassconfig_proto_rawDesc = nil
-	file_pbmesh_v2beta1_gatewayclassconfig_proto_goTypes = nil
-	file_pbmesh_v2beta1_gatewayclassconfig_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/gatewayclassconfig.proto b/proto-public/pbmesh/v2beta1/gatewayclassconfig.proto
deleted file mode 100644
index 12fd961211545..0000000000000
--- a/proto-public/pbmesh/v2beta1/gatewayclassconfig.proto
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "k8s.io/api/core/v1/generated.proto";
-import "pbresource/annotations.proto";
-
-// This is a Resource type.
-message GatewayClassConfig {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_CLUSTER};
-
-  // +kubebuilder:validation:Enum=ClusterIP;NodePort;LoadBalancer
-  optional string service_type = 1;
-
-  // NodeSelector is a selector which must be true for the pod to fit on a node.
-  // Selector which must match a node's labels for the pod to be scheduled on that node.
-  // More info: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/
-  map<string, string> node_selector = 2;
-
-  // Tolerations allow the scheduler to schedule nodes with matching taints.
-  // More Info: https://kubernetes.io/docs/concepts/scheduling-eviction/taint-and-toleration/
-  repeated k8s.io.api.core.v1.Toleration tolerations = 3;
-  optional Deployment deployment = 4;
-  optional CopyAnnotations copy_annotations = 5;
-  optional string pod_security_policy = 6;
-  optional string openshift_scc_name = 7;
-  optional bool use_host_ports = 8;
-}
-
-message CopyAnnotations {
-  repeated string service = 1;
-}
-
-message Deployment {
-  // +kubebuilder:default:=1
-  // +kubebuilder:validation:Maximum=8
-  // +kubebuilder:validation:Minimum=1
-  // Number of gateway instances that should be deployed by default
-  optional uint32 default_instances = 1;
-  // +kubebuilder:default:=1
-  // +kubebuilder:validation:Maximum=8
-  // +kubebuilder:validation:Minimum=1
-  // Minimum allowed number of gateway instances
-  optional uint32 min_instances = 2;
-  // +kubebuilder:default:=8
-  // +kubebuilder:validation:Maximum=8
-  // +kubebuilder:validation:Minimum=1
-  // Max allowed number of gateway instances
-  optional uint32 max_instances = 3;
-  // Resources defines the resource requirements for the gateway.
-  k8s.io.api.core.v1.ResourceRequirements resources = 4;
-}
diff --git a/proto-public/pbmesh/v2beta1/gatewayclassconfig_deepcopy.gen.go b/proto-public/pbmesh/v2beta1/gatewayclassconfig_deepcopy.gen.go
deleted file mode 100644
index f0418db9f1786..0000000000000
--- a/proto-public/pbmesh/v2beta1/gatewayclassconfig_deepcopy.gen.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using GatewayClassConfig within kubernetes types, where deepcopy-gen is used.
-func (in *GatewayClassConfig) DeepCopyInto(out *GatewayClassConfig) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GatewayClassConfig. Required by controller-gen.
-func (in *GatewayClassConfig) DeepCopy() *GatewayClassConfig {
-	if in == nil {
-		return nil
-	}
-	out := new(GatewayClassConfig)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new GatewayClassConfig. Required by controller-gen.
-func (in *GatewayClassConfig) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using CopyAnnotations within kubernetes types, where deepcopy-gen is used.
-func (in *CopyAnnotations) DeepCopyInto(out *CopyAnnotations) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CopyAnnotations. Required by controller-gen.
-func (in *CopyAnnotations) DeepCopy() *CopyAnnotations {
-	if in == nil {
-		return nil
-	}
-	out := new(CopyAnnotations)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new CopyAnnotations. Required by controller-gen.
-func (in *CopyAnnotations) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using Deployment within kubernetes types, where deepcopy-gen is used.
-func (in *Deployment) DeepCopyInto(out *Deployment) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new Deployment. Required by controller-gen.
-func (in *Deployment) DeepCopy() *Deployment {
-	if in == nil {
-		return nil
-	}
-	out := new(Deployment)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new Deployment. Required by controller-gen.
-func (in *Deployment) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmesh/v2beta1/gatewayclassconfig_json.gen.go b/proto-public/pbmesh/v2beta1/gatewayclassconfig_json.gen.go
deleted file mode 100644
index 16f3d29aa06ba..0000000000000
--- a/proto-public/pbmesh/v2beta1/gatewayclassconfig_json.gen.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for GatewayClassConfig
-func (this *GatewayClassConfig) MarshalJSON() ([]byte, error) {
-	str, err := GatewayclassconfigMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for GatewayClassConfig
-func (this *GatewayClassConfig) UnmarshalJSON(b []byte) error {
-	return GatewayclassconfigUnmarshaler.Unmarshal(b, this)
-}
-
-// MarshalJSON is a custom marshaler for CopyAnnotations
-func (this *CopyAnnotations) MarshalJSON() ([]byte, error) {
-	str, err := GatewayclassconfigMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for CopyAnnotations
-func (this *CopyAnnotations) UnmarshalJSON(b []byte) error {
-	return GatewayclassconfigUnmarshaler.Unmarshal(b, this)
-}
-
-// MarshalJSON is a custom marshaler for Deployment
-func (this *Deployment) MarshalJSON() ([]byte, error) {
-	str, err := GatewayclassconfigMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for Deployment
-func (this *Deployment) UnmarshalJSON(b []byte) error {
-	return GatewayclassconfigUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	GatewayclassconfigMarshaler   = &protojson.MarshalOptions{}
-	GatewayclassconfigUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmesh/v2beta1/mesh_configuration.pb.binary.go b/proto-public/pbmesh/v2beta1/mesh_configuration.pb.binary.go
deleted file mode 100644
index d8bffc0ae8119..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_configuration.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/mesh_configuration.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshConfiguration) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshConfiguration) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_configuration.pb.go b/proto-public/pbmesh/v2beta1/mesh_configuration.pb.go
deleted file mode 100644
index 40c2bca5c4eb6..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_configuration.pb.go
+++ /dev/null
@@ -1,160 +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.31.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/mesh_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)
-)
-
-// MeshConfiguration is responsible for configuring the default behavior of Mesh Gateways.
-// This is a Resource type.
-type MeshConfiguration struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *MeshConfiguration) Reset() {
-	*x = MeshConfiguration{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_mesh_configuration_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshConfiguration) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshConfiguration) ProtoMessage() {}
-
-func (x *MeshConfiguration) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_mesh_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 MeshConfiguration.ProtoReflect.Descriptor instead.
-func (*MeshConfiguration) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_mesh_configuration_proto_rawDescGZIP(), []int{0}
-}
-
-var File_pbmesh_v2beta1_mesh_configuration_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_mesh_configuration_proto_rawDesc = []byte{
-	0x0a, 0x27, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x6d, 0x65, 0x73, 0x68, 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, 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, 0x1b, 0x0a, 0x11, 0x4d, 0x65, 0x73, 0x68, 0x43, 0x6f,
-	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x06, 0xa2, 0x93, 0x04,
-	0x02, 0x08, 0x01, 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, 0x4d, 0x65, 0x73, 0x68, 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_mesh_configuration_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_mesh_configuration_proto_rawDescData = file_pbmesh_v2beta1_mesh_configuration_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_mesh_configuration_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_mesh_configuration_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_mesh_configuration_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_mesh_configuration_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_mesh_configuration_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_mesh_configuration_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmesh_v2beta1_mesh_configuration_proto_goTypes = []interface{}{
-	(*MeshConfiguration)(nil), // 0: hashicorp.consul.mesh.v2beta1.MeshConfiguration
-}
-var file_pbmesh_v2beta1_mesh_configuration_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_mesh_configuration_proto_init() }
-func file_pbmesh_v2beta1_mesh_configuration_proto_init() {
-	if File_pbmesh_v2beta1_mesh_configuration_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_mesh_configuration_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshConfiguration); 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_mesh_configuration_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_mesh_configuration_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_mesh_configuration_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_mesh_configuration_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_mesh_configuration_proto = out.File
-	file_pbmesh_v2beta1_mesh_configuration_proto_rawDesc = nil
-	file_pbmesh_v2beta1_mesh_configuration_proto_goTypes = nil
-	file_pbmesh_v2beta1_mesh_configuration_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_configuration.proto b/proto-public/pbmesh/v2beta1/mesh_configuration.proto
deleted file mode 100644
index c18548b487e9f..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_configuration.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbresource/annotations.proto";
-
-// MeshConfiguration is responsible for configuring the default behavior of Mesh Gateways.
-// This is a Resource type.
-message MeshConfiguration {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_CLUSTER};
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_configuration_deepcopy.gen.go b/proto-public/pbmesh/v2beta1/mesh_configuration_deepcopy.gen.go
deleted file mode 100644
index 5621246ecef84..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_configuration_deepcopy.gen.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using MeshConfiguration within kubernetes types, where deepcopy-gen is used.
-func (in *MeshConfiguration) DeepCopyInto(out *MeshConfiguration) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MeshConfiguration. Required by controller-gen.
-func (in *MeshConfiguration) DeepCopy() *MeshConfiguration {
-	if in == nil {
-		return nil
-	}
-	out := new(MeshConfiguration)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new MeshConfiguration. Required by controller-gen.
-func (in *MeshConfiguration) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_configuration_json.gen.go b/proto-public/pbmesh/v2beta1/mesh_configuration_json.gen.go
deleted file mode 100644
index c772e1326b38e..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_configuration_json.gen.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for MeshConfiguration
-func (this *MeshConfiguration) MarshalJSON() ([]byte, error) {
-	str, err := MeshConfigurationMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for MeshConfiguration
-func (this *MeshConfiguration) UnmarshalJSON(b []byte) error {
-	return MeshConfigurationUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	MeshConfigurationMarshaler   = &protojson.MarshalOptions{}
-	MeshConfigurationUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmesh/v2beta1/mesh_gateway.pb.binary.go b/proto-public/pbmesh/v2beta1/mesh_gateway.pb.binary.go
deleted file mode 100644
index 7cd36afdb3c06..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_gateway.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmesh/v2beta1/mesh_gateway.proto
-
-package meshv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *MeshGateway) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *MeshGateway) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_gateway.pb.go b/proto-public/pbmesh/v2beta1/mesh_gateway.pb.go
deleted file mode 100644
index e61af2d2deaab..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_gateway.pb.go
+++ /dev/null
@@ -1,170 +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.31.0
-// 	protoc        (unknown)
-// source: pbmesh/v2beta1/mesh_gateway.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 MeshGateway struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// GatewayClassName is the name of the GatewayClass used by the MeshGateway
-	GatewayClassName string `protobuf:"bytes,1,opt,name=gateway_class_name,json=gatewayClassName,proto3" json:"gateway_class_name,omitempty"`
-}
-
-func (x *MeshGateway) Reset() {
-	*x = MeshGateway{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmesh_v2beta1_mesh_gateway_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *MeshGateway) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*MeshGateway) ProtoMessage() {}
-
-func (x *MeshGateway) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmesh_v2beta1_mesh_gateway_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 MeshGateway.ProtoReflect.Descriptor instead.
-func (*MeshGateway) Descriptor() ([]byte, []int) {
-	return file_pbmesh_v2beta1_mesh_gateway_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *MeshGateway) GetGatewayClassName() string {
-	if x != nil {
-		return x.GatewayClassName
-	}
-	return ""
-}
-
-var File_pbmesh_v2beta1_mesh_gateway_proto protoreflect.FileDescriptor
-
-var file_pbmesh_v2beta1_mesh_gateway_proto_rawDesc = []byte{
-	0x0a, 0x21, 0x70, 0x62, 0x6d, 0x65, 0x73, 0x68, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x2f, 0x6d, 0x65, 0x73, 0x68, 0x5f, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 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, 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, 0x43, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12,
-	0x2c, 0x0a, 0x12, 0x67, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x5f, 0x63, 0x6c, 0x61, 0x73, 0x73,
-	0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x67, 0x61, 0x74,
-	0x65, 0x77, 0x61, 0x79, 0x43, 0x6c, 0x61, 0x73, 0x73, 0x4e, 0x61, 0x6d, 0x65, 0x3a, 0x06, 0xa2,
-	0x93, 0x04, 0x02, 0x08, 0x02, 0x42, 0x91, 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, 0x10, 0x4d, 0x65, 0x73,
-	0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 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_mesh_gateway_proto_rawDescOnce sync.Once
-	file_pbmesh_v2beta1_mesh_gateway_proto_rawDescData = file_pbmesh_v2beta1_mesh_gateway_proto_rawDesc
-)
-
-func file_pbmesh_v2beta1_mesh_gateway_proto_rawDescGZIP() []byte {
-	file_pbmesh_v2beta1_mesh_gateway_proto_rawDescOnce.Do(func() {
-		file_pbmesh_v2beta1_mesh_gateway_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmesh_v2beta1_mesh_gateway_proto_rawDescData)
-	})
-	return file_pbmesh_v2beta1_mesh_gateway_proto_rawDescData
-}
-
-var file_pbmesh_v2beta1_mesh_gateway_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmesh_v2beta1_mesh_gateway_proto_goTypes = []interface{}{
-	(*MeshGateway)(nil), // 0: hashicorp.consul.mesh.v2beta1.MeshGateway
-}
-var file_pbmesh_v2beta1_mesh_gateway_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_mesh_gateway_proto_init() }
-func file_pbmesh_v2beta1_mesh_gateway_proto_init() {
-	if File_pbmesh_v2beta1_mesh_gateway_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmesh_v2beta1_mesh_gateway_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*MeshGateway); 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_mesh_gateway_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmesh_v2beta1_mesh_gateway_proto_goTypes,
-		DependencyIndexes: file_pbmesh_v2beta1_mesh_gateway_proto_depIdxs,
-		MessageInfos:      file_pbmesh_v2beta1_mesh_gateway_proto_msgTypes,
-	}.Build()
-	File_pbmesh_v2beta1_mesh_gateway_proto = out.File
-	file_pbmesh_v2beta1_mesh_gateway_proto_rawDesc = nil
-	file_pbmesh_v2beta1_mesh_gateway_proto_goTypes = nil
-	file_pbmesh_v2beta1_mesh_gateway_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_gateway.proto b/proto-public/pbmesh/v2beta1/mesh_gateway.proto
deleted file mode 100644
index 09ed191354f73..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_gateway.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-syntax = "proto3";
-
-package hashicorp.consul.mesh.v2beta1;
-
-import "pbresource/annotations.proto";
-
-message MeshGateway {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_PARTITION};
-
-  // GatewayClassName is the name of the GatewayClass used by the MeshGateway
-  string gateway_class_name = 1;
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_gateway_deepcopy.gen.go b/proto-public/pbmesh/v2beta1/mesh_gateway_deepcopy.gen.go
deleted file mode 100644
index b14ad33a815a3..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_gateway_deepcopy.gen.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using MeshGateway within kubernetes types, where deepcopy-gen is used.
-func (in *MeshGateway) DeepCopyInto(out *MeshGateway) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MeshGateway. Required by controller-gen.
-func (in *MeshGateway) DeepCopy() *MeshGateway {
-	if in == nil {
-		return nil
-	}
-	out := new(MeshGateway)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new MeshGateway. Required by controller-gen.
-func (in *MeshGateway) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmesh/v2beta1/mesh_gateway_json.gen.go b/proto-public/pbmesh/v2beta1/mesh_gateway_json.gen.go
deleted file mode 100644
index 548da69f08cdb..0000000000000
--- a/proto-public/pbmesh/v2beta1/mesh_gateway_json.gen.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package meshv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for MeshGateway
-func (this *MeshGateway) MarshalJSON() ([]byte, error) {
-	str, err := MeshGatewayMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for MeshGateway
-func (this *MeshGateway) UnmarshalJSON(b []byte) error {
-	return MeshGatewayUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	MeshGatewayMarshaler   = &protojson.MarshalOptions{}
-	MeshGatewayUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmesh/v2beta1/resource_types.gen.go b/proto-public/pbmesh/v2beta1/resource_types.gen.go
index 925cc85be8e3d..68406c5d1e88d 100644
--- a/proto-public/pbmesh/v2beta1/resource_types.gen.go
+++ b/proto-public/pbmesh/v2beta1/resource_types.gen.go
@@ -17,11 +17,7 @@ const (
 	DestinationsKind                 = "Destinations"
 	DestinationsConfigurationKind    = "DestinationsConfiguration"
 	GRPCRouteKind                    = "GRPCRoute"
-	GatewayClassKind                 = "GatewayClass"
-	GatewayClassConfigKind           = "GatewayClassConfig"
 	HTTPRouteKind                    = "HTTPRoute"
-	MeshConfigurationKind            = "MeshConfiguration"
-	MeshGatewayKind                  = "MeshGateway"
 	ProxyConfigurationKind           = "ProxyConfiguration"
 	ProxyStateTemplateKind           = "ProxyStateTemplate"
 	TCPRouteKind                     = "TCPRoute"
@@ -70,36 +66,12 @@ var (
 		Kind:         GRPCRouteKind,
 	}
 
-	GatewayClassType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         GatewayClassKind,
-	}
-
-	GatewayClassConfigType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         GatewayClassConfigKind,
-	}
-
 	HTTPRouteType = &pbresource.Type{
 		Group:        GroupName,
 		GroupVersion: Version,
 		Kind:         HTTPRouteKind,
 	}
 
-	MeshConfigurationType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         MeshConfigurationKind,
-	}
-
-	MeshGatewayType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         MeshGatewayKind,
-	}
-
 	ProxyConfigurationType = &pbresource.Type{
 		Group:        GroupName,
 		GroupVersion: Version,
diff --git a/proto-public/pbmulticluster/v2beta1/computed_exported_services.pb.binary.go b/proto-public/pbmulticluster/v2beta1/computed_exported_services.pb.binary.go
deleted file mode 100644
index f5b389089f42d..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/computed_exported_services.pb.binary.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmulticluster/v2beta1/computed_exported_services.proto
-
-package multiclusterv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedExportedServices) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedExportedServices) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedExportedService) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedExportedService) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ComputedExportedServicesConsumer) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ComputedExportedServicesConsumer) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmulticluster/v2beta1/computed_exported_services.pb.go b/proto-public/pbmulticluster/v2beta1/computed_exported_services.pb.go
deleted file mode 100644
index 312b608649bf3..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/computed_exported_services.pb.go
+++ /dev/null
@@ -1,373 +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.31.0
-// 	protoc        (unknown)
-// source: pbmulticluster/v2beta1/computed_exported_services.proto
-
-package multiclusterv2beta1
-
-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 ComputedExportedServices struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Consumers []*ComputedExportedService `protobuf:"bytes,1,rep,name=consumers,proto3" json:"consumers,omitempty"`
-}
-
-func (x *ComputedExportedServices) Reset() {
-	*x = ComputedExportedServices{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedExportedServices) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedExportedServices) ProtoMessage() {}
-
-func (x *ComputedExportedServices) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmulticluster_v2beta1_computed_exported_services_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 ComputedExportedServices.ProtoReflect.Descriptor instead.
-func (*ComputedExportedServices) Descriptor() ([]byte, []int) {
-	return file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ComputedExportedServices) GetConsumers() []*ComputedExportedService {
-	if x != nil {
-		return x.Consumers
-	}
-	return nil
-}
-
-type ComputedExportedService struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	TargetRef *pbresource.Reference               `protobuf:"bytes,1,opt,name=target_ref,json=targetRef,proto3" json:"target_ref,omitempty"`
-	Consumers []*ComputedExportedServicesConsumer `protobuf:"bytes,2,rep,name=consumers,proto3" json:"consumers,omitempty"`
-}
-
-func (x *ComputedExportedService) Reset() {
-	*x = ComputedExportedService{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes[1]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedExportedService) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedExportedService) ProtoMessage() {}
-
-func (x *ComputedExportedService) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmulticluster_v2beta1_computed_exported_services_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 ComputedExportedService.ProtoReflect.Descriptor instead.
-func (*ComputedExportedService) Descriptor() ([]byte, []int) {
-	return file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescGZIP(), []int{1}
-}
-
-func (x *ComputedExportedService) GetTargetRef() *pbresource.Reference {
-	if x != nil {
-		return x.TargetRef
-	}
-	return nil
-}
-
-func (x *ComputedExportedService) GetConsumers() []*ComputedExportedServicesConsumer {
-	if x != nil {
-		return x.Consumers
-	}
-	return nil
-}
-
-type ComputedExportedServicesConsumer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// no sameness group
-	//
-	// Types that are assignable to ConsumerTenancy:
-	//
-	//	*ComputedExportedServicesConsumer_Peer
-	//	*ComputedExportedServicesConsumer_Partition
-	ConsumerTenancy isComputedExportedServicesConsumer_ConsumerTenancy `protobuf_oneof:"consumer_tenancy"`
-}
-
-func (x *ComputedExportedServicesConsumer) Reset() {
-	*x = ComputedExportedServicesConsumer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes[2]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ComputedExportedServicesConsumer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ComputedExportedServicesConsumer) ProtoMessage() {}
-
-func (x *ComputedExportedServicesConsumer) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmulticluster_v2beta1_computed_exported_services_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 ComputedExportedServicesConsumer.ProtoReflect.Descriptor instead.
-func (*ComputedExportedServicesConsumer) Descriptor() ([]byte, []int) {
-	return file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescGZIP(), []int{2}
-}
-
-func (m *ComputedExportedServicesConsumer) GetConsumerTenancy() isComputedExportedServicesConsumer_ConsumerTenancy {
-	if m != nil {
-		return m.ConsumerTenancy
-	}
-	return nil
-}
-
-func (x *ComputedExportedServicesConsumer) GetPeer() string {
-	if x, ok := x.GetConsumerTenancy().(*ComputedExportedServicesConsumer_Peer); ok {
-		return x.Peer
-	}
-	return ""
-}
-
-func (x *ComputedExportedServicesConsumer) GetPartition() string {
-	if x, ok := x.GetConsumerTenancy().(*ComputedExportedServicesConsumer_Partition); ok {
-		return x.Partition
-	}
-	return ""
-}
-
-type isComputedExportedServicesConsumer_ConsumerTenancy interface {
-	isComputedExportedServicesConsumer_ConsumerTenancy()
-}
-
-type ComputedExportedServicesConsumer_Peer struct {
-	Peer string `protobuf:"bytes,3,opt,name=peer,proto3,oneof"`
-}
-
-type ComputedExportedServicesConsumer_Partition struct {
-	Partition string `protobuf:"bytes,4,opt,name=partition,proto3,oneof"`
-}
-
-func (*ComputedExportedServicesConsumer_Peer) isComputedExportedServicesConsumer_ConsumerTenancy() {}
-
-func (*ComputedExportedServicesConsumer_Partition) isComputedExportedServicesConsumer_ConsumerTenancy() {
-}
-
-var File_pbmulticluster_v2beta1_computed_exported_services_proto protoreflect.FileDescriptor
-
-var file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDesc = []byte{
-	0x0a, 0x37, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65,
-	0x64, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 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, 0x6d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 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, 0x80, 0x01, 0x0a, 0x18, 0x43, 0x6f,
-	0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x5c, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d,
-	0x65, 0x72, 0x73, 0x18, 0x01, 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, 0x75, 0x6c,
-	0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6d, 0x65, 0x72, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x02, 0x22, 0xc5, 0x01, 0x0a,
-	0x17, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
-	0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x43, 0x0a, 0x0a, 0x74, 0x61, 0x72, 0x67,
-	0x65, 0x74, 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, 0x09, 0x74, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x66, 0x12, 0x65, 0x0a,
-	0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
-	0x32, 0x47, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65,
-	0x64, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6d, 0x65, 0x72, 0x73, 0x22, 0x6c, 0x0a, 0x20, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x12, 0x14, 0x0a, 0x04, 0x70, 0x65, 0x65, 0x72,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x70, 0x65, 0x65, 0x72, 0x12, 0x1e,
-	0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x09, 0x48, 0x00, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x12,
-	0x0a, 0x10, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x5f, 0x74, 0x65, 0x6e, 0x61, 0x6e,
-	0x63, 0x79, 0x42, 0xd6, 0x02, 0x0a, 0x29, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x42, 0x1d, 0x43, 0x6f, 0x6d, 0x70, 0x75, 0x74, 0x65, 0x64, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50,
-	0x01, 0x5a, 0x53, 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, 0x75,
-	0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0x3b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76,
-	0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x25, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
-	0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75,
-	0x73, 0x74, 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x31, 0x48,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c,
-	0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 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, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescOnce sync.Once
-	file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescData = file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDesc
-)
-
-func file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescGZIP() []byte {
-	file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescOnce.Do(func() {
-		file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescData)
-	})
-	return file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDescData
-}
-
-var file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
-var file_pbmulticluster_v2beta1_computed_exported_services_proto_goTypes = []interface{}{
-	(*ComputedExportedServices)(nil),         // 0: hashicorp.consul.multicluster.v2beta1.ComputedExportedServices
-	(*ComputedExportedService)(nil),          // 1: hashicorp.consul.multicluster.v2beta1.ComputedExportedService
-	(*ComputedExportedServicesConsumer)(nil), // 2: hashicorp.consul.multicluster.v2beta1.ComputedExportedServicesConsumer
-	(*pbresource.Reference)(nil),             // 3: hashicorp.consul.resource.Reference
-}
-var file_pbmulticluster_v2beta1_computed_exported_services_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.multicluster.v2beta1.ComputedExportedServices.consumers:type_name -> hashicorp.consul.multicluster.v2beta1.ComputedExportedService
-	3, // 1: hashicorp.consul.multicluster.v2beta1.ComputedExportedService.target_ref:type_name -> hashicorp.consul.resource.Reference
-	2, // 2: hashicorp.consul.multicluster.v2beta1.ComputedExportedService.consumers:type_name -> hashicorp.consul.multicluster.v2beta1.ComputedExportedServicesConsumer
-	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_pbmulticluster_v2beta1_computed_exported_services_proto_init() }
-func file_pbmulticluster_v2beta1_computed_exported_services_proto_init() {
-	if File_pbmulticluster_v2beta1_computed_exported_services_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedExportedServices); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedExportedService); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ComputedExportedServicesConsumer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes[2].OneofWrappers = []interface{}{
-		(*ComputedExportedServicesConsumer_Peer)(nil),
-		(*ComputedExportedServicesConsumer_Partition)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   3,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmulticluster_v2beta1_computed_exported_services_proto_goTypes,
-		DependencyIndexes: file_pbmulticluster_v2beta1_computed_exported_services_proto_depIdxs,
-		MessageInfos:      file_pbmulticluster_v2beta1_computed_exported_services_proto_msgTypes,
-	}.Build()
-	File_pbmulticluster_v2beta1_computed_exported_services_proto = out.File
-	file_pbmulticluster_v2beta1_computed_exported_services_proto_rawDesc = nil
-	file_pbmulticluster_v2beta1_computed_exported_services_proto_goTypes = nil
-	file_pbmulticluster_v2beta1_computed_exported_services_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmulticluster/v2beta1/computed_exported_services.proto b/proto-public/pbmulticluster/v2beta1/computed_exported_services.proto
deleted file mode 100644
index b8a619558451c..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/computed_exported_services.proto
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.multicluster.v2beta1;
-
-import "pbresource/annotations.proto";
-import "pbresource/resource.proto";
-
-message ComputedExportedServices {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_PARTITION};
-
-  repeated ComputedExportedService consumers = 1;
-}
-
-message ComputedExportedService {
-  hashicorp.consul.resource.Reference target_ref = 1;
-  repeated ComputedExportedServicesConsumer consumers = 2;
-}
-
-message ComputedExportedServicesConsumer {
-  // no sameness group
-  oneof consumer_tenancy {
-    string peer = 3;
-    string partition = 4;
-  }
-}
diff --git a/proto-public/pbmulticluster/v2beta1/computed_exported_services_deepcopy.gen.go b/proto-public/pbmulticluster/v2beta1/computed_exported_services_deepcopy.gen.go
deleted file mode 100644
index b50f35a20bd92..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/computed_exported_services_deepcopy.gen.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using ComputedExportedServices within kubernetes types, where deepcopy-gen is used.
-func (in *ComputedExportedServices) DeepCopyInto(out *ComputedExportedServices) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComputedExportedServices. Required by controller-gen.
-func (in *ComputedExportedServices) DeepCopy() *ComputedExportedServices {
-	if in == nil {
-		return nil
-	}
-	out := new(ComputedExportedServices)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ComputedExportedServices. Required by controller-gen.
-func (in *ComputedExportedServices) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using ComputedExportedService within kubernetes types, where deepcopy-gen is used.
-func (in *ComputedExportedService) DeepCopyInto(out *ComputedExportedService) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComputedExportedService. Required by controller-gen.
-func (in *ComputedExportedService) DeepCopy() *ComputedExportedService {
-	if in == nil {
-		return nil
-	}
-	out := new(ComputedExportedService)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ComputedExportedService. Required by controller-gen.
-func (in *ComputedExportedService) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
-
-// DeepCopyInto supports using ComputedExportedServicesConsumer within kubernetes types, where deepcopy-gen is used.
-func (in *ComputedExportedServicesConsumer) DeepCopyInto(out *ComputedExportedServicesConsumer) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ComputedExportedServicesConsumer. Required by controller-gen.
-func (in *ComputedExportedServicesConsumer) DeepCopy() *ComputedExportedServicesConsumer {
-	if in == nil {
-		return nil
-	}
-	out := new(ComputedExportedServicesConsumer)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ComputedExportedServicesConsumer. Required by controller-gen.
-func (in *ComputedExportedServicesConsumer) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmulticluster/v2beta1/computed_exported_services_json.gen.go b/proto-public/pbmulticluster/v2beta1/computed_exported_services_json.gen.go
deleted file mode 100644
index 709a7e6ef6b20..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/computed_exported_services_json.gen.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for ComputedExportedServices
-func (this *ComputedExportedServices) MarshalJSON() ([]byte, error) {
-	str, err := ComputedExportedServicesMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for ComputedExportedServices
-func (this *ComputedExportedServices) UnmarshalJSON(b []byte) error {
-	return ComputedExportedServicesUnmarshaler.Unmarshal(b, this)
-}
-
-// MarshalJSON is a custom marshaler for ComputedExportedService
-func (this *ComputedExportedService) MarshalJSON() ([]byte, error) {
-	str, err := ComputedExportedServicesMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for ComputedExportedService
-func (this *ComputedExportedService) UnmarshalJSON(b []byte) error {
-	return ComputedExportedServicesUnmarshaler.Unmarshal(b, this)
-}
-
-// MarshalJSON is a custom marshaler for ComputedExportedServicesConsumer
-func (this *ComputedExportedServicesConsumer) MarshalJSON() ([]byte, error) {
-	str, err := ComputedExportedServicesMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for ComputedExportedServicesConsumer
-func (this *ComputedExportedServicesConsumer) UnmarshalJSON(b []byte) error {
-	return ComputedExportedServicesUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	ComputedExportedServicesMarshaler   = &protojson.MarshalOptions{}
-	ComputedExportedServicesUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services.pb.binary.go b/proto-public/pbmulticluster/v2beta1/exported_services.pb.binary.go
deleted file mode 100644
index 1530294804123..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmulticluster/v2beta1/exported_services.proto
-
-package multiclusterv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExportedServices) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExportedServices) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services.pb.go b/proto-public/pbmulticluster/v2beta1/exported_services.pb.go
deleted file mode 100644
index d326c9c3f735c..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services.pb.go
+++ /dev/null
@@ -1,193 +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.31.0
-// 	protoc        (unknown)
-// source: pbmulticluster/v2beta1/exported_services.proto
-
-package multiclusterv2beta1
-
-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 ExportedServices struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Services  []string                    `protobuf:"bytes,1,rep,name=services,proto3" json:"services,omitempty"`
-	Consumers []*ExportedServicesConsumer `protobuf:"bytes,2,rep,name=consumers,proto3" json:"consumers,omitempty"`
-}
-
-func (x *ExportedServices) Reset() {
-	*x = ExportedServices{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmulticluster_v2beta1_exported_services_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExportedServices) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExportedServices) ProtoMessage() {}
-
-func (x *ExportedServices) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmulticluster_v2beta1_exported_services_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 ExportedServices.ProtoReflect.Descriptor instead.
-func (*ExportedServices) Descriptor() ([]byte, []int) {
-	return file_pbmulticluster_v2beta1_exported_services_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *ExportedServices) GetServices() []string {
-	if x != nil {
-		return x.Services
-	}
-	return nil
-}
-
-func (x *ExportedServices) GetConsumers() []*ExportedServicesConsumer {
-	if x != nil {
-		return x.Consumers
-	}
-	return nil
-}
-
-var File_pbmulticluster_v2beta1_exported_services_proto protoreflect.FileDescriptor
-
-var file_pbmulticluster_v2beta1_exported_services_proto_rawDesc = []byte{
-	0x0a, 0x2e, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
-	0x64, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 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, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e,
-	0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x1a, 0x37, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69,
-	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f,
-	0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
-	0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 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, 0x95,
-	0x01, 0x0a, 0x10, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69,
-	0x63, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x18,
-	0x01, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12,
-	0x5d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x73, 0x18, 0x02, 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, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72,
-	0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x73, 0x75,
-	0x6d, 0x65, 0x72, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x73, 0x3a, 0x06,
-	0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x42, 0xce, 0x02, 0x0a, 0x29, 0x63, 0x6f, 0x6d, 0x2e, 0x68,
-	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e,
-	0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0x42, 0x15, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 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, 0x75, 0x6c, 0x74, 0x69, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d,
-	0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xca, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x31, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	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, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x3a,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmulticluster_v2beta1_exported_services_proto_rawDescOnce sync.Once
-	file_pbmulticluster_v2beta1_exported_services_proto_rawDescData = file_pbmulticluster_v2beta1_exported_services_proto_rawDesc
-)
-
-func file_pbmulticluster_v2beta1_exported_services_proto_rawDescGZIP() []byte {
-	file_pbmulticluster_v2beta1_exported_services_proto_rawDescOnce.Do(func() {
-		file_pbmulticluster_v2beta1_exported_services_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmulticluster_v2beta1_exported_services_proto_rawDescData)
-	})
-	return file_pbmulticluster_v2beta1_exported_services_proto_rawDescData
-}
-
-var file_pbmulticluster_v2beta1_exported_services_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmulticluster_v2beta1_exported_services_proto_goTypes = []interface{}{
-	(*ExportedServices)(nil),         // 0: hashicorp.consul.multicluster.v2beta1.ExportedServices
-	(*ExportedServicesConsumer)(nil), // 1: hashicorp.consul.multicluster.v2beta1.ExportedServicesConsumer
-}
-var file_pbmulticluster_v2beta1_exported_services_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.multicluster.v2beta1.ExportedServices.consumers:type_name -> hashicorp.consul.multicluster.v2beta1.ExportedServicesConsumer
-	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_pbmulticluster_v2beta1_exported_services_proto_init() }
-func file_pbmulticluster_v2beta1_exported_services_proto_init() {
-	if File_pbmulticluster_v2beta1_exported_services_proto != nil {
-		return
-	}
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmulticluster_v2beta1_exported_services_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExportedServices); 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_pbmulticluster_v2beta1_exported_services_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmulticluster_v2beta1_exported_services_proto_goTypes,
-		DependencyIndexes: file_pbmulticluster_v2beta1_exported_services_proto_depIdxs,
-		MessageInfos:      file_pbmulticluster_v2beta1_exported_services_proto_msgTypes,
-	}.Build()
-	File_pbmulticluster_v2beta1_exported_services_proto = out.File
-	file_pbmulticluster_v2beta1_exported_services_proto_rawDesc = nil
-	file_pbmulticluster_v2beta1_exported_services_proto_goTypes = nil
-	file_pbmulticluster_v2beta1_exported_services_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services.proto b/proto-public/pbmulticluster/v2beta1/exported_services.proto
deleted file mode 100644
index 76cd98ad7a46f..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services.proto
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.multicluster.v2beta1;
-
-import "pbmulticluster/v2beta1/exported_services_consumer.proto";
-import "pbresource/annotations.proto";
-
-message ExportedServices {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  repeated string services = 1;
-  repeated ExportedServicesConsumer consumers = 2;
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services_consumer.pb.binary.go b/proto-public/pbmulticluster/v2beta1/exported_services_consumer.pb.binary.go
deleted file mode 100644
index 5f8eecd75158b..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services_consumer.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmulticluster/v2beta1/exported_services_consumer.proto
-
-package multiclusterv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *ExportedServicesConsumer) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *ExportedServicesConsumer) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services_consumer.pb.go b/proto-public/pbmulticluster/v2beta1/exported_services_consumer.pb.go
deleted file mode 100644
index dcdd561b2dca4..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services_consumer.pb.go
+++ /dev/null
@@ -1,230 +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.31.0
-// 	protoc        (unknown)
-// source: pbmulticluster/v2beta1/exported_services_consumer.proto
-
-package multiclusterv2beta1
-
-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 ExportedServicesConsumer struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Types that are assignable to ConsumerTenancy:
-	//
-	//	*ExportedServicesConsumer_Peer
-	//	*ExportedServicesConsumer_Partition
-	//	*ExportedServicesConsumer_SamenessGroup
-	ConsumerTenancy isExportedServicesConsumer_ConsumerTenancy `protobuf_oneof:"consumer_tenancy"`
-}
-
-func (x *ExportedServicesConsumer) Reset() {
-	*x = ExportedServicesConsumer{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmulticluster_v2beta1_exported_services_consumer_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *ExportedServicesConsumer) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*ExportedServicesConsumer) ProtoMessage() {}
-
-func (x *ExportedServicesConsumer) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmulticluster_v2beta1_exported_services_consumer_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 ExportedServicesConsumer.ProtoReflect.Descriptor instead.
-func (*ExportedServicesConsumer) Descriptor() ([]byte, []int) {
-	return file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescGZIP(), []int{0}
-}
-
-func (m *ExportedServicesConsumer) GetConsumerTenancy() isExportedServicesConsumer_ConsumerTenancy {
-	if m != nil {
-		return m.ConsumerTenancy
-	}
-	return nil
-}
-
-func (x *ExportedServicesConsumer) GetPeer() string {
-	if x, ok := x.GetConsumerTenancy().(*ExportedServicesConsumer_Peer); ok {
-		return x.Peer
-	}
-	return ""
-}
-
-func (x *ExportedServicesConsumer) GetPartition() string {
-	if x, ok := x.GetConsumerTenancy().(*ExportedServicesConsumer_Partition); ok {
-		return x.Partition
-	}
-	return ""
-}
-
-func (x *ExportedServicesConsumer) GetSamenessGroup() string {
-	if x, ok := x.GetConsumerTenancy().(*ExportedServicesConsumer_SamenessGroup); ok {
-		return x.SamenessGroup
-	}
-	return ""
-}
-
-type isExportedServicesConsumer_ConsumerTenancy interface {
-	isExportedServicesConsumer_ConsumerTenancy()
-}
-
-type ExportedServicesConsumer_Peer struct {
-	Peer string `protobuf:"bytes,1,opt,name=peer,proto3,oneof"`
-}
-
-type ExportedServicesConsumer_Partition struct {
-	Partition string `protobuf:"bytes,2,opt,name=partition,proto3,oneof"`
-}
-
-type ExportedServicesConsumer_SamenessGroup struct {
-	SamenessGroup string `protobuf:"bytes,3,opt,name=sameness_group,json=samenessGroup,proto3,oneof"`
-}
-
-func (*ExportedServicesConsumer_Peer) isExportedServicesConsumer_ConsumerTenancy() {}
-
-func (*ExportedServicesConsumer_Partition) isExportedServicesConsumer_ConsumerTenancy() {}
-
-func (*ExportedServicesConsumer_SamenessGroup) isExportedServicesConsumer_ConsumerTenancy() {}
-
-var File_pbmulticluster_v2beta1_exported_services_consumer_proto protoreflect.FileDescriptor
-
-var file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDesc = []byte{
-	0x0a, 0x37, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65,
-	0x64, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x73, 0x75,
-	0x6d, 0x65, 0x72, 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, 0x6d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x22, 0x8d, 0x01, 0x0a, 0x18, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72,
-	0x76, 0x69, 0x63, 0x65, 0x73, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x12, 0x14, 0x0a,
-	0x04, 0x70, 0x65, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x04, 0x70,
-	0x65, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74,
-	0x69, 0x6f, 0x6e, 0x12, 0x27, 0x0a, 0x0e, 0x73, 0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x5f,
-	0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x48, 0x00, 0x52, 0x0d, 0x73,
-	0x61, 0x6d, 0x65, 0x6e, 0x65, 0x73, 0x73, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x12, 0x0a, 0x10,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x5f, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79,
-	0x42, 0xd6, 0x02, 0x0a, 0x29, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
-	0x72, 0x70, 0x2e, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x1d,
-	0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73,
-	0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a,
-	0x53, 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, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0x3b, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x32, 0x62,
-	0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x25, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x75,
-	0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xca, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43,
-	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74,
-	0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x31, 0x48, 0x61, 0x73,
-	0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75,
-	0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 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, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
-	0x33,
-}
-
-var (
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescOnce sync.Once
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescData = file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDesc
-)
-
-func file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescGZIP() []byte {
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescOnce.Do(func() {
-		file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescData)
-	})
-	return file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDescData
-}
-
-var file_pbmulticluster_v2beta1_exported_services_consumer_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmulticluster_v2beta1_exported_services_consumer_proto_goTypes = []interface{}{
-	(*ExportedServicesConsumer)(nil), // 0: hashicorp.consul.multicluster.v2beta1.ExportedServicesConsumer
-}
-var file_pbmulticluster_v2beta1_exported_services_consumer_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_pbmulticluster_v2beta1_exported_services_consumer_proto_init() }
-func file_pbmulticluster_v2beta1_exported_services_consumer_proto_init() {
-	if File_pbmulticluster_v2beta1_exported_services_consumer_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbmulticluster_v2beta1_exported_services_consumer_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*ExportedServicesConsumer); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-	}
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_msgTypes[0].OneofWrappers = []interface{}{
-		(*ExportedServicesConsumer_Peer)(nil),
-		(*ExportedServicesConsumer_Partition)(nil),
-		(*ExportedServicesConsumer_SamenessGroup)(nil),
-	}
-	type x struct{}
-	out := protoimpl.TypeBuilder{
-		File: protoimpl.DescBuilder{
-			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
-			RawDescriptor: file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmulticluster_v2beta1_exported_services_consumer_proto_goTypes,
-		DependencyIndexes: file_pbmulticluster_v2beta1_exported_services_consumer_proto_depIdxs,
-		MessageInfos:      file_pbmulticluster_v2beta1_exported_services_consumer_proto_msgTypes,
-	}.Build()
-	File_pbmulticluster_v2beta1_exported_services_consumer_proto = out.File
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_rawDesc = nil
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_goTypes = nil
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services_consumer.proto b/proto-public/pbmulticluster/v2beta1/exported_services_consumer.proto
deleted file mode 100644
index 1a110099dcf59..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services_consumer.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.multicluster.v2beta1;
-
-message ExportedServicesConsumer {
-  oneof consumer_tenancy {
-    string peer = 1;
-    string partition = 2;
-    string sameness_group = 3;
-  }
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services_consumer_deepcopy.gen.go b/proto-public/pbmulticluster/v2beta1/exported_services_consumer_deepcopy.gen.go
deleted file mode 100644
index 847fe0ec3e31d..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services_consumer_deepcopy.gen.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using ExportedServicesConsumer within kubernetes types, where deepcopy-gen is used.
-func (in *ExportedServicesConsumer) DeepCopyInto(out *ExportedServicesConsumer) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExportedServicesConsumer. Required by controller-gen.
-func (in *ExportedServicesConsumer) DeepCopy() *ExportedServicesConsumer {
-	if in == nil {
-		return nil
-	}
-	out := new(ExportedServicesConsumer)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ExportedServicesConsumer. Required by controller-gen.
-func (in *ExportedServicesConsumer) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services_consumer_json.gen.go b/proto-public/pbmulticluster/v2beta1/exported_services_consumer_json.gen.go
deleted file mode 100644
index 3f43f69932a19..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services_consumer_json.gen.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for ExportedServicesConsumer
-func (this *ExportedServicesConsumer) MarshalJSON() ([]byte, error) {
-	str, err := ExportedServicesConsumerMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for ExportedServicesConsumer
-func (this *ExportedServicesConsumer) UnmarshalJSON(b []byte) error {
-	return ExportedServicesConsumerUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	ExportedServicesConsumerMarshaler   = &protojson.MarshalOptions{}
-	ExportedServicesConsumerUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services_deepcopy.gen.go b/proto-public/pbmulticluster/v2beta1/exported_services_deepcopy.gen.go
deleted file mode 100644
index f5897233ef8b6..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services_deepcopy.gen.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using ExportedServices within kubernetes types, where deepcopy-gen is used.
-func (in *ExportedServices) DeepCopyInto(out *ExportedServices) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new ExportedServices. Required by controller-gen.
-func (in *ExportedServices) DeepCopy() *ExportedServices {
-	if in == nil {
-		return nil
-	}
-	out := new(ExportedServices)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new ExportedServices. Required by controller-gen.
-func (in *ExportedServices) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmulticluster/v2beta1/exported_services_json.gen.go b/proto-public/pbmulticluster/v2beta1/exported_services_json.gen.go
deleted file mode 100644
index 40a7cdc38b9b4..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/exported_services_json.gen.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for ExportedServices
-func (this *ExportedServices) MarshalJSON() ([]byte, error) {
-	str, err := ExportedServicesMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for ExportedServices
-func (this *ExportedServices) UnmarshalJSON(b []byte) error {
-	return ExportedServicesUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	ExportedServicesMarshaler   = &protojson.MarshalOptions{}
-	ExportedServicesUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmulticluster/v2beta1/namespace_exported_services.pb.binary.go b/proto-public/pbmulticluster/v2beta1/namespace_exported_services.pb.binary.go
deleted file mode 100644
index eb000381077b7..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/namespace_exported_services.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmulticluster/v2beta1/namespace_exported_services.proto
-
-package multiclusterv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *NamespaceExportedServices) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *NamespaceExportedServices) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmulticluster/v2beta1/namespace_exported_services.pb.go b/proto-public/pbmulticluster/v2beta1/namespace_exported_services.pb.go
deleted file mode 100644
index 1199e193b022e..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/namespace_exported_services.pb.go
+++ /dev/null
@@ -1,185 +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.31.0
-// 	protoc        (unknown)
-// source: pbmulticluster/v2beta1/namespace_exported_services.proto
-
-package multiclusterv2beta1
-
-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 NamespaceExportedServices struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Consumers []*ExportedServicesConsumer `protobuf:"bytes,1,rep,name=consumers,proto3" json:"consumers,omitempty"`
-}
-
-func (x *NamespaceExportedServices) Reset() {
-	*x = NamespaceExportedServices{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmulticluster_v2beta1_namespace_exported_services_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *NamespaceExportedServices) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*NamespaceExportedServices) ProtoMessage() {}
-
-func (x *NamespaceExportedServices) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmulticluster_v2beta1_namespace_exported_services_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 NamespaceExportedServices.ProtoReflect.Descriptor instead.
-func (*NamespaceExportedServices) Descriptor() ([]byte, []int) {
-	return file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *NamespaceExportedServices) GetConsumers() []*ExportedServicesConsumer {
-	if x != nil {
-		return x.Consumers
-	}
-	return nil
-}
-
-var File_pbmulticluster_v2beta1_namespace_exported_services_proto protoreflect.FileDescriptor
-
-var file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDesc = []byte{
-	0x0a, 0x38, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
-	0x63, 0x65, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x73, 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, 0x6d, 0x75, 0x6c,
-	0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x1a, 0x37, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6d, 0x65, 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, 0x82, 0x01, 0x0a, 0x19, 0x4e, 0x61, 0x6d,
-	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x5d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d,
-	0x65, 0x72, 0x73, 0x18, 0x01, 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, 0x75, 0x6c,
-	0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6d, 0x65, 0x72, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x03, 0x42, 0xd7, 0x02,
-	0x0a, 0x29, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x1e, 0x4e, 0x61, 0x6d,
-	0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 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, 0x75, 0x6c, 0x74, 0x69, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d,
-	0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xca, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x31, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	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, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x3a,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescOnce sync.Once
-	file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescData = file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDesc
-)
-
-func file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescGZIP() []byte {
-	file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescOnce.Do(func() {
-		file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescData)
-	})
-	return file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDescData
-}
-
-var file_pbmulticluster_v2beta1_namespace_exported_services_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmulticluster_v2beta1_namespace_exported_services_proto_goTypes = []interface{}{
-	(*NamespaceExportedServices)(nil), // 0: hashicorp.consul.multicluster.v2beta1.NamespaceExportedServices
-	(*ExportedServicesConsumer)(nil),  // 1: hashicorp.consul.multicluster.v2beta1.ExportedServicesConsumer
-}
-var file_pbmulticluster_v2beta1_namespace_exported_services_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.multicluster.v2beta1.NamespaceExportedServices.consumers:type_name -> hashicorp.consul.multicluster.v2beta1.ExportedServicesConsumer
-	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_pbmulticluster_v2beta1_namespace_exported_services_proto_init() }
-func file_pbmulticluster_v2beta1_namespace_exported_services_proto_init() {
-	if File_pbmulticluster_v2beta1_namespace_exported_services_proto != nil {
-		return
-	}
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmulticluster_v2beta1_namespace_exported_services_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*NamespaceExportedServices); 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_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmulticluster_v2beta1_namespace_exported_services_proto_goTypes,
-		DependencyIndexes: file_pbmulticluster_v2beta1_namespace_exported_services_proto_depIdxs,
-		MessageInfos:      file_pbmulticluster_v2beta1_namespace_exported_services_proto_msgTypes,
-	}.Build()
-	File_pbmulticluster_v2beta1_namespace_exported_services_proto = out.File
-	file_pbmulticluster_v2beta1_namespace_exported_services_proto_rawDesc = nil
-	file_pbmulticluster_v2beta1_namespace_exported_services_proto_goTypes = nil
-	file_pbmulticluster_v2beta1_namespace_exported_services_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmulticluster/v2beta1/namespace_exported_services.proto b/proto-public/pbmulticluster/v2beta1/namespace_exported_services.proto
deleted file mode 100644
index 074d44d36063e..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/namespace_exported_services.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.multicluster.v2beta1;
-
-import "pbmulticluster/v2beta1/exported_services_consumer.proto";
-import "pbresource/annotations.proto";
-
-message NamespaceExportedServices {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_NAMESPACE};
-
-  repeated ExportedServicesConsumer consumers = 1;
-}
diff --git a/proto-public/pbmulticluster/v2beta1/namespace_exported_services_deepcopy.gen.go b/proto-public/pbmulticluster/v2beta1/namespace_exported_services_deepcopy.gen.go
deleted file mode 100644
index 9d061a755bdae..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/namespace_exported_services_deepcopy.gen.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using NamespaceExportedServices within kubernetes types, where deepcopy-gen is used.
-func (in *NamespaceExportedServices) DeepCopyInto(out *NamespaceExportedServices) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NamespaceExportedServices. Required by controller-gen.
-func (in *NamespaceExportedServices) DeepCopy() *NamespaceExportedServices {
-	if in == nil {
-		return nil
-	}
-	out := new(NamespaceExportedServices)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new NamespaceExportedServices. Required by controller-gen.
-func (in *NamespaceExportedServices) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmulticluster/v2beta1/namespace_exported_services_json.gen.go b/proto-public/pbmulticluster/v2beta1/namespace_exported_services_json.gen.go
deleted file mode 100644
index 5d4ee1e42c7a9..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/namespace_exported_services_json.gen.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for NamespaceExportedServices
-func (this *NamespaceExportedServices) MarshalJSON() ([]byte, error) {
-	str, err := NamespaceExportedServicesMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for NamespaceExportedServices
-func (this *NamespaceExportedServices) UnmarshalJSON(b []byte) error {
-	return NamespaceExportedServicesUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	NamespaceExportedServicesMarshaler   = &protojson.MarshalOptions{}
-	NamespaceExportedServicesUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmulticluster/v2beta1/partition_exported_services.pb.binary.go b/proto-public/pbmulticluster/v2beta1/partition_exported_services.pb.binary.go
deleted file mode 100644
index 5518b8a004053..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/partition_exported_services.pb.binary.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbmulticluster/v2beta1/partition_exported_services.proto
-
-package multiclusterv2beta1
-
-import (
-	"google.golang.org/protobuf/proto"
-)
-
-// MarshalBinary implements encoding.BinaryMarshaler
-func (msg *PartitionExportedServices) MarshalBinary() ([]byte, error) {
-	return proto.Marshal(msg)
-}
-
-// UnmarshalBinary implements encoding.BinaryUnmarshaler
-func (msg *PartitionExportedServices) UnmarshalBinary(b []byte) error {
-	return proto.Unmarshal(b, msg)
-}
diff --git a/proto-public/pbmulticluster/v2beta1/partition_exported_services.pb.go b/proto-public/pbmulticluster/v2beta1/partition_exported_services.pb.go
deleted file mode 100644
index 5417ff57ff0a0..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/partition_exported_services.pb.go
+++ /dev/null
@@ -1,185 +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.31.0
-// 	protoc        (unknown)
-// source: pbmulticluster/v2beta1/partition_exported_services.proto
-
-package multiclusterv2beta1
-
-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 PartitionExportedServices struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	Consumers []*ExportedServicesConsumer `protobuf:"bytes,1,rep,name=consumers,proto3" json:"consumers,omitempty"`
-}
-
-func (x *PartitionExportedServices) Reset() {
-	*x = PartitionExportedServices{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_pbmulticluster_v2beta1_partition_exported_services_proto_msgTypes[0]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *PartitionExportedServices) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*PartitionExportedServices) ProtoMessage() {}
-
-func (x *PartitionExportedServices) ProtoReflect() protoreflect.Message {
-	mi := &file_pbmulticluster_v2beta1_partition_exported_services_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 PartitionExportedServices.ProtoReflect.Descriptor instead.
-func (*PartitionExportedServices) Descriptor() ([]byte, []int) {
-	return file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *PartitionExportedServices) GetConsumers() []*ExportedServicesConsumer {
-	if x != nil {
-		return x.Consumers
-	}
-	return nil
-}
-
-var File_pbmulticluster_v2beta1_partition_exported_services_proto protoreflect.FileDescriptor
-
-var file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDesc = []byte{
-	0x0a, 0x38, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x70, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69,
-	0x6f, 0x6e, 0x5f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x5f, 0x73, 0x65, 0x72, 0x76,
-	0x69, 0x63, 0x65, 0x73, 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, 0x6d, 0x75, 0x6c,
-	0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x1a, 0x37, 0x70, 0x62, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65,
-	0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2f, 0x65, 0x78, 0x70, 0x6f, 0x72, 0x74,
-	0x65, 0x64, 0x5f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6d, 0x65, 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, 0x82, 0x01, 0x0a, 0x19, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x12, 0x5d, 0x0a, 0x09, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6d,
-	0x65, 0x72, 0x73, 0x18, 0x01, 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, 0x75, 0x6c,
-	0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
-	0x65, 0x73, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6d, 0x65, 0x72, 0x52, 0x09, 0x63, 0x6f, 0x6e, 0x73,
-	0x75, 0x6d, 0x65, 0x72, 0x73, 0x3a, 0x06, 0xa2, 0x93, 0x04, 0x02, 0x08, 0x02, 0x42, 0xd7, 0x02,
-	0x0a, 0x29, 0x63, 0x6f, 0x6d, 0x2e, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2e,
-	0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73,
-	0x74, 0x65, 0x72, 0x2e, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x1e, 0x50, 0x61, 0x72,
-	0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x65, 0x64, 0x53, 0x65,
-	0x72, 0x76, 0x69, 0x63, 0x65, 0x73, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x53, 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, 0x75, 0x6c, 0x74, 0x69, 0x63,
-	0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x3b, 0x6d,
-	0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x76, 0x32, 0x62, 0x65, 0x74,
-	0x61, 0x31, 0xa2, 0x02, 0x03, 0x48, 0x43, 0x4d, 0xaa, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x2e, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2e, 0x4d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x2e, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xca, 0x02, 0x25, 0x48, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e,
-	0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
-	0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x31, 0x48, 0x61, 0x73, 0x68, 0x69,
-	0x63, 0x6f, 0x72, 0x70, 0x5c, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x5c, 0x4d, 0x75, 0x6c, 0x74,
-	0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x5c, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	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, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x3a, 0x3a,
-	0x56, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescOnce sync.Once
-	file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescData = file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDesc
-)
-
-func file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescGZIP() []byte {
-	file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescOnce.Do(func() {
-		file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescData)
-	})
-	return file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDescData
-}
-
-var file_pbmulticluster_v2beta1_partition_exported_services_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbmulticluster_v2beta1_partition_exported_services_proto_goTypes = []interface{}{
-	(*PartitionExportedServices)(nil), // 0: hashicorp.consul.multicluster.v2beta1.PartitionExportedServices
-	(*ExportedServicesConsumer)(nil),  // 1: hashicorp.consul.multicluster.v2beta1.ExportedServicesConsumer
-}
-var file_pbmulticluster_v2beta1_partition_exported_services_proto_depIdxs = []int32{
-	1, // 0: hashicorp.consul.multicluster.v2beta1.PartitionExportedServices.consumers:type_name -> hashicorp.consul.multicluster.v2beta1.ExportedServicesConsumer
-	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_pbmulticluster_v2beta1_partition_exported_services_proto_init() }
-func file_pbmulticluster_v2beta1_partition_exported_services_proto_init() {
-	if File_pbmulticluster_v2beta1_partition_exported_services_proto != nil {
-		return
-	}
-	file_pbmulticluster_v2beta1_exported_services_consumer_proto_init()
-	if !protoimpl.UnsafeEnabled {
-		file_pbmulticluster_v2beta1_partition_exported_services_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*PartitionExportedServices); 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_pbmulticluster_v2beta1_partition_exported_services_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbmulticluster_v2beta1_partition_exported_services_proto_goTypes,
-		DependencyIndexes: file_pbmulticluster_v2beta1_partition_exported_services_proto_depIdxs,
-		MessageInfos:      file_pbmulticluster_v2beta1_partition_exported_services_proto_msgTypes,
-	}.Build()
-	File_pbmulticluster_v2beta1_partition_exported_services_proto = out.File
-	file_pbmulticluster_v2beta1_partition_exported_services_proto_rawDesc = nil
-	file_pbmulticluster_v2beta1_partition_exported_services_proto_goTypes = nil
-	file_pbmulticluster_v2beta1_partition_exported_services_proto_depIdxs = nil
-}
diff --git a/proto-public/pbmulticluster/v2beta1/partition_exported_services.proto b/proto-public/pbmulticluster/v2beta1/partition_exported_services.proto
deleted file mode 100644
index b3cf249a0c90f..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/partition_exported_services.proto
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-syntax = "proto3";
-
-package hashicorp.consul.multicluster.v2beta1;
-
-import "pbmulticluster/v2beta1/exported_services_consumer.proto";
-import "pbresource/annotations.proto";
-
-message PartitionExportedServices {
-  option (hashicorp.consul.resource.spec) = {scope: SCOPE_PARTITION};
-
-  repeated ExportedServicesConsumer consumers = 1;
-}
diff --git a/proto-public/pbmulticluster/v2beta1/partition_exported_services_deepcopy.gen.go b/proto-public/pbmulticluster/v2beta1/partition_exported_services_deepcopy.gen.go
deleted file mode 100644
index 9f048e16d2008..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/partition_exported_services_deepcopy.gen.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	proto "google.golang.org/protobuf/proto"
-)
-
-// DeepCopyInto supports using PartitionExportedServices within kubernetes types, where deepcopy-gen is used.
-func (in *PartitionExportedServices) DeepCopyInto(out *PartitionExportedServices) {
-	proto.Reset(out)
-	proto.Merge(out, proto.Clone(in))
-}
-
-// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new PartitionExportedServices. Required by controller-gen.
-func (in *PartitionExportedServices) DeepCopy() *PartitionExportedServices {
-	if in == nil {
-		return nil
-	}
-	out := new(PartitionExportedServices)
-	in.DeepCopyInto(out)
-	return out
-}
-
-// DeepCopyInterface is an autogenerated deepcopy function, copying the receiver, creating a new PartitionExportedServices. Required by controller-gen.
-func (in *PartitionExportedServices) DeepCopyInterface() interface{} {
-	return in.DeepCopy()
-}
diff --git a/proto-public/pbmulticluster/v2beta1/partition_exported_services_json.gen.go b/proto-public/pbmulticluster/v2beta1/partition_exported_services_json.gen.go
deleted file mode 100644
index e9dfafd702740..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/partition_exported_services_json.gen.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Code generated by protoc-json-shim. DO NOT EDIT.
-package multiclusterv2beta1
-
-import (
-	protojson "google.golang.org/protobuf/encoding/protojson"
-)
-
-// MarshalJSON is a custom marshaler for PartitionExportedServices
-func (this *PartitionExportedServices) MarshalJSON() ([]byte, error) {
-	str, err := PartitionExportedServicesMarshaler.Marshal(this)
-	return []byte(str), err
-}
-
-// UnmarshalJSON is a custom unmarshaler for PartitionExportedServices
-func (this *PartitionExportedServices) UnmarshalJSON(b []byte) error {
-	return PartitionExportedServicesUnmarshaler.Unmarshal(b, this)
-}
-
-var (
-	PartitionExportedServicesMarshaler   = &protojson.MarshalOptions{}
-	PartitionExportedServicesUnmarshaler = &protojson.UnmarshalOptions{DiscardUnknown: false}
-)
diff --git a/proto-public/pbmulticluster/v2beta1/resource_types.gen.go b/proto-public/pbmulticluster/v2beta1/resource_types.gen.go
deleted file mode 100644
index 910811b98f931..0000000000000
--- a/proto-public/pbmulticluster/v2beta1/resource_types.gen.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Code generated by protoc-gen-resource-types. DO NOT EDIT.
-
-package multiclusterv2beta1
-
-import (
-	"github.com/hashicorp/consul/proto-public/pbresource"
-)
-
-const (
-	GroupName = "multicluster"
-	Version   = "v2beta1"
-
-	ComputedExportedServicesKind  = "ComputedExportedServices"
-	ExportedServicesKind          = "ExportedServices"
-	NamespaceExportedServicesKind = "NamespaceExportedServices"
-	PartitionExportedServicesKind = "PartitionExportedServices"
-)
-
-var (
-	ComputedExportedServicesType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ComputedExportedServicesKind,
-	}
-
-	ExportedServicesType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         ExportedServicesKind,
-	}
-
-	NamespaceExportedServicesType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         NamespaceExportedServicesKind,
-	}
-
-	PartitionExportedServicesType = &pbresource.Type{
-		Group:        GroupName,
-		GroupVersion: Version,
-		Kind:         PartitionExportedServicesKind,
-	}
-)
diff --git a/proto-public/pbresource/resource.pb.go b/proto-public/pbresource/resource.pb.go
index 1bb6e269b010a..0a88a4eea444e 100644
--- a/proto-public/pbresource/resource.pb.go
+++ b/proto-public/pbresource/resource.pb.go
@@ -399,7 +399,6 @@ type Resource struct {
 	// 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.
-	// "deletionTimestamp" and "finalizers" keys are reserved for internal use.
 	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)
diff --git a/proto-public/pbresource/resource.proto b/proto-public/pbresource/resource.proto
index 814e039a443ec..9e65647587b76 100644
--- a/proto-public/pbresource/resource.proto
+++ b/proto-public/pbresource/resource.proto
@@ -99,7 +99,6 @@ message Resource {
   string generation = 4;
 
   // Metadata contains key/value pairs of arbitrary metadata about the resource.
-  // "deletionTimestamp" and "finalizers" keys are reserved for internal use.
   map<string, string> metadata = 5;
 
   // Status is used by controllers to communicate the result of attempting to
diff --git a/proto-public/pbtenancy/v2beta1/namespace.pb.binary.go b/proto-public/pbtenancy/v1alpha1/namespace.pb.binary.go
similarity index 84%
rename from proto-public/pbtenancy/v2beta1/namespace.pb.binary.go
rename to proto-public/pbtenancy/v1alpha1/namespace.pb.binary.go
index 1884a0943b0da..f6097062d32dc 100644
--- a/proto-public/pbtenancy/v2beta1/namespace.pb.binary.go
+++ b/proto-public/pbtenancy/v1alpha1/namespace.pb.binary.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go-binary. DO NOT EDIT.
-// source: pbtenancy/v2beta1/namespace.proto
+// source: pbtenancy/v1alpha1/namespace.proto
 
-package tenancyv2beta1
+package tenancyv1alpha1
 
 import (
 	"google.golang.org/protobuf/proto"
diff --git a/proto-public/pbtenancy/v1alpha1/namespace.pb.go b/proto-public/pbtenancy/v1alpha1/namespace.pb.go
new file mode 100644
index 0000000000000..4fb9e32260fe2
--- /dev/null
+++ b/proto-public/pbtenancy/v1alpha1/namespace.pb.go
@@ -0,0 +1,172 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.31.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/v2beta1/namespace.proto b/proto-public/pbtenancy/v1alpha1/namespace.proto
similarity index 91%
rename from proto-public/pbtenancy/v2beta1/namespace.proto
rename to proto-public/pbtenancy/v1alpha1/namespace.proto
index 6d4a739f6e21f..e90b10c1e573c 100644
--- a/proto-public/pbtenancy/v2beta1/namespace.proto
+++ b/proto-public/pbtenancy/v1alpha1/namespace.proto
@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package hashicorp.consul.tenancy.v2beta1;
+package hashicorp.consul.tenancy.v1alpha1;
 
 import "pbresource/annotations.proto";
 
diff --git a/proto-public/pbtenancy/v2beta1/namespace_deepcopy.gen.go b/proto-public/pbtenancy/v1alpha1/namespace_deepcopy.gen.go
similarity index 97%
rename from proto-public/pbtenancy/v2beta1/namespace_deepcopy.gen.go
rename to proto-public/pbtenancy/v1alpha1/namespace_deepcopy.gen.go
index 2384004c869f3..97af531ab3330 100644
--- a/proto-public/pbtenancy/v2beta1/namespace_deepcopy.gen.go
+++ b/proto-public/pbtenancy/v1alpha1/namespace_deepcopy.gen.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-gen-deepcopy. DO NOT EDIT.
-package tenancyv2beta1
+package tenancyv1alpha1
 
 import (
 	proto "google.golang.org/protobuf/proto"
diff --git a/proto-public/pbtenancy/v2beta1/namespace_json.gen.go b/proto-public/pbtenancy/v1alpha1/namespace_json.gen.go
similarity index 96%
rename from proto-public/pbtenancy/v2beta1/namespace_json.gen.go
rename to proto-public/pbtenancy/v1alpha1/namespace_json.gen.go
index 4ad7901c16c3c..9df4de9df7199 100644
--- a/proto-public/pbtenancy/v2beta1/namespace_json.gen.go
+++ b/proto-public/pbtenancy/v1alpha1/namespace_json.gen.go
@@ -1,5 +1,5 @@
 // Code generated by protoc-json-shim. DO NOT EDIT.
-package tenancyv2beta1
+package tenancyv1alpha1
 
 import (
 	protojson "google.golang.org/protobuf/encoding/protojson"
diff --git a/proto-public/pbtenancy/v2beta1/resource_types.gen.go b/proto-public/pbtenancy/v1alpha1/resource_types.gen.go
similarity index 87%
rename from proto-public/pbtenancy/v2beta1/resource_types.gen.go
rename to proto-public/pbtenancy/v1alpha1/resource_types.gen.go
index b0c3040408234..f1b6f70cf1038 100644
--- a/proto-public/pbtenancy/v2beta1/resource_types.gen.go
+++ b/proto-public/pbtenancy/v1alpha1/resource_types.gen.go
@@ -1,6 +1,6 @@
 // Code generated by protoc-gen-resource-types. DO NOT EDIT.
 
-package tenancyv2beta1
+package tenancyv1alpha1
 
 import (
 	"github.com/hashicorp/consul/proto-public/pbresource"
@@ -8,7 +8,7 @@ import (
 
 const (
 	GroupName = "tenancy"
-	Version   = "v2beta1"
+	Version   = "v1alpha1"
 
 	NamespaceKind = "Namespace"
 )
diff --git a/proto-public/pbtenancy/v2beta1/namespace.pb.go b/proto-public/pbtenancy/v2beta1/namespace.pb.go
deleted file mode 100644
index 4ef901783d72f..0000000000000
--- a/proto-public/pbtenancy/v2beta1/namespace.pb.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// versions:
-// 	protoc-gen-go v1.31.0
-// 	protoc        (unknown)
-// source: pbtenancy/v2beta1/namespace.proto
-
-package tenancyv2beta1
-
-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_v2beta1_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_v2beta1_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_v2beta1_namespace_proto_rawDescGZIP(), []int{0}
-}
-
-func (x *Namespace) GetDescription() string {
-	if x != nil {
-		return x.Description
-	}
-	return ""
-}
-
-var File_pbtenancy_v2beta1_namespace_proto protoreflect.FileDescriptor
-
-var file_pbtenancy_v2beta1_namespace_proto_rawDesc = []byte{
-	0x0a, 0x21, 0x70, 0x62, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x2f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 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, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 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, 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, 0xa4, 0x02, 0x0a, 0x24, 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, 0x32, 0x62, 0x65,
-	0x74, 0x61, 0x31, 0x42, 0x0e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 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, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x2f, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x3b, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x76, 0x32, 0x62, 0x65, 0x74, 0x61, 0x31,
-	0xa2, 0x02, 0x03, 0x48, 0x43, 0x54, 0xaa, 0x02, 0x20, 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, 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, 0x54, 0x65, 0x6e,
-	0x61, 0x6e, 0x63, 0x79, 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,
-	0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 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, 0x54, 0x65, 0x6e, 0x61, 0x6e, 0x63, 0x79, 0x3a, 0x3a, 0x56, 0x32, 0x62, 0x65, 0x74, 0x61,
-	0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
-}
-
-var (
-	file_pbtenancy_v2beta1_namespace_proto_rawDescOnce sync.Once
-	file_pbtenancy_v2beta1_namespace_proto_rawDescData = file_pbtenancy_v2beta1_namespace_proto_rawDesc
-)
-
-func file_pbtenancy_v2beta1_namespace_proto_rawDescGZIP() []byte {
-	file_pbtenancy_v2beta1_namespace_proto_rawDescOnce.Do(func() {
-		file_pbtenancy_v2beta1_namespace_proto_rawDescData = protoimpl.X.CompressGZIP(file_pbtenancy_v2beta1_namespace_proto_rawDescData)
-	})
-	return file_pbtenancy_v2beta1_namespace_proto_rawDescData
-}
-
-var file_pbtenancy_v2beta1_namespace_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
-var file_pbtenancy_v2beta1_namespace_proto_goTypes = []interface{}{
-	(*Namespace)(nil), // 0: hashicorp.consul.tenancy.v2beta1.Namespace
-}
-var file_pbtenancy_v2beta1_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_v2beta1_namespace_proto_init() }
-func file_pbtenancy_v2beta1_namespace_proto_init() {
-	if File_pbtenancy_v2beta1_namespace_proto != nil {
-		return
-	}
-	if !protoimpl.UnsafeEnabled {
-		file_pbtenancy_v2beta1_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_v2beta1_namespace_proto_rawDesc,
-			NumEnums:      0,
-			NumMessages:   1,
-			NumExtensions: 0,
-			NumServices:   0,
-		},
-		GoTypes:           file_pbtenancy_v2beta1_namespace_proto_goTypes,
-		DependencyIndexes: file_pbtenancy_v2beta1_namespace_proto_depIdxs,
-		MessageInfos:      file_pbtenancy_v2beta1_namespace_proto_msgTypes,
-	}.Build()
-	File_pbtenancy_v2beta1_namespace_proto = out.File
-	file_pbtenancy_v2beta1_namespace_proto_rawDesc = nil
-	file_pbtenancy_v2beta1_namespace_proto_goTypes = nil
-	file_pbtenancy_v2beta1_namespace_proto_depIdxs = nil
-}
diff --git a/sdk/iptables/iptables.go b/sdk/iptables/iptables.go
index ad81946551216..32f089a6c9a82 100644
--- a/sdk/iptables/iptables.go
+++ b/sdk/iptables/iptables.go
@@ -78,11 +78,8 @@ type Provider interface {
 	// ApplyRules executes rules that have been added via AddRule.
 	// This operation is currently not atomic, and if there's an error applying rules,
 	// you may be left in a state where partial rules were applied.
-	// ApplyRules should not be called twice on the same instance in order to avoid
-	// duplicate rule application.
 	ApplyRules() error
-	// Rules returns the list of rules that have been added (including those not yet
-	// applied).
+	// Rules returns the list of rules that have been added but not applied yet.
 	Rules() []string
 }
 
diff --git a/sdk/testutil/io.go b/sdk/testutil/io.go
index 38722cc981593..7b446339728b4 100644
--- a/sdk/testutil/io.go
+++ b/sdk/testutil/io.go
@@ -16,7 +16,7 @@ var saveSnapshot = strings.ToLower(os.Getenv("TEST_SAVE_SNAPSHOT")) == "true"
 // If the directory cannot be created t.Fatal is called.
 // The directory will be removed when the test ends. Set TEST_NOCLEANUP env var
 // to prevent the directory from being removed.
-func TempDir(t TestingTB, name string) string {
+func TempDir(t testing.TB, name string) string {
 	if t == nil {
 		panic("argument t must be non-nil")
 	}
diff --git a/sdk/testutil/retry/doc.go b/sdk/testutil/retry/doc.go
deleted file mode 100644
index 4afaac062bb22..0000000000000
--- a/sdk/testutil/retry/doc.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// 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:
-//
-//	func TestX(t *testing.T) {
-//	    retry.Run(t, func(r *retry.R) {
-//	        if err := foo(); err != nil {
-//				r.Errorf("foo: %s", err)
-//				return
-//	        }
-//	    })
-//	}
-//
-// 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
diff --git a/sdk/testutil/retry/interface.go b/sdk/testutil/retry/interface.go
deleted file mode 100644
index 78d2d948ffe18..0000000000000
--- a/sdk/testutil/retry/interface.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package retry
-
-import (
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var nilInf TestingTB = nil
-
-// Assertion that our TestingTB can be passed to
-var _ require.TestingT = nilInf
-var _ assert.TestingT = nilInf
-
-// TestingTB is an interface that describes the implementation of the testing object.
-// Using an interface that describes testing.TB instead of the actual implementation
-// makes testutil usable in a wider variety of contexts (e.g. use with ginkgo : https://godoc.org/github.com/onsi/ginkgo#GinkgoT)
-type TestingTB interface {
-	Cleanup(func())
-	Error(args ...any)
-	Errorf(format string, args ...any)
-	Fail()
-	FailNow()
-	Failed() bool
-	Fatal(args ...any)
-	Fatalf(format string, args ...any)
-	Helper()
-	Log(args ...any)
-	Logf(format string, args ...any)
-	Name() string
-	Setenv(key, value string)
-	TempDir() string
-}
diff --git a/sdk/testutil/retry/output.go b/sdk/testutil/retry/output.go
deleted file mode 100644
index 6d4006f42d028..0000000000000
--- a/sdk/testutil/retry/output.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package retry
-
-import (
-	"bytes"
-	"fmt"
-	"runtime"
-	"strings"
-)
-
-func dedup(a []string) string {
-	if len(a) == 0 {
-		return ""
-	}
-	seen := map[string]struct{}{}
-	var b bytes.Buffer
-	for _, s := range a {
-		if _, ok := seen[s]; ok {
-			continue
-		}
-		seen[s] = struct{}{}
-		b.WriteString(s)
-		b.WriteRune('\n')
-	}
-	return b.String()
-}
-
-func decorate(s string) string {
-	_, file, line, ok := runtime.Caller(3)
-	if ok {
-		n := strings.LastIndex(file, "/")
-		if n >= 0 {
-			file = file[n+1:]
-		}
-	} else {
-		file = "???"
-		line = 1
-	}
-	return fmt.Sprintf("%s:%d: %s", file, line, s)
-}
diff --git a/sdk/testutil/retry/retry.go b/sdk/testutil/retry/retry.go
index a8a8ac5d6fe4e..af468460d592a 100644
--- a/sdk/testutil/retry/retry.go
+++ b/sdk/testutil/retry/retry.go
@@ -1,232 +1,263 @@
 // 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:
+//
+//	func TestX(t *testing.T) {
+//	    retry.Run(t, func(r *retry.R) {
+//	        if err := foo(); err != nil {
+//				r.Errorf("foo: %s", err)
+//				return
+//	        }
+//	    })
+//	}
+//
+// 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 (
+	"bytes"
 	"fmt"
-	"os"
+	"runtime"
+	"strings"
+	"time"
 )
 
-var _ TestingTB = &R{}
+// Failer is an interface compatible with testing.T.
+type Failer interface {
+	Helper()
 
-type R struct {
-	wrapped TestingTB
-	retryer Retryer
-
-	done             bool
-	fullOutput       bool
-	immediateCleanup bool
+	// Log is called for the final test output
+	Log(args ...interface{})
 
-	attempts []*attempt
+	// FailNow is called when the retrying is abandoned.
+	FailNow()
 }
 
-func (r *R) Cleanup(clean func()) {
-	if r.immediateCleanup {
-		a := r.getCurrentAttempt()
-		a.cleanups = append(a.cleanups, clean)
-	} else {
-		r.wrapped.Cleanup(clean)
-	}
-}
+// 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()
+	done   bool
+	output []string
 
-func (r *R) Error(args ...any) {
-	r.Log(args...)
-	r.Fail()
+	cleanups []func()
 }
 
-func (r *R) Errorf(format string, args ...any) {
-	r.Logf(format, args...)
-	r.Fail()
+func (r *R) Logf(format string, args ...interface{}) {
+	r.log(fmt.Sprintf(format, args...))
 }
 
-func (r *R) Fail() {
-	r.getCurrentAttempt().failed = true
+func (r *R) Log(args ...interface{}) {
+	r.log(fmt.Sprintln(args...))
 }
 
-func (r *R) FailNow() {
-	r.Fail()
-	panic(attemptFailed{})
-}
+func (r *R) Helper() {}
 
-func (r *R) Failed() bool {
-	return r.getCurrentAttempt().failed
+// 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) Fatal(args ...any) {
-	r.Log(args...)
-	r.FailNow()
-}
+func (r *R) runCleanup() {
 
-func (r *R) Fatalf(format string, args ...any) {
-	r.Logf(format, args...)
-	r.FailNow()
+	// 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()
+		}
+	}
 }
 
-func (r *R) Helper() {
-	// *testing.T will just record which functions are helpers by their addresses and
-	// it doesn't much matter where where we record that they are helpers
-	r.wrapped.Helper()
+// runFailed is a sentinel value to indicate that the func itself
+// didn't panic, rather that `FailNow` was called.
+type 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{})
 }
 
-func (r *R) Log(args ...any) {
-	r.log(fmt.Sprintln(args...))
+// 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()
 }
 
-func (r *R) Logf(format string, args ...any) {
+// 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()
 }
 
-// Name will return the name of the underlying TestingT.
-func (r *R) Name() string {
-	return r.wrapped.Name()
+// 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
 }
 
-// Setenv will save the current value of the specified env var, set it to the
-// specified value and then restore it to the original value in a cleanup function
-// once the retry attempt has finished.
-func (r *R) Setenv(key, value string) {
-	prevValue, ok := os.LookupEnv(key)
-
-	if err := os.Setenv(key, value); err != nil {
-		r.wrapped.Fatalf("cannot set environment variable: %v", err)
-	}
-
-	if ok {
-		r.Cleanup(func() {
-			os.Setenv(key, prevValue)
-		})
-	} else {
-		r.Cleanup(func() {
-			os.Unsetenv(key)
-		})
-	}
-}
-
-// TempDir will use the wrapped TestingT to create a temporary directory
-// that will be cleaned up when ALL RETRYING has finished.
-func (r *R) TempDir() string {
-	return r.wrapped.TempDir()
+// 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
 }
 
-// Check will call r.Fatal(err) if err is not nil
+// 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.Fatal(err)
+		r.log(err.Error())
+		r.FailNow()
 	}
 }
 
+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.
 func (r *R) Stop(err error) {
 	r.log(err.Error())
 	r.done = true
 }
 
-func (r *R) failCurrentAttempt() {
-	r.getCurrentAttempt().failed = true
+func decorate(s string) string {
+	_, file, line, ok := runtime.Caller(3)
+	if ok {
+		n := strings.LastIndex(file, "/")
+		if n >= 0 {
+			file = file[n+1:]
+		}
+	} else {
+		file = "???"
+		line = 1
+	}
+	return fmt.Sprintf("%s:%d: %s", file, line, s)
 }
 
-func (r *R) log(s string) {
-	a := r.getCurrentAttempt()
-	a.output = append(a.output, decorate(s))
+func Run(t Failer, f func(r *R)) {
+	t.Helper()
+	run(DefaultFailer(), t, f)
 }
 
-func (r *R) getCurrentAttempt() *attempt {
-	if len(r.attempts) == 0 {
-		panic("no retry attempts have been started yet")
-	}
-
-	return r.attempts[len(r.attempts)-1]
+func RunWith(r Retryer, t Failer, f func(r *R)) {
+	t.Helper()
+	run(r, t, f)
 }
 
-// cleanupAttempt will perform all the register cleanup operations recorded
-// during execution of the single round of the test function.
-func (r *R) cleanupAttempt(a *attempt) {
-	// 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(a.cleanups) > 0 {
-			r.cleanupAttempt(a)
-		}
-	}()
-
-	for len(a.cleanups) > 0 {
-		var cleanup func()
-		if len(a.cleanups) > 0 {
-			last := len(a.cleanups) - 1
-			cleanup = a.cleanups[last]
-			a.cleanups = a.cleanups[:last]
-		}
-		if cleanup != nil {
-			cleanup()
+func dedup(a []string) string {
+	if len(a) == 0 {
+		return ""
+	}
+	seen := map[string]struct{}{}
+	var b bytes.Buffer
+	for _, s := range a {
+		if _, ok := seen[s]; ok {
+			continue
 		}
+		seen[s] = struct{}{}
+		b.WriteString(s)
+		b.WriteRune('\n')
 	}
+	return b.String()
 }
 
-// runAttempt will execute one round of the test function and handle cleanups and panic recovery
-// of a failed attempt that should not stop retrying.
-func (r *R) runAttempt(f func(r *R)) {
-	r.Helper()
-
-	a := &attempt{}
-	r.attempts = append(r.attempts, a)
+func run(r Retryer, t Failer, f func(r *R)) {
+	t.Helper()
+	rr := &R{}
 
-	defer r.cleanupAttempt(a)
-	defer func() {
-		if p := recover(); p != nil && p != (attemptFailed{}) {
-			panic(p)
+	fail := func() {
+		t.Helper()
+		out := dedup(rr.output)
+		if out != "" {
+			t.Log(out)
 		}
-	}()
-	f(r)
-}
-
-func (r *R) run(f func(r *R)) {
-	r.Helper()
+		t.FailNow()
+	}
 
-	for r.retryer.Continue() {
-		r.runAttempt(f)
+	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{}) {
+					panic(p)
+				}
+			}()
+			f(rr)
+		}()
 
 		switch {
-		case r.done:
-			r.recordRetryFailure()
+		case rr.done:
+			fail()
 			return
-		case !r.Failed():
-			// the current attempt did not fail so we can go ahead and return
+		case !rr.fail:
 			return
 		}
+		rr.fail = false
 	}
-
-	// We cannot retry any more and no attempt has succeeded yet.
-	r.recordRetryFailure()
+	fail()
 }
 
-func (r *R) recordRetryFailure() {
-	r.Helper()
-	output := r.getCurrentAttempt().output
-	if r.fullOutput {
-		var combined []string
-		for _, attempt := range r.attempts {
-			combined = append(combined, attempt.output...)
-		}
-		output = combined
-	}
-
-	out := dedup(output)
-	if out != "" {
-		r.wrapped.Log(out)
-	}
-	r.wrapped.FailNow()
+// DefaultFailer provides default retry.Run() behavior for unit tests, namely
+// 7s timeout with a wait of 25ms
+func DefaultFailer() *Timer {
+	return &Timer{Timeout: 7 * time.Second, Wait: 25 * time.Millisecond}
 }
 
-type attempt struct {
-	failed   bool
-	output   []string
-	cleanups []func()
+// Retryer provides an interface for repeating operations
+// until they succeed or an exit condition is met.
+type Retryer interface {
+	// Continue returns true if the operation should be repeated, otherwise it
+	// returns false to indicate retrying should stop.
+	Continue() bool
 }
-
-// attemptFailed is a sentinel value to indicate that the func itself
-// didn't panic, rather that `FailNow` was called.
-type attemptFailed struct{}
diff --git a/sdk/testutil/retry/retry_test.go b/sdk/testutil/retry/retry_test.go
index ecc8e5608232e..77bc2d4d9f96b 100644
--- a/sdk/testutil/retry/retry_test.go
+++ b/sdk/testutil/retry/retry_test.go
@@ -62,7 +62,7 @@ func TestBasics(t *testing.T) {
 	t.Run("Fatal returns from func, but does not fail test", func(t *testing.T) {
 		i := 0
 		gotHere := false
-		ft := &fakeT{T: t}
+		ft := &fakeT{}
 		Run(ft, func(r *R) {
 			i++
 			t.Logf("i: %d; r: %#v", i, r)
@@ -97,7 +97,7 @@ func TestBasics(t *testing.T) {
 
 func TestRunWith(t *testing.T) {
 	t.Run("calls FailNow after exceeding retries", func(t *testing.T) {
-		ft := &fakeT{T: t}
+		ft := &fakeT{}
 		iter := 0
 		RunWith(&Counter{Count: 3, Wait: time.Millisecond}, ft, func(r *R) {
 			iter++
@@ -109,7 +109,7 @@ func TestRunWith(t *testing.T) {
 	})
 
 	t.Run("Stop ends the retrying", func(t *testing.T) {
-		ft := &fakeT{T: t}
+		ft := &fakeT{}
 		iter := 0
 		RunWith(&Counter{Count: 5, Wait: time.Millisecond}, ft, func(r *R) {
 			iter++
@@ -128,54 +128,38 @@ func TestRunWith(t *testing.T) {
 	})
 }
 
-func TestCleanup_Passthrough(t *testing.T) {
-
-}
-
 func TestCleanup(t *testing.T) {
-
 	t.Run("basic", func(t *testing.T) {
-		ft := &fakeT{T: t}
+		ft := &fakeT{}
 		cleanupsExecuted := 0
-
-		Run(
-			ft,
-			func(r *R) {
-				r.Cleanup(func() {
-					cleanupsExecuted += 1
-				})
-			},
-			WithImmediateCleanup(),
-			WithRetryer(&Counter{Count: 2, Wait: time.Millisecond}),
-		)
+		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{T: t}
+		ft := &fakeT{}
 		cleanupsExecuted := 0
-		Run(
-			ft,
-			func(r *R) {
-				r.Cleanup(func() {
-					cleanupsExecuted += 1
-				})
+		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
+				panic(fmt.Errorf("fake test error"))
+			})
 
-				r.Cleanup(func() {
-					cleanupsExecuted += 1
-				})
+			r.Cleanup(func() {
+				cleanupsExecuted += 1
+			})
 
-				// test is successful but should fail due to the cleanup panicing
-			},
-			WithRetryer(&Counter{Count: 2, Wait: time.Millisecond}),
-			WithImmediateCleanup(),
-		)
+			// test is successful but should fail due to the cleanup panicing
+		})
 
 		require.Equal(t, 3, cleanupsExecuted)
 		require.Equal(t, 1, ft.fails)
@@ -183,71 +167,33 @@ func TestCleanup(t *testing.T) {
 	})
 
 	t.Run("cleanup-per-retry", func(t *testing.T) {
-		ft := &fakeT{T: t}
+		ft := &fakeT{}
 		iter := 0
 		cleanupsExecuted := 0
-		Run(
-			ft,
-			func(r *R) {
-				if cleanupsExecuted != iter {
-					r.Stop(fmt.Errorf("cleanups not executed between retries"))
-					return
-				}
-				iter += 1
+		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.Cleanup(func() {
+				cleanupsExecuted += 1
+			})
 
-				r.FailNow()
-			},
-			WithRetryer(&Counter{Count: 3, Wait: time.Millisecond}),
-			WithImmediateCleanup(),
-		)
+			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)
 	})
-
-	t.Run("passthrough-to-t", func(t *testing.T) {
-		cleanupsExecuted := 0
-
-		require.True(t, t.Run("internal", func(t *testing.T) {
-			iter := 0
-			Run(
-				t,
-				func(r *R) {
-					iter++
-
-					r.Cleanup(func() {
-						cleanupsExecuted += 1
-					})
-
-					// fail all but the last one to ensure the right number of cleanups
-					// are eventually executed
-					if iter < 3 {
-						r.FailNow()
-					}
-				},
-				WithRetryer(&Counter{Count: 3, Wait: time.Millisecond}),
-			)
-
-			// at this point nothing should be cleaned up
-			require.Equal(t, 0, cleanupsExecuted)
-		}))
-
-		// now since the subtest finished the test cleanup funcs
-		// should have been executed.
-		require.Equal(t, 3, cleanupsExecuted)
-	})
 }
 
 type fakeT struct {
 	fails int
 	out   []string
-	*testing.T
 }
 
 func (f *fakeT) Helper() {}
@@ -260,4 +206,4 @@ func (f *fakeT) FailNow() {
 	f.fails++
 }
 
-var _ TestingTB = &fakeT{}
+var _ Failer = &fakeT{}
diff --git a/sdk/testutil/retry/retryer.go b/sdk/testutil/retry/retryer.go
deleted file mode 100644
index 45f41988f21e9..0000000000000
--- a/sdk/testutil/retry/retryer.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package retry
-
-import "time"
-
-// Retryer provides an interface for repeating operations
-// until they succeed or an exit condition is met.
-type Retryer interface {
-	// Continue returns true if the operation should be repeated, otherwise it
-	// returns false to indicate retrying should stop.
-	Continue() bool
-}
-
-// DefaultRetryer provides default retry.Run() behavior for unit tests, namely
-// 7s timeout with a wait of 25ms
-func DefaultRetryer() Retryer {
-	return &Timer{Timeout: 7 * time.Second, Wait: 25 * time.Millisecond}
-}
-
-// 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}
-}
diff --git a/sdk/testutil/retry/run.go b/sdk/testutil/retry/run.go
deleted file mode 100644
index 51dad9f4e4d32..0000000000000
--- a/sdk/testutil/retry/run.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: MPL-2.0
-
-package retry
-
-type Option func(r *R)
-
-func WithRetryer(retryer Retryer) Option {
-	return func(r *R) {
-		r.retryer = retryer
-	}
-}
-
-func WithFullOutput() Option {
-	return func(r *R) {
-		r.fullOutput = true
-	}
-}
-
-// WithImmediateCleanup will cause all cleanup operations added
-// by calling the Cleanup method on *R to be performed after
-// the retry attempt completes (regardless of pass/fail status)
-// Use this only if all resources created during the retry loop should
-// not persist after the retry has finished.
-func WithImmediateCleanup() Option {
-	return func(r *R) {
-		r.immediateCleanup = true
-	}
-}
-
-func Run(t TestingTB, f func(r *R), opts ...Option) {
-	t.Helper()
-	r := &R{
-		wrapped: t,
-		retryer: DefaultRetryer(),
-	}
-
-	for _, opt := range opts {
-		opt(r)
-	}
-
-	r.run(f)
-}
-
-func RunWith(r Retryer, t TestingTB, f func(r *R)) {
-	t.Helper()
-	Run(t, f, WithRetryer(r))
-}
diff --git a/sdk/testutil/retry/timer.go b/sdk/testutil/retry/timer.go
index 6c65d38ba0e6f..be4f5e92f4072 100644
--- a/sdk/testutil/retry/timer.go
+++ b/sdk/testutil/retry/timer.go
@@ -5,6 +5,22 @@ 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 {
diff --git a/sdk/testutil/types.go b/sdk/testutil/types.go
index 33cc3002997d6..e5721d3c9647d 100644
--- a/sdk/testutil/types.go
+++ b/sdk/testutil/types.go
@@ -3,33 +3,14 @@
 
 package testutil
 
-import (
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var nilInf TestingTB = nil
-
-// Assertion that our TestingTB can be passed to
-var _ require.TestingT = nilInf
-var _ assert.TestingT = nilInf
-
 // TestingTB is an interface that describes the implementation of the testing object.
 // Using an interface that describes testing.TB instead of the actual implementation
 // makes testutil usable in a wider variety of contexts (e.g. use with ginkgo : https://godoc.org/github.com/onsi/ginkgo#GinkgoT)
 type TestingTB interface {
 	Cleanup(func())
-	Error(args ...any)
-	Errorf(format string, args ...any)
-	Fail()
-	FailNow()
 	Failed() bool
-	Fatal(args ...any)
-	Fatalf(format string, args ...any)
-	Helper()
-	Log(args ...any)
-	Logf(format string, args ...any)
+	Logf(format string, args ...interface{})
 	Name() string
-	Setenv(key, value string)
-	TempDir() string
+	Fatalf(fmt string, args ...interface{})
+	Helper()
 }
diff --git a/test-integ/Makefile b/test-integ/Makefile
index d3d3e38719423..0fd35d4eda7ec 100644
--- a/test-integ/Makefile
+++ b/test-integ/Makefile
@@ -1,7 +1,7 @@
 SHELL := /bin/bash
 
 .PHONY: noop
-noop: help
+noop:
 
 ##@ Build
 
diff --git a/test-integ/README.md b/test-integ/README.md
index 8955d0556dbf3..4ed0b927598af 100644
--- a/test-integ/README.md
+++ b/test-integ/README.md
@@ -6,7 +6,7 @@ These should use the [testing/deployer framework](../testing/deployer) to bring
 up some local testing infrastructure and fixtures to run test assertions against.
 
 Where reasonably possible, try to bring up infrastructure interesting enough to
-be able to run many related sorts of tests against it, rather than waiting for
+be able to run many related sorts of test against it, rather than waiting for
 many similar clusters to be provisioned and torn down. This will help ensure
 that the integration tests do not consume CPU cycles needlessly.
 
diff --git a/test-integ/catalogv2/explicit_destinations_l7_test.go b/test-integ/catalogv2/explicit_destinations_l7_test.go
index 927a8ec7dd093..9be6ce93f0181 100644
--- a/test-integ/catalogv2/explicit_destinations_l7_test.go
+++ b/test-integ/catalogv2/explicit_destinations_l7_test.go
@@ -20,29 +20,7 @@ import (
 )
 
 func TestSplitterFeaturesL7ExplicitDestinations(t *testing.T) {
-	tenancies := []*pbresource.Tenancy{
-		{
-			Partition: "default",
-			Namespace: "default",
-		},
-	}
-	if utils.IsEnterprise() {
-		tenancies = append(tenancies, &pbresource.Tenancy{
-			Partition: "part1",
-			Namespace: "default",
-		})
-		tenancies = append(tenancies, &pbresource.Tenancy{
-			Partition: "part1",
-			Namespace: "nsa",
-		})
-		tenancies = append(tenancies, &pbresource.Tenancy{
-			Partition: "default",
-			Namespace: "nsa",
-		})
-	}
-	cfg := testSplitterFeaturesL7ExplicitDestinationsCreator{
-		tenancies: tenancies,
-	}.NewConfig(t)
+	cfg := testSplitterFeaturesL7ExplicitDestinationsCreator{}.NewConfig(t)
 
 	sp := sprawltest.Launch(t, cfg)
 
@@ -59,13 +37,11 @@ func TestSplitterFeaturesL7ExplicitDestinations(t *testing.T) {
 
 	t.Log(topology.RenderRelationships(ships))
 
-	for _, tenancy := range tenancies {
-		// Make sure things are in v2.
-		libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-client", tenancy, 1)
-		libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-server-v1", tenancy, 1)
-		libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-server-v2", tenancy, 1)
-		libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-server", tenancy, 0)
-	}
+	// Make sure things are in v2.
+	libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-client", nil, 1)
+	libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-server-v1", nil, 1)
+	libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-server-v2", nil, 1)
+	libassert.CatalogV2ServiceHasEndpointCount(t, clientV2, "static-server", nil, 0)
 
 	// Check relationships
 	for _, ship := range ships {
@@ -111,9 +87,7 @@ func TestSplitterFeaturesL7ExplicitDestinations(t *testing.T) {
 	}
 }
 
-type testSplitterFeaturesL7ExplicitDestinationsCreator struct {
-	tenancies []*pbresource.Tenancy
-}
+type testSplitterFeaturesL7ExplicitDestinationsCreator struct{}
 
 func (c testSplitterFeaturesL7ExplicitDestinationsCreator) NewConfig(t *testing.T) *topology.Config {
 	const clusterName = "dc1"
@@ -132,8 +106,11 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) NewConfig(t *testing.
 		return fmt.Sprintf("%s-box%d", clusterName, lastNode)
 	}
 
-	for _, ten := range c.tenancies {
-		c.topologyConfigAddNodes(t, cluster, nodeName, ten)
+	c.topologyConfigAddNodes(t, cluster, nodeName, "default", "default")
+	if cluster.Enterprise {
+		c.topologyConfigAddNodes(t, cluster, nodeName, "part1", "default")
+		c.topologyConfigAddNodes(t, cluster, nodeName, "part1", "nsa")
+		c.topologyConfigAddNodes(t, cluster, nodeName, "default", "nsa")
 	}
 
 	return &topology.Config{
@@ -152,33 +129,34 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 	t *testing.T,
 	cluster *topology.Cluster,
 	nodeName func() string,
-	currentTenancy *pbresource.Tenancy,
+	partition,
+	namespace string,
 ) {
 	clusterName := cluster.Name
 
-	newID := func(name string, tenancy *pbresource.Tenancy) topology.ID {
+	newID := func(name string) topology.ID {
 		return topology.ID{
-			Partition: tenancy.Partition,
-			Namespace: tenancy.Namespace,
+			Partition: partition,
+			Namespace: namespace,
 			Name:      name,
 		}
 	}
 
 	tenancy := &pbresource.Tenancy{
-		Partition: currentTenancy.Partition,
-		Namespace: currentTenancy.Namespace,
+		Partition: partition,
+		Namespace: namespace,
 		PeerName:  "local",
 	}
 
 	v1ServerNode := &topology.Node{
 		Kind:      topology.NodeKindDataplane,
 		Version:   topology.NodeVersionV2,
-		Partition: currentTenancy.Partition,
+		Partition: partition,
 		Name:      nodeName(),
 		Workloads: []*topology.Workload{
 			topoutil.NewBlankspaceWorkloadWithDefaults(
 				clusterName,
-				newID("static-server-v1", tenancy),
+				newID("static-server-v1"),
 				topology.NodeVersionV2,
 				func(wrk *topology.Workload) {
 					wrk.Meta = map[string]string{
@@ -192,12 +170,12 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 	v2ServerNode := &topology.Node{
 		Kind:      topology.NodeKindDataplane,
 		Version:   topology.NodeVersionV2,
-		Partition: currentTenancy.Partition,
+		Partition: partition,
 		Name:      nodeName(),
 		Workloads: []*topology.Workload{
 			topoutil.NewBlankspaceWorkloadWithDefaults(
 				clusterName,
-				newID("static-server-v2", tenancy),
+				newID("static-server-v2"),
 				topology.NodeVersionV2,
 				func(wrk *topology.Workload) {
 					wrk.Meta = map[string]string{
@@ -211,59 +189,45 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 	clientNode := &topology.Node{
 		Kind:      topology.NodeKindDataplane,
 		Version:   topology.NodeVersionV2,
-		Partition: currentTenancy.Partition,
+		Partition: partition,
 		Name:      nodeName(),
 		Workloads: []*topology.Workload{
 			topoutil.NewBlankspaceWorkloadWithDefaults(
 				clusterName,
-				newID("static-client", tenancy),
+				newID("static-client"),
 				topology.NodeVersionV2,
 				func(wrk *topology.Workload) {
-					for i, tenancy := range c.tenancies {
-						wrk.Destinations = append(wrk.Destinations, &topology.Destination{
-
-							ID:           newID("static-server", tenancy),
+					wrk.Destinations = []*topology.Destination{
+						{
+							ID:           newID("static-server"),
 							PortName:     "http",
 							LocalAddress: "0.0.0.0", // needed for an assertion
-							LocalPort:    5000 + (i * 4),
+							LocalPort:    5000,
+						},
+						{
+							ID:           newID("static-server"),
+							PortName:     "http2",
+							LocalAddress: "0.0.0.0", // needed for an assertion
+							LocalPort:    5001,
+						},
+						{
+							ID:           newID("static-server"),
+							PortName:     "grpc",
+							LocalAddress: "0.0.0.0", // needed for an assertion
+							LocalPort:    5002,
+						},
+						{
+							ID:           newID("static-server"),
+							PortName:     "tcp",
+							LocalAddress: "0.0.0.0", // needed for an assertion
+							LocalPort:    5003,
 						},
-							&topology.Destination{
-
-								ID:           newID("static-server", tenancy),
-								PortName:     "http2",
-								LocalAddress: "0.0.0.0", // needed for an assertion
-								LocalPort:    5001 + (i * 4),
-							},
-							&topology.Destination{
-
-								ID:           newID("static-server", tenancy),
-								PortName:     "grpc",
-								LocalAddress: "0.0.0.0", // needed for an assertion
-								LocalPort:    5002 + (i * 4),
-							},
-							&topology.Destination{
-
-								ID:           newID("static-server", tenancy),
-								PortName:     "tcp",
-								LocalAddress: "0.0.0.0", // needed for an assertion
-								LocalPort:    5003 + (i * 4),
-							},
-						)
 					}
 				},
 			),
 		},
 	}
 
-	var sources []*pbauth.Source
-	for _, ten := range c.tenancies {
-		sources = append(sources, &pbauth.Source{
-			IdentityName: "static-client",
-			Namespace:    ten.Namespace,
-			Partition:    ten.Partition,
-		})
-	}
-
 	v1TrafficPerms := sprawltest.MustSetResourceData(t, &pbresource.Resource{
 		Id: &pbresource.ID{
 			Type:    pbauth.TrafficPermissionsType,
@@ -276,10 +240,12 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 		},
 		Action: pbauth.Action_ACTION_ALLOW,
 		Permissions: []*pbauth.Permission{{
-			Sources: sources,
+			Sources: []*pbauth.Source{{
+				IdentityName: "static-client",
+				Namespace:    namespace,
+			}},
 		}},
 	})
-
 	v2TrafficPerms := sprawltest.MustSetResourceData(t, &pbresource.Resource{
 		Id: &pbresource.ID{
 			Type:    pbauth.TrafficPermissionsType,
@@ -292,7 +258,10 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 		},
 		Action: pbauth.Action_ACTION_ALLOW,
 		Permissions: []*pbauth.Permission{{
-			Sources: sources,
+			Sources: []*pbauth.Source{{
+				IdentityName: "static-client",
+				Namespace:    namespace,
+			}},
 		}},
 	})
 
@@ -381,7 +350,6 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 			},
 		}},
 	})
-
 	grpcServerRoute := sprawltest.MustSetResourceData(t, &pbresource.Resource{
 		Id: &pbresource.ID{
 			Type:    pbmesh.GRPCRouteType,
@@ -422,7 +390,6 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 			},
 		}},
 	})
-
 	tcpServerRoute := sprawltest.MustSetResourceData(t, &pbresource.Resource{
 		Id: &pbresource.ID{
 			Type:    pbmesh.TCPRouteType,
@@ -475,7 +442,7 @@ func (c testSplitterFeaturesL7ExplicitDestinationsCreator) topologyConfigAddNode
 		v1TrafficPerms,
 		v2TrafficPerms,
 		httpServerRoute,
-		grpcServerRoute,
 		tcpServerRoute,
+		grpcServerRoute,
 	)
 }
diff --git a/test-integ/connect/snapshot_test.go b/test-integ/connect/snapshot_test.go
index 5a7a4a342c250..1e8d5f18c2d78 100644
--- a/test-integ/connect/snapshot_test.go
+++ b/test-integ/connect/snapshot_test.go
@@ -6,17 +6,17 @@ package connect
 import (
 	"testing"
 
-	"github.com/stretchr/testify/require"
-
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/test-integ/topoutil"
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 	"github.com/hashicorp/consul/testing/deployer/sprawl/sprawltest"
 	"github.com/hashicorp/consul/testing/deployer/topology"
+	"github.com/stretchr/testify/require"
+
+	"github.com/hashicorp/consul/test-integ/topoutil"
 )
 
 // Test_Snapshot_Restore_Agentless verifies consul agent can continue
-// to push envoy config after restoring from a snapshot.
+// to push envoy confgi after restoring from a snapshot.
 //
 //   - This test is to detect server agent frozen after restoring from a snapshot
 //     (https://github.com/hashicorp/consul/pull/18636)
@@ -164,7 +164,7 @@ func Test_Snapshot_Restore_Agentless(t *testing.T) {
 	asserter.HTTPStatus(t, staticServer, staticServer.Port, 200)
 
 	t.Log("Take a snapshot of the cluster and restore ...")
-	err := sp.SnapshotSaveAndRestore("dc1")
+	err := sp.SnapshotSave("dc1")
 	require.NoError(t, err)
 
 	// Shutdown existing static-server
diff --git a/test-integ/go.mod b/test-integ/go.mod
index 740a1f033736e..19ef1173388d4 100644
--- a/test-integ/go.mod
+++ b/test-integ/go.mod
@@ -43,13 +43,11 @@ require (
 	github.com/evanphx/json-patch v4.12.0+incompatible // indirect
 	github.com/fatih/color v1.14.1 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-test/deep v1.1.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/consul v1.16.1 // indirect
 	github.com/hashicorp/consul-server-connection-manager v0.1.4 // indirect
@@ -69,7 +67,6 @@ require (
 	github.com/hashicorp/memberlist v0.5.0 // indirect
 	github.com/hashicorp/serf v0.10.1 // indirect
 	github.com/itchyny/timefmt-go v0.1.5 // 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/mattn/go-colorable v0.1.13 // indirect
@@ -83,8 +80,6 @@ require (
 	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/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0-rc4 // indirect
@@ -110,15 +105,7 @@ require (
 	golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/inf.v0 v0.9.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/klog/v2 v2.100.1 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
 replace (
diff --git a/test-integ/go.sum b/test-integ/go.sum
index 19c23d6b3be56..898d5bb8226ee 100644
--- a/test-integ/go.sum
+++ b/test-integ/go.sum
@@ -77,9 +77,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 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-logr/logr v1.2.0/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-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/go-test/deep v1.1.0 h1:WOcxcdHcvdgThNXjw0t76K42FXTU7HpNQWHpA2HHNlg=
 github.com/go-test/deep v1.1.0/go.mod h1:5C2ZWiW0ErCdrYzpqxLbTX7MG14M9iiw8DgHncVwcsE=
@@ -102,8 +99,6 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 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/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/consul-server-connection-manager v0.1.4 h1:wrcSRV6WGXFBNpNbN6XsdoGgBOyso7ZbN5VaWPEX1jY=
@@ -160,8 +155,6 @@ github.com/itchyny/timefmt-go v0.1.5 h1:G0INE2la8S6ru/ZI5JecgyzbbJNs5lG1RcBqa7Jm
 github.com/itchyny/timefmt-go v0.1.5/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/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 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=
@@ -220,12 +213,9 @@ 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/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -283,7 +273,6 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx
 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/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 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=
@@ -403,29 +392,11 @@ gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLks
 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/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 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.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.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=
-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/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
-k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/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=
diff --git a/test-integ/tenancy/client.go b/test-integ/tenancy/client.go
deleted file mode 100644
index a3152b7625874..0000000000000
--- a/test-integ/tenancy/client.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tenancy
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"github.com/stretchr/testify/require"
-	"google.golang.org/grpc/codes"
-	"google.golang.org/grpc/metadata"
-	"google.golang.org/grpc/status"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/hashicorp/consul/sdk/testutil/retry"
-)
-
-// This duplicates a subset of internal/resource/resourcetest/client.go so
-// we're not importing consul internals integration tests.
-//
-// TODO: Move to a general package if used more widely.
-
-type ClientOption func(*Client)
-
-func WithACLToken(token string) ClientOption {
-	return func(c *Client) {
-		c.token = token
-	}
-}
-
-// Client decorates a resource service client with helper functions to assist
-// with integration testing.
-type Client struct {
-	pbresource.ResourceServiceClient
-
-	timeout time.Duration
-	wait    time.Duration
-	token   string
-}
-
-func NewClient(client pbresource.ResourceServiceClient, opts ...ClientOption) *Client {
-	c := &Client{
-		ResourceServiceClient: client,
-		timeout:               7 * time.Second,
-		wait:                  50 * time.Millisecond,
-	}
-
-	for _, opt := range opts {
-		opt(c)
-	}
-
-	return c
-}
-
-func NewClientWithACLToken(client pbresource.ResourceServiceClient, token string) *Client {
-	return NewClient(client, WithACLToken(token))
-}
-
-func (client *Client) SetRetryerConfig(timeout time.Duration, wait time.Duration) {
-	client.timeout = timeout
-	client.wait = wait
-}
-
-func (client *Client) retry(t testutil.TestingTB, fn func(r *retry.R)) {
-	t.Helper()
-	retryer := &retry.Timer{Timeout: client.timeout, Wait: client.wait}
-	retry.RunWith(retryer, t, fn)
-}
-
-func (client *Client) Context(t testutil.TestingTB) 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 testutil.TestingTB, 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 testutil.TestingTB, 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, ToGVK(id.Type))
-	require.NotNil(t, rsp)
-	return rsp.Resource
-}
-
-func ToGVK(resourceType *pbresource.Type) string {
-	return fmt.Sprintf("%s.%s.%s", resourceType.Group, resourceType.GroupVersion, resourceType.Kind)
-}
-
-func (client *Client) WaitForResourceExists(t testutil.TestingTB, id *pbresource.ID) *pbresource.Resource {
-	t.Helper()
-
-	var res *pbresource.Resource
-	client.retry(t, func(r *retry.R) {
-		res = client.RequireResourceExists(r, id)
-	})
-
-	return res
-}
-
-func (client *Client) WaitForDeletion(t testutil.TestingTB, id *pbresource.ID) {
-	t.Helper()
-
-	client.retry(t, func(r *retry.R) {
-		client.RequireResourceNotFound(r, id)
-	})
-}
-
-// MustDelete will delete a resource by its id, retrying if necessary and fail the test
-// if it cannot delete it within the timeout. The clients request delay settings are
-// taken into account with this operation.
-func (client *Client) MustDelete(t testutil.TestingTB, id *pbresource.ID) {
-	t.Helper()
-	client.retryDelete(t, id)
-}
-
-func (client *Client) retryDelete(t testutil.TestingTB, 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/test-integ/tenancy/common.go b/test-integ/tenancy/common.go
deleted file mode 100644
index 4fea2c472b5a3..0000000000000
--- a/test-integ/tenancy/common.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package tenancy
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	pbcatalog "github.com/hashicorp/consul/proto-public/pbcatalog/v2beta1"
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-	"github.com/hashicorp/consul/test-integ/topoutil"
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/sprawltest"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-const (
-	DefaultNamespaceName = "default"
-	DefaultPartitionName = "default"
-)
-
-func newConfig(t *testing.T) *topology.Config {
-	const clusterName = "cluster1"
-	servers := topoutil.NewTopologyServerSet(clusterName+"-server", 3, []string{clusterName}, nil)
-
-	cluster := &topology.Cluster{
-		Enterprise:      utils.IsEnterprise(),
-		Name:            clusterName,
-		Nodes:           servers,
-		EnableV2:        true,
-		EnableV2Tenancy: true,
-	}
-
-	return &topology.Config{
-		Images:   utils.TargetImages(),
-		Networks: []*topology.Network{{Name: clusterName}},
-		Clusters: []*topology.Cluster{cluster},
-	}
-}
-
-func createNamespaces(t *testing.T, resourceServiceClient *Client, numNamespaces int, ap string) []*pbresource.Resource {
-	namespaces := []*pbresource.Resource{}
-	for i := 0; i < numNamespaces; i++ {
-		namespace := &pbresource.Resource{
-			Id: &pbresource.ID{
-				Name:    fmt.Sprintf("namespace-%d", i),
-				Type:    pbtenancy.NamespaceType,
-				Tenancy: &pbresource.Tenancy{Partition: ap},
-			},
-		}
-		rsp, err := resourceServiceClient.Write(context.Background(), &pbresource.WriteRequest{Resource: namespace})
-		require.NoError(t, err)
-		namespace = resourceServiceClient.WaitForResourceExists(t, rsp.Resource.Id)
-		namespaces = append(namespaces, namespace)
-	}
-	return namespaces
-}
-
-func createServices(t *testing.T, resourceServiceClient *Client, numServices int, ap string, ns string) []*pbresource.Resource {
-	services := []*pbresource.Resource{}
-	for i := 0; i < numServices; i++ {
-		service := &pbresource.Resource{
-			Id: &pbresource.ID{
-				Name:    fmt.Sprintf("service-%d", i),
-				Type:    pbcatalog.ServiceType,
-				Tenancy: &pbresource.Tenancy{Partition: ap, Namespace: ns},
-			},
-		}
-		service = sprawltest.MustSetResourceData(t, service, &pbcatalog.Service{
-			Workloads: &pbcatalog.WorkloadSelector{},
-			Ports:     []*pbcatalog.ServicePort{},
-		})
-		rsp, err := resourceServiceClient.Write(context.Background(), &pbresource.WriteRequest{Resource: service})
-		require.NoError(t, err)
-		service = resourceServiceClient.WaitForResourceExists(t, rsp.Resource.Id)
-		services = append(services, service)
-	}
-	return services
-}
diff --git a/test-integ/tenancy/namespace_ce_test.go b/test-integ/tenancy/namespace_ce_test.go
deleted file mode 100644
index 5f82436c9c852..0000000000000
--- a/test-integ/tenancy/namespace_ce_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-//go:build !consulent
-
-package tenancy
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/proto-public/pbresource"
-	pbtenancy "github.com/hashicorp/consul/proto-public/pbtenancy/v2beta1"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/sprawltest"
-)
-
-// TestNamespaceLifecycle sets up the following:
-//
-// - 1 cluster
-// - 3 servers in that cluster
-// - v2 resources and v2 tenancy are activated
-//
-// When this test is executed it tests the full lifecycle for a
-// small number of namespaces:
-// - creation of namespaces in the default partition
-// - populating resources under namespaces
-// - finally deleting everything
-func TestNamespaceLifecycle(t *testing.T) {
-	t.Parallel()
-
-	cfg := newConfig(t)
-	sp := sprawltest.Launch(t, cfg)
-	cluster := sp.Topology().Clusters["cluster1"]
-	client := NewClient(sp.ResourceServiceClientForCluster(cluster.Name))
-
-	// 3 namespaces
-	// @ 3 services per namespace
-	// ==============================
-	// 9 resources total
-	tenants := []*pbresource.Resource{}
-	numNamespaces := 3
-	numServices := 3
-
-	// Default namespace is expected to exist
-	// when we boostrap a cluster
-	client.RequireResourceExists(t, &pbresource.ID{
-		Name:    DefaultNamespaceName,
-		Type:    pbtenancy.NamespaceType,
-		Tenancy: &pbresource.Tenancy{Partition: DefaultPartitionName},
-	})
-
-	// Namespaces are created in default partition
-	namespaces := createNamespaces(t, client, numNamespaces, DefaultPartitionName)
-
-	for _, namespace := range namespaces {
-		services := createServices(t, client, numServices, DefaultPartitionName, namespace.Id.Name)
-		tenants = append(tenants, services...)
-	}
-
-	// Verify test setup
-	require.Equal(t, len(tenants), numNamespaces*numServices)
-
-	// List namespaces
-	listRsp, err := client.List(client.Context(t), &pbresource.ListRequest{
-		Type:       pbtenancy.NamespaceType,
-		Tenancy:    &pbresource.Tenancy{},
-		NamePrefix: "namespace-",
-	})
-	require.NoError(t, err)
-	require.Equal(t, len(namespaces), len(listRsp.Resources))
-
-	// Delete all namespaces
-	for _, namespace := range namespaces {
-		_, err := client.Delete(client.Context(t), &pbresource.DeleteRequest{Id: namespace.Id})
-		require.NoError(t, err)
-		client.WaitForDeletion(t, namespace.Id)
-	}
-
-	// Make sure no namespace tenants left behind
-	for _, tenant := range tenants {
-		client.RequireResourceNotFound(t, tenant.Id)
-	}
-}
diff --git a/test-integ/topoutil/asserter.go b/test-integ/topoutil/asserter.go
index 091ba2379705a..1cc7243dc3cad 100644
--- a/test-integ/topoutil/asserter.go
+++ b/test-integ/topoutil/asserter.go
@@ -14,7 +14,6 @@ import (
 
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/proto-public/pbresource"
-	"github.com/hashicorp/consul/sdk/testutil"
 	"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"
@@ -53,13 +52,13 @@ func NewAsserter(sp SprawlLite) *Asserter {
 	}
 }
 
-func (a *Asserter) mustGetHTTPClient(t testutil.TestingTB, cluster string) *http.Client {
+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 testutil.TestingTB, cluster string) *api.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)
@@ -209,7 +208,7 @@ type testingT interface {
 //
 // We treat 400, 503, and 504s as retryable errors
 func (a *Asserter) fortioFetch2Destination(
-	t testutil.TestingTB,
+	t testingT,
 	client *http.Client,
 	addr string,
 	dest *topology.Destination,
diff --git a/test-integ/upgrade/usage_profiles/sd_wan_segments_test.go b/test-integ/upgrade/usage_profiles/sd_wan_segments_test.go
deleted file mode 100644
index 98a0873c17343..0000000000000
--- a/test-integ/upgrade/usage_profiles/sd_wan_segments_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package usage_profiles
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
-	"github.com/hashicorp/consul/testing/deployer/sprawl"
-	"github.com/hashicorp/consul/testing/deployer/sprawl/sprawltest"
-	"github.com/hashicorp/consul/testing/deployer/topology"
-)
-
-const (
-	// The long term support version
-	ltsVersion = "1.15.7"
-)
-
-// Test_Upgrade_ServiceDiscovery_Wan_Segment test upgrade from a source version
-// to a specified long term support version
-// Clusters: multi-segment and multi-cluster (TODO)
-// Workload: service discovery (no mesh) (TODO)
-func Test_Upgrade_ServiceDiscovery_Wan_Segment(t *testing.T) {
-	utils.LatestVersion = "1.10.8"
-	utils.TargetVersion = ltsVersion
-
-	dc1, err := createTopology("dc1")
-	require.NoError(t, err)
-	t.Log("Created topology:", dc1.Name, "enterprise:", utils.IsEnterprise())
-
-	toplogyConfig := &topology.Config{
-		Networks: []*topology.Network{
-			{Name: "dc1"},
-		},
-	}
-	toplogyConfig.Clusters = append(toplogyConfig.Clusters, dc1)
-	sp := sprawltest.Launch(t, toplogyConfig)
-
-	cfg := sp.Config()
-	require.NoError(t, sp.Upgrade(cfg, "dc1", sprawl.UpgradeTypeStandard, utils.TargetImages(), nil))
-	t.Log("Finished standard upgrade ...")
-
-	time.Sleep(30 * time.Second)
-}
-
-func createTopology(name string) (*topology.Cluster, error) {
-	clu := &topology.Cluster{
-		Name:   name,
-		Images: utils.LatestImages(),
-		Nodes: []*topology.Node{
-			{
-				Kind: topology.NodeKindServer,
-				Name: "dc1-server1",
-				Addresses: []*topology.Address{
-					{Network: "dc1"},
-				},
-			},
-			{
-				Kind: topology.NodeKindClient,
-				Name: "dc1-client1",
-			},
-		},
-		Enterprise: utils.IsEnterprise(),
-	}
-	return clu, nil
-}
diff --git a/test/integration/consul-container/go.mod b/test/integration/consul-container/go.mod
index 357a588ee0eab..034722c074db7 100644
--- a/test/integration/consul-container/go.mod
+++ b/test/integration/consul-container/go.mod
@@ -55,18 +55,15 @@ require (
 	github.com/containerd/containerd v1.7.3 // indirect
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
-	github.com/deckarep/golang-set/v2 v2.3.1 // indirect
 	github.com/docker/distribution v2.8.2+incompatible // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/envoyproxy/go-control-plane v0.11.1 // indirect
 	github.com/envoyproxy/protoc-gen-validate v1.0.1 // indirect
 	github.com/fatih/color v1.14.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/google/btree v1.0.1 // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/consul-net-rpc v0.0.0-20221205195236-156cfab66a69 // indirect
 	github.com/hashicorp/consul-server-connection-manager v0.1.4 // indirect
@@ -85,7 +82,6 @@ require (
 	github.com/hashicorp/raft-autopilot v0.1.6 // indirect
 	github.com/hashicorp/yamux v0.0.0-20211028200310-0bc27b27de87 // indirect
 	github.com/itchyny/timefmt-go v0.1.5 // 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/mattn/go-colorable v0.1.13 // indirect
@@ -99,8 +95,6 @@ require (
 	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/oklog/ulid/v2 v2.1.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
@@ -130,15 +124,7 @@ require (
 	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/protobuf v1.31.0 // indirect
-	gopkg.in/inf.v0 v0.9.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/klog/v2 v2.100.1 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
 replace (
diff --git a/test/integration/consul-container/go.sum b/test/integration/consul-container/go.sum
index 04fcd47386927..9443bb1e74324 100644
--- a/test/integration/consul-container/go.sum
+++ b/test/integration/consul-container/go.sum
@@ -116,8 +116,6 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 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/deckarep/golang-set/v2 v2.3.1 h1:vjmkvJt/IV27WXPyYQpAh4bRyWJc5Y435D17XQ9QU5A=
-github.com/deckarep/golang-set/v2 v2.3.1/go.mod h1:VAky9rY/yGXJOLEDv3OMci+7wtDpOF4IN+y82NBOac4=
 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=
@@ -154,9 +152,6 @@ github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2
 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-logr/logr v1.2.0/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-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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -208,7 +203,6 @@ 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/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -306,8 +300,6 @@ github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHW
 github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U=
 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=
@@ -371,12 +363,9 @@ 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/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
@@ -439,7 +428,6 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 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=
@@ -815,16 +803,12 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8
 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/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/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.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -836,19 +820,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh
 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/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
-k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/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-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/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=
diff --git a/test/integration/consul-container/libs/assert/grpc.go b/test/integration/consul-container/libs/assert/grpc.go
index 101d1c14109ef..a41ef65af620e 100644
--- a/test/integration/consul-container/libs/assert/grpc.go
+++ b/test/integration/consul-container/libs/assert/grpc.go
@@ -26,7 +26,7 @@ func GRPCPing(t *testing.T, addr string) {
 	var msg *fgrpc.PingMessage
 	retries := 0
 	retry.RunWith(&retry.Timer{Timeout: time.Minute, Wait: 25 * time.Millisecond}, t, func(r *retry.R) {
-		r.Logf("making grpc call to %s", addr)
+		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
diff --git a/test/integration/consul-container/libs/assert/service.go b/test/integration/consul-container/libs/assert/service.go
index 726731dcc0edb..7434a1d5e36fc 100644
--- a/test/integration/consul-container/libs/assert/service.go
+++ b/test/integration/consul-container/libs/assert/service.go
@@ -221,7 +221,7 @@ func doHTTPServiceEchoesWithClient(
 	}
 
 	retry.RunWith(failer(), t, func(r *retry.R) {
-		r.Logf("making call to %s", url)
+		t.Logf("making call to %s", url)
 
 		reader := strings.NewReader(phrase)
 		req, err := http.NewRequest("POST", url, reader)
@@ -242,7 +242,7 @@ func doHTTPServiceEchoesWithClient(
 		defer res.Body.Close()
 
 		statusCode := res.StatusCode
-		r.Logf("...got response code %d", statusCode)
+		t.Logf("...got response code %d", statusCode)
 		require.Equal(r, 200, statusCode)
 
 		body, err := io.ReadAll(res.Body)
@@ -342,7 +342,7 @@ func WaitForFortioNameWithClient(t *testing.T, r retry.Retryer, urlbase string,
 // It retries with timeout defaultHTTPTimeout and wait defaultHTTPWait.
 //
 // client must be a custom http.Client
-func FortioNameWithClient(t retry.TestingTB, urlbase string, name string, reqHost string, client *http.Client) (string, error) {
+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
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
index ea2e874162c48..cf00105345fa4 100644
--- a/test/integration/consul-container/test/envoy_extensions/ext_authz_test.go
+++ b/test/integration/consul-container/test/envoy_extensions/ext_authz_test.go
@@ -15,7 +15,6 @@ import (
 	"github.com/testcontainers/testcontainers-go"
 
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil"
 	"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"
@@ -88,8 +87,8 @@ func TestExtAuthzLocal(t *testing.T) {
 	// 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)
-	retryRequest(t, baseURL, http.StatusForbidden)
-	retryRequest(t, baseURL+"/allow", http.StatusOK)
+	doRequest(t, baseURL, http.StatusForbidden)
+	doRequest(t, baseURL+"/allow", http.StatusOK)
 }
 
 func createServices(t *testing.T, cluster *libcluster.Cluster) libservice.Service {
@@ -162,16 +161,10 @@ func createLocalAuthzService(t *testing.T, cluster *libcluster.Cluster) {
 	}
 }
 
-func retryRequest(t *testing.T, url string, expStatus int) {
-	t.Helper()
+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) {
-		doRequest(r, url, expStatus)
+		resp, err := cleanhttp.DefaultClient().Get(url)
+		require.NoError(r, err)
+		require.Equal(r, expStatus, resp.StatusCode)
 	})
 }
-
-func doRequest(t testutil.TestingTB, url string, expStatus int) {
-	t.Helper()
-	resp, err := cleanhttp.DefaultClient().Get(url)
-	require.NoError(t, err)
-	require.Equal(t, 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
index e684bdbcc832e..87bb7b4d6165f 100644
--- 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
@@ -40,6 +40,8 @@ import (
 //   - 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,
@@ -85,9 +87,8 @@ func TestOTELAccessLogging(t *testing.T) {
 
 	// 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.Run(t, func(r *retry.R) {
-		doRequest(r, fmt.Sprintf("http://localhost:%d", port), http.StatusOK)
-
+	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)
@@ -95,10 +96,7 @@ func TestOTELAccessLogging(t *testing.T) {
 		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)`)
-	},
-		retry.WithFullOutput(),
-		retry.WithRetryer(&retry.Timer{Timeout: 60 * time.Second, Wait: time.Second}),
-	)
+	})
 }
 
 func createLocalOTELService(t *testing.T, cluster *libcluster.Cluster) *libcluster.LaunchInfo {
diff --git a/test/integration/consul-container/test/gateways/terminating_gateway_test.go b/test/integration/consul-container/test/gateways/terminating_gateway_test.go
index 3ac130a546cd0..ef8f95ab82920 100644
--- a/test/integration/consul-container/test/gateways/terminating_gateway_test.go
+++ b/test/integration/consul-container/test/gateways/terminating_gateway_test.go
@@ -173,12 +173,12 @@ func assertHTTPRequestToServiceAddress(t *testing.T, client *libservice.ConnectC
 	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})
-		r.Logf("curl request to upstream service address: url=%s\nerr = %v\nout = %s", upstreamURL, err, out)
+		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))
-			r.Logf("successfuly messaged %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/ratelimit/ratelimit_test.go b/test/integration/consul-container/test/ratelimit/ratelimit_test.go
index e0b85a17d1860..89293da7f8ee6 100644
--- a/test/integration/consul-container/test/ratelimit/ratelimit_test.go
+++ b/test/integration/consul-container/test/ratelimit/ratelimit_test.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/sdk/testutil/retry"
 	"github.com/stretchr/testify/require"
 
@@ -283,7 +282,7 @@ func setupClusterAndClient(t *testing.T, config *libtopology.ClusterConfig, isSe
 	return cluster, client
 }
 
-func checkForMetric(t testutil.TestingTB, cluster *libcluster.Cluster, operationName string, expectedLimitType string, expectedMode string, expectMetric bool) {
+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)
@@ -321,7 +320,7 @@ func checkForMetric(t testutil.TestingTB, cluster *libcluster.Cluster, operation
 	}
 }
 
-func checkLogsForMessage(t testutil.TestingTB, logs []string, msg string, operationName string, logType string, logShouldExist bool) {
+func checkLogsForMessage(t require.TestingT, logs []string, msg string, operationName string, logType string, logShouldExist bool) {
 	if logShouldExist {
 		found := false
 		for _, log := range logs {
diff --git a/test/integration/consul-container/test/tproxy/tproxy_test.go b/test/integration/consul-container/test/tproxy/tproxy_test.go
index 1f962aeba277d..15eae0c210906 100644
--- a/test/integration/consul-container/test/tproxy/tproxy_test.go
+++ b/test/integration/consul-container/test/tproxy/tproxy_test.go
@@ -136,7 +136,7 @@ func assertHTTPRequestToVirtualAddress(t *testing.T, clientService libservice.Se
 			`, virtualHostname),
 			},
 		)
-		r.Logf("curl request to upstream virtual address\nerr = %v\nout = %s", err, out)
+		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))
@@ -155,7 +155,7 @@ func assertHTTPRequestToServiceAddress(t *testing.T, client, server libcluster.A
 	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})
-		r.Logf("curl request to upstream service address: url=%s\nerr = %v\nout = %s", upstreamURL, err, out)
+		t.Logf("curl request to upstream service address: url=%s\nerr = %v\nout = %s", upstreamURL, err, out)
 
 		if expSuccess {
 			require.NoError(r, err)
diff --git a/test/integration/consul-container/test/upgrade/catalog/catalog_test.go b/test/integration/consul-container/test/upgrade/catalog/catalog_test.go
index c29e4b499f868..ae8ed0401a8ff 100644
--- a/test/integration/consul-container/test/upgrade/catalog/catalog_test.go
+++ b/test/integration/consul-container/test/upgrade/catalog/catalog_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/hashicorp/consul/test/integration/consul-container/libs/utils"
 )
 
-var minCatalogResourceVersion = version.Must(version.NewVersion("v1.18.0"))
+var minCatalogResourceVersion = version.Must(version.NewVersion("v1.17.0"))
 
 const (
 	versionUndetermined = `
diff --git a/testing/deployer/go.mod b/testing/deployer/go.mod
index a78df479dd3d5..e79223effb607 100644
--- a/testing/deployer/go.mod
+++ b/testing/deployer/go.mod
@@ -6,14 +6,13 @@ require (
 	github.com/avast/retry-go v3.0.0+incompatible
 	github.com/google/go-cmp v0.5.9
 	github.com/hashicorp/consul-server-connection-manager v0.1.4
-	github.com/hashicorp/consul/api v1.26.1
-	github.com/hashicorp/consul/proto-public v0.5.1
+	github.com/hashicorp/consul/api v1.24.0
+	github.com/hashicorp/consul/proto-public v0.1.0
 	github.com/hashicorp/consul/sdk v0.15.0
 	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/go-rootcerts v1.0.2
-	github.com/hashicorp/go-version v1.2.1
 	github.com/hashicorp/hcl/v2 v2.16.2
 	github.com/mitchellh/copystructure v1.2.0
 	github.com/rboyer/safeio v0.2.2
@@ -21,7 +20,7 @@ require (
 	golang.org/x/crypto v0.14.0
 	golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
 	google.golang.org/grpc v1.56.3
-	google.golang.org/protobuf v1.30.0
+	google.golang.org/protobuf v1.31.0
 )
 
 require (
@@ -33,17 +32,14 @@ require (
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/fatih/color v1.14.1 // indirect
-	github.com/go-logr/logr v1.2.4 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-netaddrs v0.1.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/serf v0.10.1 // indirect
-	github.com/json-iterator/go v1.1.12 // 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.1 // indirect
@@ -51,8 +47,6 @@ require (
 	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/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 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/prometheus/client_golang v1.11.1 // indirect
@@ -64,15 +58,7 @@ require (
 	golang.org/x/sys v0.13.0 // indirect
 	golang.org/x/text v0.13.0 // indirect
 	google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
-	gopkg.in/inf.v0 v0.9.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/klog/v2 v2.100.1 // indirect
-	k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 // indirect
-	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
 
 replace (
diff --git a/testing/deployer/go.sum b/testing/deployer/go.sum
index c0814ddaebd86..abb76fa0a7f39 100644
--- a/testing/deployer/go.sum
+++ b/testing/deployer/go.sum
@@ -44,14 +44,9 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb
 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-logr/logr v1.2.0/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-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/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 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=
@@ -75,8 +70,6 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 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/hashicorp/consul-server-connection-manager v0.1.4 h1:wrcSRV6WGXFBNpNbN6XsdoGgBOyso7ZbN5VaWPEX1jY=
 github.com/hashicorp/consul-server-connection-manager v0.1.4/go.mod h1:LMqHkALoLP0HUQKOG21xXYr0YPUayIQIHNTlmxG100E=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
@@ -126,12 +119,8 @@ github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCV
 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 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 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/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/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.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
@@ -174,12 +163,9 @@ github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RR
 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 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/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/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
@@ -225,7 +211,6 @@ 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/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
-github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 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=
@@ -236,21 +221,16 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F
 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/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 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.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
 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/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-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -258,9 +238,7 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 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-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/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.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
@@ -270,7 +248,6 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 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-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/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -290,7 +267,6 @@ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/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-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-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -312,13 +288,8 @@ golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.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/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 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/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 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=
@@ -332,34 +303,16 @@ google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzi
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 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.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-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
-gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
 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.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 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-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/klog/v2 v2.100.1 h1:7WCHKK6K8fNhTqfBhISHQ97KrnJNFZMcQvKp7gP/tmg=
-k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2 h1:qY1Ad8PODbnymg2pRbkyMT/ylpTrCM8P2RJ0yroCyIk=
-k8s.io/utils v0.0.0-20230406110748-d93618cff8a2/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
-sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/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=
diff --git a/testing/deployer/sprawl/acl.go b/testing/deployer/sprawl/acl.go
index 92f4701840d94..99179ac58664d 100644
--- a/testing/deployer/sprawl/acl.go
+++ b/testing/deployer/sprawl/acl.go
@@ -146,56 +146,6 @@ func (s *Sprawl) createAnonymousPolicy(cluster *topology.Cluster) error {
 	return nil
 }
 
-// assignAgentJoinPolicyToAnonymousToken is used only for version prior to agent token
-func (s *Sprawl) assignAgentJoinPolicyToAnonymousToken(cluster *topology.Cluster) error {
-	var (
-		client = s.clients[cluster.Name]
-	)
-
-	acl := client.ACL()
-	anonymousTok, _, err := acl.TokenRead(anonymousTokenAccessorID, &api.QueryOptions{})
-	if err != nil {
-		return nil
-	}
-
-	rule := `
-service_prefix "" {
-	policy = "read"
-}
-	
-agent_prefix "" {
-	policy = "read"
-}
-	
-node_prefix "" {
-	policy = "write"
-}
-`
-	policy, _, err := acl.PolicyCreate(
-		&api.ACLPolicy{
-			Name:  "client-join-policy",
-			Rules: rule,
-		},
-		&api.WriteOptions{},
-	)
-
-	if err != nil {
-		return err
-	}
-
-	anonymousTok.Policies = append(anonymousTok.Policies,
-		&api.ACLLink{
-			Name: policy.Name,
-		},
-	)
-	_, _, err = acl.TokenUpdate(anonymousTok, &api.WriteOptions{})
-	if err != nil {
-		return nil
-	}
-
-	return nil
-}
-
 func (s *Sprawl) createAgentTokens(cluster *topology.Cluster) error {
 	var (
 		client = s.clients[cluster.Name]
@@ -208,20 +158,18 @@ func (s *Sprawl) createAgentTokens(cluster *topology.Cluster) error {
 			continue
 		}
 
-		if node.Images.GreaterThanVersion(topology.MinVersionAgentTokenPartition) {
-			if tok := s.secrets.ReadAgentToken(cluster.Name, node.ID()); tok == "" {
-				token, err := CreateOrUpdateToken(client, tokenForNode(node, cluster.Enterprise))
-				if err != nil {
-					return fmt.Errorf("node %s: %w", node.Name, err)
-				}
+		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,
-				)
+			logger.Debug("created agent token",
+				"node", node.ID(),
+				"token", token.SecretID,
+			)
 
-				s.secrets.SaveAgentToken(cluster.Name, node.ID(), token.SecretID)
-			}
+			s.secrets.SaveAgentToken(cluster.Name, node.ID(), token.SecretID)
 		}
 	}
 
diff --git a/testing/deployer/sprawl/boot.go b/testing/deployer/sprawl/boot.go
index 38407d50ae806..b8b123482e259 100644
--- a/testing/deployer/sprawl/boot.go
+++ b/testing/deployer/sprawl/boot.go
@@ -266,7 +266,7 @@ func (s *Sprawl) initConsulServers() error {
 		s.waitForLocalWrites(cluster, mgmtToken)
 
 		// Create tenancies so that the ACL tokens and clients have somewhere to go.
-		if cluster.Enterprise && node.Images.GreaterThanVersion(topology.MinVersionAgentTokenPartition) {
+		if cluster.Enterprise {
 			if err := s.initTenancies(cluster); err != nil {
 				return fmt.Errorf("initTenancies[%s]: %w", cluster.Name, err)
 			}
@@ -287,19 +287,12 @@ func (s *Sprawl) initConsulServers() error {
 			return fmt.Errorf("createAnonymousToken[%s]: %w", cluster.Name, err)
 		}
 
-		if node.Images.GreaterThanVersion(topology.MinVersionAgentTokenPartition) {
-			// 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)
-			}
-		} else {
-			// Assign agent join policy to the anonymous token
-			if err := s.assignAgentJoinPolicyToAnonymousToken(cluster); err != nil {
-				return fmt.Errorf("assignAgentJoinPolicyToAnonymousToken[%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)
 		}
 	}
 
@@ -494,8 +487,7 @@ func (s *Sprawl) waitForLocalWrites(cluster *topology.Cluster, token string) {
 		break
 	}
 
-	serverNodes := cluster.ServerNodes()
-	if cluster.Enterprise && serverNodes[0].Images.GreaterThanVersion(topology.MinVersionAgentTokenPartition) {
+	if cluster.Enterprise {
 		start = time.Now()
 		for attempts := 0; ; attempts++ {
 			if err := tryAP(); err != nil {
@@ -551,7 +543,7 @@ func (s *Sprawl) waitForClientAntiEntropyOnce(cluster *topology.Cluster) error {
 			nid := node.CatalogID()
 
 			got, ok := current[nid]
-			if ok && (len(got.TaggedAddresses) > 0 || got.Address != "") {
+			if ok && len(got.TaggedAddresses) > 0 {
 				// this is a field that is not updated just due to serf reconcile
 				continue
 			}
diff --git a/testing/deployer/sprawl/catalog.go b/testing/deployer/sprawl/catalog.go
index bde3c9a266760..59a42fd895eac 100644
--- a/testing/deployer/sprawl/catalog.go
+++ b/testing/deployer/sprawl/catalog.go
@@ -343,7 +343,16 @@ func (s *Sprawl) registerCatalogNode(
 	node *topology.Node,
 ) error {
 	if node.IsV2() {
-		return s.registerCatalogNodeV2(cluster, node)
+
+		// TODO(rb): nodes are optional in v2 and won't be used in k8s by
+		// default. There are some scoping issues with the Node Type in 1.17 so
+		// disable it for now.
+		//
+		// To re-enable you also need to link it to the Workload by setting the
+		// NodeName field.
+		//
+		// return s.registerCatalogNodeV2(cluster, node)
+		return nil
 	}
 	return s.registerCatalogNodeV1(cluster, node)
 }
@@ -373,6 +382,7 @@ func (s *Sprawl) registerCatalogNodeV2(
 				Name: node.PodName(),
 				Tenancy: &pbresource.Tenancy{
 					Partition: node.Partition,
+					Namespace: "default", // temporary requirement
 				},
 			},
 			Metadata: map[string]string{
@@ -713,7 +723,8 @@ func workloadInstanceToResources(
 				Metadata: wrk.Meta,
 			},
 			Data: &pbcatalog.Workload{
-				NodeName: node.PodName(),
+				// TODO(rb): disabling this until node scoping makes sense again
+				// NodeName: node.PodName(),
 				Identity: wrk.WorkloadIdentity,
 				Ports:    wlPorts,
 				Addresses: []*pbcatalog.WorkloadAddress{
diff --git a/testing/deployer/sprawl/internal/tfgen/agent.go b/testing/deployer/sprawl/internal/tfgen/agent.go
index db68a60b61e20..36071624bf203 100644
--- a/testing/deployer/sprawl/internal/tfgen/agent.go
+++ b/testing/deployer/sprawl/internal/tfgen/agent.go
@@ -13,7 +13,7 @@ import (
 	"github.com/hashicorp/consul/testing/deployer/topology"
 )
 
-func (g *Generator) generateAgentHCL(node *topology.Node, enableV2, enableV2Tenancy bool) string {
+func (g *Generator) generateAgentHCL(node *topology.Node, enableV2 bool) string {
 	if !node.IsAgent() {
 		panic("generateAgentHCL only applies to agents")
 	}
@@ -35,15 +35,8 @@ func (g *Generator) generateAgentHCL(node *topology.Node, enableV2, enableV2Tena
 	b.add("enable_debug", true)
 	b.add("use_streaming_backend", true)
 
-	var experiments []string
 	if enableV2 {
-		experiments = append(experiments, "resource-apis")
-	}
-	if enableV2Tenancy {
-		experiments = append(experiments, "v2tenancy")
-	}
-	if len(experiments) > 0 {
-		b.addSlice("experiments", experiments)
+		b.addSlice("experiments", []string{"resource-apis"})
 	}
 
 	// speed up leaves
@@ -60,12 +53,10 @@ func (g *Generator) generateAgentHCL(node *topology.Node, enableV2, enableV2Tena
 	b.add("retry_interval", "1s")
 	// }
 
-	if node.Images.GreaterThanVersion(topology.MinVersionPeering) {
-		if node.IsServer() {
-			b.addBlock("peering", func() {
-				b.add("enabled", true)
-			})
-		}
+	if node.IsServer() {
+		b.addBlock("peering", func() {
+			b.add("enabled", true)
+		})
 	}
 
 	b.addBlock("ui_config", func() {
@@ -87,45 +78,41 @@ func (g *Generator) generateAgentHCL(node *topology.Node, enableV2, enableV2Tena
 			certKey  = root + "/" + node.TLSCertPrefix + "-key.pem"
 		)
 
-		if node.Images.GreaterThanVersion(topology.MinVersionTLS) {
-			b.addBlock("tls", func() {
-				b.addBlock("internal_rpc", func() {
+		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.add("verify_server_hostname", true)
-					b.add("verify_outgoing", true)
+					// b.add("verify_incoming", 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.Images.GreaterThanVersion(topology.MinVersionPeering) {
-			if node.IsServer() {
-				b.add("grpc_tls", 8503)
-				b.add("grpc", -1)
-			} else {
-				b.add("grpc", 8502)
-				b.add("grpc_tls", -1)
-			}
+		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)
@@ -138,22 +125,13 @@ func (g *Generator) generateAgentHCL(node *topology.Node, enableV2, enableV2Tena
 		b.add("default_policy", "deny")
 		b.add("down_policy", "extend-cache")
 		b.add("enable_token_persistence", true)
-
-		if node.Images.GreaterThanVersion(topology.MinVersionAgentTokenPartition) {
-			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()))
-			})
-		} else {
-			b.addBlock("tokens", func() {
-				if node.IsServer() {
-					b.add("master", g.sec.ReadGeneric(node.Cluster, secrets.BootstrapToken))
-				}
-			})
-		}
+		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() {
@@ -210,7 +188,7 @@ func (g *Generator) generateAgentHCL(node *topology.Node, enableV2, enableV2Tena
 			})
 		}
 	} else {
-		if cluster.Enterprise && node.Images.GreaterThanVersion(topology.MinVersionAgentTokenPartition) {
+		if cluster.Enterprise {
 			b.add("partition", node.Partition)
 		}
 	}
diff --git a/testing/deployer/sprawl/internal/tfgen/nodes.go b/testing/deployer/sprawl/internal/tfgen/nodes.go
index 8ef8f10199e9e..59cca5f711354 100644
--- a/testing/deployer/sprawl/internal/tfgen/nodes.go
+++ b/testing/deployer/sprawl/internal/tfgen/nodes.go
@@ -67,7 +67,7 @@ func (g *Generator) generateNodeContainers(
 			}{
 				terraformPod:      pod,
 				ImageResource:     DockerImageResourceName(node.Images.Consul),
-				HCL:               g.generateAgentHCL(node, cluster.EnableV2 && node.IsServer(), cluster.EnableV2Tenancy && node.IsServer()),
+				HCL:               g.generateAgentHCL(node, cluster.EnableV2 && node.IsServer()),
 				EnterpriseLicense: g.license,
 			}))
 		}
diff --git a/testing/deployer/sprawl/sprawl.go b/testing/deployer/sprawl/sprawl.go
index bb57e4b8c8a7e..e06c949564d4d 100644
--- a/testing/deployer/sprawl/sprawl.go
+++ b/testing/deployer/sprawl/sprawl.go
@@ -17,14 +17,13 @@ import (
 	"time"
 
 	retry "github.com/avast/retry-go"
-	"github.com/mitchellh/copystructure"
-	"google.golang.org/grpc"
-
+	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/proto-public/pbresource"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-multierror"
+	"github.com/mitchellh/copystructure"
+	"google.golang.org/grpc"
 
-	"github.com/hashicorp/consul/api"
-	"github.com/hashicorp/consul/proto-public/pbresource"
 	"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"
@@ -299,18 +298,6 @@ func (s *Sprawl) standardUpgrade(cluster *topology.Cluster,
 			return fmt.Errorf("error upgrading node %s: %w", node.Name, err)
 		}
 	}
-
-	// upgrade client agents one at a time
-	for _, node := range cluster.Nodes {
-		if node.Kind != topology.NodeKindClient {
-			s.logger.Info("Skip non-client node", "node", node.Name)
-			continue
-		}
-		if err := upgradeFn(node.ID()); err != nil {
-			return fmt.Errorf("error upgrading node %s: %w", node.Name, err)
-		}
-	}
-
 	return nil
 }
 
@@ -418,8 +405,8 @@ func (s *Sprawl) RelaunchWithPhase(
 	return nil
 }
 
-// SnapshotSaveAndRestore saves a snapshot of a cluster and then restores the snapshot
-func (s *Sprawl) SnapshotSaveAndRestore(clusterName string) error {
+// SnapshotSave saves a snapshot of a cluster and restore with the snapshot
+func (s *Sprawl) SnapshotSave(clusterName string) error {
 	cluster, ok := s.topology.Clusters[clusterName]
 	if !ok {
 		return fmt.Errorf("no such cluster: %s", clusterName)
diff --git a/testing/deployer/topology/compile.go b/testing/deployer/topology/compile.go
index 2f1761e15b274..7698de7465c2f 100644
--- a/testing/deployer/topology/compile.go
+++ b/testing/deployer/topology/compile.go
@@ -273,7 +273,7 @@ func compile(logger hclog.Logger, raw *Config, prev *Topology) (*Topology, error
 			n.Index = nextIndex
 			nextIndex++
 
-			n.Images = c.Images.OverrideWith(n.Images.ChooseConsul(c.Enterprise)).ChooseNode(n.Kind)
+			n.Images = c.Images.OverrideWith(n.Images).ChooseNode(n.Kind)
 
 			n.Cluster = c.Name
 			n.Datacenter = c.Datacenter
diff --git a/testing/deployer/topology/default_versions.go b/testing/deployer/topology/default_versions.go
index ed1f583a52af6..d4743b8626043 100644
--- a/testing/deployer/topology/default_versions.go
+++ b/testing/deployer/topology/default_versions.go
@@ -6,7 +6,7 @@
 package topology
 
 const (
-    DefaultConsulCEImage         = "hashicorp/consul:1.17.0"
+    DefaultConsulImage           = "hashicorp/consul:1.17.0"
     DefaultConsulEnterpriseImage = "hashicorp/consul-enterprise:1.17.0-ent"
     DefaultEnvoyImage            = "envoyproxy/envoy:v1.27.2"
     DefaultDataplaneImage        = "hashicorp/consul-dataplane:1.3.0"
diff --git a/testing/deployer/topology/images.go b/testing/deployer/topology/images.go
index 5692e6bd78b63..b8e1ebce6aded 100644
--- a/testing/deployer/topology/images.go
+++ b/testing/deployer/topology/images.go
@@ -5,27 +5,11 @@ package topology
 
 import (
 	"strings"
-
-	goversion "github.com/hashicorp/go-version"
-)
-
-var (
-	MinVersionAgentTokenPartition = goversion.Must(goversion.NewVersion("v1.11.0"))
-	MinVersionPeering             = goversion.Must(goversion.NewVersion("v1.13.0"))
-	MinVersionTLS                 = goversion.Must(goversion.NewVersion("v1.12.0"))
 )
 
 type Images struct {
-	// Consul is the image used for creating the container,
-	// Use ChooseConsul() to control which image (ConsulCE or ConsulEnterprise) assign to Consul
-	Consul string `json:",omitempty"`
-	// ConsulCE sets the CE image
-	ConsulCE string `json:",omitempty"`
-	// consulVersion is the version part of Consul image,
-	// e.g., if Consul image is hashicorp/consul-enterprise:1.15.0-ent,
-	// consulVersion is 1.15.0-ent
-	consulVersion string
-	// ConsulEnterprise sets the ent image
+	Consul           string `json:",omitempty"`
+	ConsulCE         string `json:",omitempty"`
 	ConsulEnterprise string `json:",omitempty"`
 	Envoy            string
 	Dataplane        string
@@ -96,7 +80,6 @@ func (i Images) ChooseNode(kind NodeKind) Images {
 	return i
 }
 
-// ChooseConsul controls which image assigns to Consul
 func (i Images) ChooseConsul(enterprise bool) Images {
 	if enterprise {
 		i.Consul = i.ConsulEnterprise
@@ -105,21 +88,9 @@ func (i Images) ChooseConsul(enterprise bool) Images {
 	}
 	i.ConsulEnterprise = ""
 	i.ConsulCE = ""
-
-	// extract the version part of Consul
-	i.consulVersion = i.Consul[strings.Index(i.Consul, ":")+1:]
 	return i
 }
 
-// GreaterThanVersion compares the image version to a specified version
-func (i Images) GreaterThanVersion(version *goversion.Version) bool {
-	if i.consulVersion == "local" {
-		return true
-	}
-	iVer := goversion.Must(goversion.NewVersion(i.consulVersion))
-	return iVer.GreaterThanOrEqual(version)
-}
-
 func (i Images) OverrideWith(i2 Images) Images {
 	if i2.Consul != "" {
 		i.Consul = i2.Consul
@@ -146,7 +117,7 @@ func (i Images) OverrideWith(i2 Images) Images {
 func DefaultImages() Images {
 	return Images{
 		Consul:           "",
-		ConsulCE:         DefaultConsulCEImage,
+		ConsulCE:         DefaultConsulImage,
 		ConsulEnterprise: DefaultConsulEnterpriseImage,
 		Envoy:            DefaultEnvoyImage,
 		Dataplane:        DefaultDataplaneImage,
diff --git a/testing/deployer/topology/topology.go b/testing/deployer/topology/topology.go
index 46befdb128ecb..77fa38ae8febe 100644
--- a/testing/deployer/topology/topology.go
+++ b/testing/deployer/topology/topology.go
@@ -286,10 +286,6 @@ type Cluster struct {
 	// EnableV2 activates V2 on the servers. If any node in the cluster needs
 	// V2 this will be turned on automatically.
 	EnableV2 bool `json:",omitempty"`
-
-	// EnableV2Tenancy activates V2 tenancy on the servers. If not enabled,
-	// V2 resources are bridged to V1 tenancy counterparts.
-	EnableV2Tenancy bool `json:",omitempty"`
 }
 
 func (c *Cluster) inheritFromExisting(existing *Cluster) {
diff --git a/testing/deployer/update-latest-versions.sh b/testing/deployer/update-latest-versions.sh
index 10a7e1bfffeb6..7c2eef790a1a8 100755
--- a/testing/deployer/update-latest-versions.sh
+++ b/testing/deployer/update-latest-versions.sh
@@ -8,7 +8,7 @@ cd "$(dirname "$0")"
 
 ###
 # This script will update the default image names to the latest released versions of
-# Consul CE, Consul Enterprise, and Consul Dataplane.
+# Consul, Consul Enterprise, and Consul Dataplane.
 #
 # For Envoy, it will interrogate the latest version of Consul for it's maximum supported
 # Envoy version and use that.
@@ -50,7 +50,7 @@ cat > topology/default_versions.go <<EOF
 package topology
 
 const (
-    DefaultConsulCEImage         = "hashicorp/consul:${consul_version}"
+    DefaultConsulImage           = "hashicorp/consul:${consul_version}"
     DefaultConsulEnterpriseImage = "hashicorp/consul-enterprise:${consul_version}-ent"
     DefaultEnvoyImage            = "envoyproxy/envoy:v${envoy_version}"
     DefaultDataplaneImage        = "hashicorp/consul-dataplane:${dataplane_version}"
diff --git a/testrpc/wait.go b/testrpc/wait.go
index 7c845cbf68108..ca315d28539e4 100644
--- a/testrpc/wait.go
+++ b/testrpc/wait.go
@@ -108,7 +108,6 @@ func WaitForTestAgent(t *testing.T, rpc rpcFn, dc string, options ...waitOption)
 	var checks structs.IndexedHealthChecks
 
 	retry.Run(t, func(r *retry.R) {
-		r.Helper()
 		dcReq := &structs.DCSpecificRequest{
 			Datacenter:   dc,
 			QueryOptions: structs.QueryOptions{Token: flat.Token},
diff --git a/troubleshoot/go.mod b/troubleshoot/go.mod
index 73e2fae3dde07..2da61ef3d885d 100644
--- a/troubleshoot/go.mod
+++ b/troubleshoot/go.mod
@@ -17,7 +17,6 @@ require (
 	github.com/envoyproxy/go-control-plane/xdsmatcher v0.0.0-20230524161521-aaaacbfbe53e
 	github.com/hashicorp/consul/api v1.26.1
 	github.com/hashicorp/consul/envoyextensions v0.5.1
-	github.com/hashicorp/consul/sdk v0.15.0
 	github.com/stretchr/testify v1.8.3
 	google.golang.org/protobuf v1.30.0
 )
@@ -36,17 +35,17 @@ require (
 	github.com/hashicorp/go-immutable-radix v1.3.1 // indirect
 	github.com/hashicorp/go-multierror v1.1.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/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/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
-	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/client_model v0.4.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
 	golang.org/x/net v0.17.0 // indirect
@@ -56,5 +55,6 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20230526203410-71b5a4ffd15e // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
 	google.golang.org/grpc v1.56.3 // indirect
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/troubleshoot/go.sum b/troubleshoot/go.sum
index 547b27da203be..b487eb60a5f90 100644
--- a/troubleshoot/go.sum
+++ b/troubleshoot/go.sum
@@ -70,6 +70,7 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH
 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/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=
@@ -162,7 +163,6 @@ github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5m
 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.15.0 h1:2qK9nDrr4tiJKRoxPGhm6B7xJjLVIQqkjiab2M4aKjU=
-github.com/hashicorp/consul/sdk v0.15.0/go.mod h1:r/OmRRPbHOe0yxNahLw7G9x5WG17E1BIECMtCjcPSNo=
 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=
@@ -189,7 +189,6 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv
 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=
@@ -212,10 +211,13 @@ github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+o
 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=
@@ -252,7 +254,6 @@ github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144T
 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=
@@ -274,7 +275,9 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT
 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=
@@ -592,6 +595,7 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8
 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/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
diff --git a/troubleshoot/ports/hostport.go b/troubleshoot/ports/hostport.go
deleted file mode 100644
index 1d09e34f0400b..0000000000000
--- a/troubleshoot/ports/hostport.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ports
-
-type hostPort struct {
-	host string
-	port string
-}
diff --git a/troubleshoot/ports/troubleshoot_ports.go b/troubleshoot/ports/troubleshoot_ports.go
deleted file mode 100644
index ec1bfda5963f2..0000000000000
--- a/troubleshoot/ports/troubleshoot_ports.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ports
-
-import (
-	"fmt"
-	"strings"
-)
-
-func TroubleshootDefaultPorts(host string) []string {
-	// Source - https://developer.hashicorp.com/consul/docs/install/ports
-	ports := []string{"8600", "8500", "8501", "8502", "8503", "8301", "8302", "8300"}
-	return troubleshootRun(ports, host)
-}
-
-func TroubleShootCustomPorts(host string, ports string) []string {
-	portsArr := strings.Split(ports, ",")
-	return troubleshootRun(portsArr, host)
-}
-
-func troubleshootRun(ports []string, host string) []string {
-
-	resultsChannel := make(chan string)
-	defer close(resultsChannel)
-
-	var counter = 0
-
-	for _, port := range ports {
-		counter += 1
-		tcpTroubleShoot := troubleShootTcp{}
-		port := port
-		go func() {
-			err := tcpTroubleShoot.dialPort(&hostPort{host: host, port: port})
-			var res string
-			if err != nil {
-				res = fmt.Sprintf("TCP: Port %s on %s is closed, unreachable, or the connection timed out.\n", port, host)
-			} else {
-				// If no error occurs, the connection was successful, and the port is open.
-				res = fmt.Sprintf("TCP: Port %s on %s is open.\n", port, host)
-			}
-			resultsChannel <- res
-		}()
-	}
-
-	resultsArr := make([]string, counter)
-	for itr := 0; itr < counter; itr++ {
-		res := <-resultsChannel
-		fmt.Print(res)
-		resultsArr[itr] = res
-	}
-	return resultsArr
-}
diff --git a/troubleshoot/ports/troubleshoot_ports_test.go b/troubleshoot/ports/troubleshoot_ports_test.go
deleted file mode 100644
index 2358467e68539..0000000000000
--- a/troubleshoot/ports/troubleshoot_ports_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ports
-
-import (
-	"fmt"
-	"github.com/hashicorp/consul/sdk/testutil"
-	"github.com/stretchr/testify/require"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func TestTroubleShootCustom_Ports(t *testing.T) {
-	// Create a test Consul server
-	srv1, err := testutil.NewTestServerConfigT(t, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	results := TroubleShootCustomPorts("127.0.0.1", strings.Join([]string{
-		strconv.Itoa(srv1.Config.Ports.HTTP),
-		strconv.Itoa(srv1.Config.Ports.DNS),
-		strconv.Itoa(srv1.Config.Ports.HTTPS),
-		strconv.Itoa(srv1.Config.Ports.GRPC),
-		strconv.Itoa(srv1.Config.Ports.SerfLan),
-		strconv.Itoa(srv1.Config.Ports.SerfWan),
-		strconv.Itoa(srv1.Config.Ports.Server)}, ","))
-	expectedResults := []string{
-		fmt.Sprintf("TCP: Port %s on 127.0.0.1 is open.\n", strconv.Itoa(srv1.Config.Ports.HTTP)),
-		fmt.Sprintf("TCP: Port %s on 127.0.0.1 is open.\n", strconv.Itoa(srv1.Config.Ports.GRPC)),
-		fmt.Sprintf("TCP: Port %s on 127.0.0.1 is open.\n", strconv.Itoa(srv1.Config.Ports.HTTPS)),
-		fmt.Sprintf("TCP: Port %s on 127.0.0.1 is open.\n", strconv.Itoa(srv1.Config.Ports.SerfLan)),
-		fmt.Sprintf("TCP: Port %s on 127.0.0.1 is open.\n", strconv.Itoa(srv1.Config.Ports.SerfWan)),
-		fmt.Sprintf("TCP: Port %s on 127.0.0.1 is open.\n", strconv.Itoa(srv1.Config.Ports.DNS)),
-		fmt.Sprintf("TCP: Port %s on 127.0.0.1 is open.\n", strconv.Itoa(srv1.Config.Ports.Server)),
-	}
-	for _, res := range expectedResults {
-		require.Contains(t, results, res)
-	}
-	defer srv1.Stop()
-}
-
-func TestTroubleShootCustom_Ports_Not_Reachable(t *testing.T) {
-	results := TroubleShootCustomPorts("127.0.0.1", strings.Join([]string{"8777", "8888"}, ","))
-
-	expectedResults := []string{
-		fmt.Sprintf("TCP: Port 8777 on 127.0.0.1 is closed, unreachable, or the connection timed out.\n"),
-		fmt.Sprintf("TCP: Port 8888 on 127.0.0.1 is closed, unreachable, or the connection timed out.\n"),
-	}
-	for _, res := range expectedResults {
-		require.Contains(t, results, res)
-	}
-}
diff --git a/troubleshoot/ports/troubleshoot_protocol.go b/troubleshoot/ports/troubleshoot_protocol.go
deleted file mode 100644
index e0299adba7dd8..0000000000000
--- a/troubleshoot/ports/troubleshoot_protocol.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ports
-
-type troubleShootProtocol interface {
-	dialPort(hostPort *hostPort) error
-}
diff --git a/troubleshoot/ports/troubleshoot_tcp.go b/troubleshoot/ports/troubleshoot_tcp.go
deleted file mode 100644
index 8ade64dfbed09..0000000000000
--- a/troubleshoot/ports/troubleshoot_tcp.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright (c) HashiCorp, Inc.
-// SPDX-License-Identifier: BUSL-1.1
-
-package ports
-
-import (
-	"net"
-	"time"
-)
-
-type troubleShootTcp struct {
-}
-
-func (tcp *troubleShootTcp) dialPort(hostPort *hostPort) error {
-	address := net.JoinHostPort(hostPort.host, hostPort.port)
-
-	// Attempt to establish a TCP connection with a timeout.
-	conn, err := net.DialTimeout("tcp", address, 5*time.Second)
-	if err != nil {
-		return err
-	}
-	defer conn.Close()
-	return nil
-}
diff --git a/version/VERSION b/version/VERSION
index ee017091ff37b..3cf57a7b61c64 100644
--- a/version/VERSION
+++ b/version/VERSION
@@ -1 +1 @@
-1.18.0-dev
+1.17.1-dev
diff --git a/website/content/commands/acl/binding-rule/create.mdx b/website/content/commands/acl/binding-rule/create.mdx
index 38b2ffb57debe..fd925e8d93590 100644
--- a/website/content/commands/acl/binding-rule/create.mdx
+++ b/website/content/commands/acl/binding-rule/create.mdx
@@ -30,7 +30,7 @@ Usage: `consul acl binding-rule create [options] [args]`
 - `-bind-name=<string>` - Name to bind on match. Can use `${var}`
   interpolation. This flag is required.
 
-- `-bind-type=<string>` - Type of binding to perform (`"service"`, `"node"`, `"templated-policy"`, `"policy"` or `"role"`).
+- `-bind-type=<string>` - Type of binding to perform (`"service"` or `"role"`).
 
 - `-description=<string>` - A description of the binding rule.
 
@@ -90,35 +90,3 @@ BindType:     role
 BindName:     vault
 Selector:     serviceaccount.namespace==default and serviceaccount.name==vault
 ```
-
-Create a new binding rule that binds to a policy:
-
-```shell-session
-$ consul acl binding-rule create -method 'nomad' \
-    -description 'gets policy for nomad job' \
-    -bind-type 'policy' \
-    -bind-name 'nomad-${nomad.jobname}' \
-    -selector 'nomad.jobname==billing-app'
-ID:           e21ae868-7b13-a230-0235-f8e83510642c
-AuthMethod:   nomad
-Description:  gets policy for nomad job
-BindType:     policy
-BindName:     nomad-billing-app
-Selector:     nomad.jobname==billing-app
-```
-
-Create a new binding rule that binds to a templated policy:
-
-```shell-session
-$ consul acl binding-rule create -method 'remote-jwks' \
-    -description 'gets templated policy for dns tokens' \
-    -bind-type 'templated-policy' \
-    -bind-name 'builtin/dns' \
-    -selector 'serviceaccount.namespace==default'
-ID:           eaca9aa4-8913-c8ef-ba39-bfae64f66d99
-AuthMethod:   remote-jwks
-Description:  gets templated policy for dns tokens
-BindType:     templated-policy
-BindName:     builtin/dns
-Selector:     serviceaccount.namespace==default
-```
\ No newline at end of file
diff --git a/website/content/commands/acl/binding-rule/update.mdx b/website/content/commands/acl/binding-rule/update.mdx
index e33b7e026da5c..24f690129433e 100644
--- a/website/content/commands/acl/binding-rule/update.mdx
+++ b/website/content/commands/acl/binding-rule/update.mdx
@@ -33,7 +33,7 @@ Usage: `consul acl binding-rule update [options] [args]`
 - `-bind-name=<string>` - Name to bind on match. Can use `${var}`
   interpolation. This flag is required.
 
-- `-bind-type=<string>` - Type of binding to perform (`"service"`, `"node"`, `"templated-policy"`, `"policy"` or `"role"`).
+- `-bind-type=<string>` - Type of binding to perform (`"service"` or `"role"`).
 
 - `-description=<string>` - A description of the binding rule.
 
diff --git a/website/content/commands/troubleshoot/index.mdx b/website/content/commands/troubleshoot/index.mdx
index 74d9d9cec32ad..0c992aab15c92 100644
--- a/website/content/commands/troubleshoot/index.mdx
+++ b/website/content/commands/troubleshoot/index.mdx
@@ -22,7 +22,6 @@ Subcommands:
 
     proxy        Troubleshoots service mesh issues from the current Envoy instance
     upstreams    Gets upstream Envoy identifiers and IPs configured for the proxy
-    ports        Prints open and closed ports on the Consul server.
 ```
 
 For more information, examples, and usage about a subcommand, click on the name
@@ -30,4 +29,3 @@ of the subcommand in the sidebar or one of the links below:
 
 - [proxy](/consul/commands/troubleshoot/proxy)
 - [upstreams](/consul/commands/troubleshoot/upstreams)
-- [ports](/consul/commands/troubleshoot/ports)
diff --git a/website/content/commands/troubleshoot/ports.mdx b/website/content/commands/troubleshoot/ports.mdx
deleted file mode 100644
index 5a4d5faf50821..0000000000000
--- a/website/content/commands/troubleshoot/ports.mdx
+++ /dev/null
@@ -1,47 +0,0 @@
----
-layout: commands
-page_title: 'Commands: Troubleshoot Ports'
-description: >-
-  The `consul troubleshoot ports` Helps troubleshoot TCP ports by printing if they are open or closed.
----
-
-# Consul Troubleshoot Upstreams
-
-Command: `consul troubleshoot ports`
-
-The `troubleshoot ports` prints TCP port statuses to help you troubleshoot port connectivity. 
-
-## Usage
-
-Usage: `consul troubleshoot ports [options]`
-
-#### Command Options
-
-- `-host=<value>` - Host name to troubleshoot TCP ports for. You can also set the `CONSUL_HTTP_ADDR`  environment variable instead of using the `-host` flag.
-- `-ports=<value>` - Specifies a comma-separated list of custom ports to check.
-
-## Examples
-
-The following example checks the default ports Consul server uses for TCP connectivity. Note that the `CONSUL_HTTP_ADDR` environment variable is set to `localhost`. As a result, the `-host` flag is not required.
-Refer to [Required Ports](/consul/docs/install/ports) for additional information.
-
-```shell-session
-$ export CONSUL_HTTP_ADDR=localhost
-$ consul troubleshoot ports
-TCP: Port 8501 on localhost is open.
-TCP: Port 8502 on localhost is open.
-TCP: Port 8503 on localhost is open.
-TCP: Port 8302 on localhost is open.
-TCP: Port 8300 on localhost is open.
-TCP: Port 8600 on localhost is open.
-TCP: Port 8301 on localhost is open.
-TCP: Port 8500 on localhost is open.
-```
-
-The following example checks TCP ports status on the `hashicorp.com` host.
-
-```shell-session
-$ consul troubleshoot ports -host hashicorp.com -ports 80,8077
-TCP: Port 80 on hashicorp.com is open.
-TCP: Port 8077 on hashicorp.com is closed, unreachable, or the connection timed out.
-```
diff --git a/website/content/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter.mdx b/website/content/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter.mdx
index 3f0a5e6def6a0..4effb11e13191 100644
--- a/website/content/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter.mdx
+++ b/website/content/docs/connect/gateways/api-gateway/configuration/routetimeoutfilter.mdx
@@ -97,18 +97,18 @@ Map that contains the details about the gateway policy. The `apiVersion`, `kind`
 
 ### `spec.idleTimeout
 
-Specifies the total amount of time permitted for the request stream to be idle. Must specify a parseable number and a unit, for example "5s". 
+Specifies the total amount of time permitted for the request stream to be idle. Format the string as `"<number><unit>"`, for example `"5s"`. Consul uses the `metav1.Duration` package to parse the value. Refer to the [Go documentation](https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Duration) for additional information about defining parseable values.  
 
 #### Values
 
 - Default: ""
-- Data type: string
+- Data type: String
 
 ### `spec.requestTimeout`
 
-Specifies the total amount of time in nanoseconds, including retry attempts, Consul permits for the entire downstream request to be processed. Must specify a parseable number and a unit, for example "5s". 
+Specifies the total amount of time in nanoseconds, including retry attempts, Consul permits for the entire downstream request to be processed. Format the string as `"<number><unit>"`, for example `"5s"`. Consul uses the `metav1.Duration` package to parse the value. Refer to the [Go documentation](https://pkg.go.dev/k8s.io/apimachinery/pkg/apis/meta/v1#Duration) for additional information about defining parseable values.  
 
 #### Values
 
 - Default: ""
-- Data type: Integer
+- Data type: String
diff --git a/website/content/docs/enterprise/ent-to-ce-downgrades.mdx b/website/content/docs/enterprise/ent-to-ce-downgrades.mdx
deleted file mode 100644
index a5b6061f40a6f..0000000000000
--- a/website/content/docs/enterprise/ent-to-ce-downgrades.mdx
+++ /dev/null
@@ -1,208 +0,0 @@
----
-layout: docs
-page_title: Downgrade from Consul Enterprise to the community edition
-description: >-
-  Learn how to downgrade your installation of Consul Enterprise to the free Consul community edition (CE)
----
-
-# Downgrade from Consul Enterprise to the community edition
-
-This document describes how to downgrade from Consul Enterprise to Consul community edition (CE). 
-
-## Overview
-
-You can downgrade Consul editions if you no longer require Consul Enterprise features. Complete the following steps to downgrade to Consul CE:
-
-1. Download the CE binary.
-1. Backup your Consul data and set appropriate log levels.
-1. Complete the downgrade procedures.
-
-### Request-handling details
-
-During the downgrade process, the Consul CE server handles the raft replication logs in one of the following ways:
-
-- Drops the request.
-- Filters out data from requests sent from non-default namespaces or partitions.
-- Panics and stops the downgrade.
-
-The following examples describe scenarios where the server may drop the requests:
-
-- Registration requests in non-default namespace 
-- Services or health checks in non-default namespaces or partitions.
-
-- Write requests to peered clusters if the local partition connecting to the peer is non-default.
-
-The following examples describe scenarios where the server may filter out data from requests:
-
-- Intention sources that target non-default namespaces or partitions are filtered out of the configuration entry.
-- Exports of services within non-default namespaces or partitions are filtered out of the configuration entry.
-
-The server may panic and stop the downgrade when Consul cannot safely filter configuration entries that route traffic. This is because Consul is unable to determine if the filtered configuration entries send traffic to services that are able to handle the traffic. Consul CE panics in order to prevent harm to existing service mesh routes.
-
-In these situations, you must first remove references to services within non-default namespaces or partitions from those configuration entries.
-
-The server may panic in the following cases:
-
-- Service splitter, service resolver, and service router configuration entry requests that have references to services located in non-default namespaces or partitions cause the server to panic.
-
-## Requirements
-
-You can only downgrade Consul editions for v1.18 and later.
-
-## Download the CE binary version
-
-First, download the binary for CE.
-
-<Tabs>
-<Tab heading="Binary">
-
-All current and past versions of the CE and Enterprise releases are
-available on the [HashiCorp releases page](https://releases.hashicorp.com/consul)
-
-Example:
-```shell-session
-$ export VERSION=1.18.0
-$ curl https://releases.hashicorp.com/consul/${VERSION}/consul_${VERSION} _linux_amd64.zip
-```
-
-</Tab>
-<Tab heading="Kubernetes">
-
-To downgrade Consul edition on Kubernetes, modify the image version in your Helm chart and follow the upgrade process described in [Upgrade Consul version](/consul/docs/k8s/upgrade#upgrade-consul-version).
-
-</Tab>
-
-</Tabs>
-
-## Prepare for the downgrade to CE
-
-1. Take a snapshot of the existing Consul state so that you have a safe fallback if an error occurs.
-
-    ```shell-session
-    $ consul snapshot save backup.snap
-    ```
-
-1. Run the following command to verify that the snapshot was successfully saved:
-
-    ```shell-session
-    $ consul snapshot inspect backup.snap
-    ```
-
-    Example output:
-
-    ```
-    ID           2-1182-1542056499724
-    Size         4115
-    Index        1182
-    Term         2
-    Version      1
-    ```
-
-1. Store the snapshot in a safe location. Refer to the following documentation for additional information about using snapshots:
-
-   - [Consul snapshot](/consul/commands/snapshot)
-   - [Backup Consul Data and State tutorial](/consul/tutorials/production-deploy/backup-and-restore) 
-
-1. Temporarily modify your Consul configuration so that its [log_level](/consul/docs/agent/config/cli-flags#_log_level)
-       is set to `debug`. This enables Consul to report detailed information if an error occurs.
-1. Issue the following command on your servers to reload the configuration:
-
-    ```shell-session
-    $ consul reload
-    ```
-
-1. If applicable, modify the following configuration entries:
-   - [Service resolver](/consul/docs/connect/config-entries/service-resolver):
-     1. Remove services configured as failovers in non-default namespaces or services that belong to a sameness group.
-     1. Remove services configured as redirects that belong to non-default namespaces or partitions.
-   - [Service splitter](/consul/docs/connect/config-entries/service-splitter):
-     1. Remove services configured as splits that belong to non-default namespaces or partitions.
-   - [Service router](/consul/docs/connect/config-entries/service-router):
-     1. Remove services configured as a destination that belong to non-default namespaces or partitions.
-
-## Perform the downgrade
-
-1. Restart or redeploy all Consul clients with a CE version of the binary. You can use a service management system, such as `systemd` or `upstart`, to restart the Consul service. If you are not using a service management system, you must restart the agent manually. The following example uses `systemctl` to restart the Consul service:
-
-    ```shell-session
-    $ sudo systemctl restart consul
-    ```
-
-1. Issue the following command to discover which server is currently the leader:
-
-    ```shell-session
-    $ consul operator raft list-peers
-    ```
-
-    Consul prints the raft information. The format and content may differ based on your version of Consul:
-
-    ```shell-session
-    Node       ID                                    Address         State     Voter  RaftProtocol
-    dc1-node1  ae15858f-7f5f-4dcb-b7d5-710fdcdd2745  10.11.0.2:8300  leader    true   3
-    dc1-node2  20e6be1b-f1cb-4aab-929f-f7d2d43d9a96  10.11.0.3:8300  follower  true   3
-    dc1-node3  658c343b-8769-431f-a71a-236f9dbb17b3  10.11.0.4:8300  follower  true   3
-    ```
-
-1. Make a note of the leader so that you can perform the downgrade on agents in the proper order.
-
-1. Update the server binaries to use the CE version. Complete the following steps in order for each server agent in the `follower` state. Then, repeat the steps for the `leader` agent.
-
-   1. Set an environment variable named `CONSUL_ENTERPRISE_DOWNGRADE_TO_CE` to `true`. The following example sets variable using `systemd`:
-       1. Edit the Consul systemd service unit file:
-          ```shell-session
-          $ sudo vi /etc/systemd/system/consul.service
-          ```
-       1. Add the environment variables you want to set for Consul under the `[Service]` section of the unit file and save the changes:
-          ```shell-session
-          [Service]
-          Environment=CONSUL_ENTERPRISE_DOWNGRADE_TO_CE=true
-          ```
-       1. Reload `systemd`:
-          ```shell-session
-          $ sudo systemctl daemon-reload
-          ```
-   1. Restart the Consul service. You can use a service management system, such as `systemd` or `upstart`. If you are not using a service management system, you must restart the agent manually. The following example restarts Consul using `systemctl`:    
-       ```shell-session
-       $ sudo systemctl restart consul
-       ```
-   1. To validate that the agent has rejoined the cluster and is in sync with the leader, issue the following command:
-      ```shell-session
-      $ consul info
-      ```
-      Verify that the `commit_index` and `last_log_index` fields have the same value. Differing values may be result of an unexpected leadership election due to loss of quorum.
-
-1. Run the following command to verify that all servers appear in the cluster as expected and are on the correct version:
-
-    ```shell-session
-    $ consul members
-    ```
-
-    Consul prints cluster membership information. The exact format and content depends on your Consul version:
-
-    ```shell-session
-    Node       Address         Status  Type    Build  Protocol  DC
-    dc1-node1  10.11.0.2:8301  alive   server  1.18.0  2         dc1
-    dc1-node2  10.11.0.3:8301  alive   server  1.18.0  2         dc1
-    dc1-node3  10.11.0.4:8301  alive   server  1.18.0  2         dc1
-    ```
-
-1. Verify the raft state to make sure there is a leader and sufficient voters:
-
-    ```shell-session
-    $ consul operator raft list-peers
-    ```
-
-    Consul prints the raft information. The format and content may differ based on your version of Consul:
-
-    ```shell-session
-    Node       ID                                    Address         State     Voter  RaftProtocol
-    dc1-node1  ae15858f-7f5f-4dcb-b7d5-710fdcdd2745  10.11.0.2:8300  leader    true   3
-    dc1-node2  20e6be1b-f1cb-4aab-929f-f7d2d43d9a96  10.11.0.3:8300  follower  true   3
-    dc1-node3  658c343b-8769-431f-a71a-236f9dbb17b3  10.11.0.4:8300  follower  true   3
-    ```
-
-1. Set your `log_level` back to its original value and issue the following command on your servers to reload the configuration:
-
-    ```shell-session
-    $ consul reload
-    ```
\ No newline at end of file
diff --git a/website/content/docs/enterprise/index.mdx b/website/content/docs/enterprise/index.mdx
index a8ff184784073..86f57794c158f 100644
--- a/website/content/docs/enterprise/index.mdx
+++ b/website/content/docs/enterprise/index.mdx
@@ -187,4 +187,4 @@ Consul Enterprise feature availability can change depending on your server and c
 | [Traffic rate limiting for services](/consul/docs/connect/manage-traffic/limit-request-rates) |  &#9989;  |  &#9989;   | &#9989; |
 
 </Tab>
-</Tabs>
+</Tabs>
\ No newline at end of file
diff --git a/website/content/docs/k8s/helm.mdx b/website/content/docs/k8s/helm.mdx
index 319ed9746dd61..12e6077f36066 100644
--- a/website/content/docs/k8s/helm.mdx
+++ b/website/content/docs/k8s/helm.mdx
@@ -759,19 +759,6 @@ Use these links to navigate to a particular top-level stanza.
     contains best practices and recommendations for selecting suitable
     hardware sizes for your Consul servers.
 
-  - `persistentVolumeClaimRetentionPolicy` ((#v-server-persistentvolumeclaimretentionpolicy)) (`map`) - The [Persistent Volume Claim (PVC) retention policy](https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#persistentvolumeclaim-retention)
-    controls if and how PVCs are deleted during the lifecycle of a StatefulSet.
-    WhenDeleted specifies what happens to PVCs created from StatefulSet VolumeClaimTemplates when the StatefulSet is deleted, 
-    and WhenScaled specifies what happens to PVCs created from StatefulSet VolumeClaimTemplates when the StatefulSet is scaled down.
-
-    Example:
-
-    ```yaml
-    persistentVolumeClaimRetentionPolicy:
-      whenDeleted: Retain
-      whenScaled: Retain
-    ```
-
   - `connect` ((#v-server-connect)) (`boolean: true`) - This will enable/disable [service mesh](/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
diff --git a/website/content/docs/k8s/multiport/reference/trafficpermissions.mdx b/website/content/docs/k8s/multiport/reference/trafficpermissions.mdx
index 19e8a20ace7dd..0eae49e88b47e 100644
--- a/website/content/docs/k8s/multiport/reference/trafficpermissions.mdx
+++ b/website/content/docs/k8s/multiport/reference/trafficpermissions.mdx
@@ -24,10 +24,10 @@ The following list outlines field hierarchy, language-specific data types, and r
     - [`identityName`](#spec-destination-identityname): string
   - [`action`](#spec-action): string
   - [`permissions`](#spec-permissions): list of maps
-    - [`sources`](#spec-permissions-sources): list of maps
+    - [`sources`](#spec-permissions-sources): map
       - [`identityName`](#spec-permissions-sources-identityname): string
-    - [`destinationRules`](#spec-permissions-destinationrules): list of maps
-      - [`portNames`](#spec-permissions-destinationrules-portnames): array of strings
+    - [`destinationRules`](#spec-permissions-destinationrules):
+      - [`portNames`](#spec-permissions-destinationrules-portNames): array of strings
 
 ## Complete configuration
 
@@ -45,10 +45,10 @@ spec:
   action: allow
   permissions:
     - sources:
-        - identityName: <sourceWorkloadIdentity> 
-      destinationRules:
-        - portNames:
-            - <servicePortName>
+      identityName: <sourceWorkloadIdentity> 
+    destinationRules:
+      portNames: 
+        - <servicePortName>
 ```
 
 ## Specification
@@ -163,7 +163,7 @@ To specify wildcard references in this block using `*`, omit all other fields. F
 #### Values
 
 - Default: None
-- Data type: List of maps
+- Data type: Map
 
 ### `spec.permissions.sources.identityName`
 
@@ -172,7 +172,7 @@ Specifies the Workload identity for the service that originates the request.
 #### Values
 
 - Default: None
-- Data type: String
+- Data type: Map
 
 ### `spec.permissions.destinationRules`
 
@@ -185,11 +185,11 @@ When [`spec.action`](#spec-action) _denies traffic_, Consul denies authorization
 #### Values
 
 - Default: None
-- Data type: List of maps
+- Data type: Map
 
 ### `spec.permissions.destinationRules.portNames`
 
-Specifies a port name that the Kubernetes Pod's container exposes at the destination.
+Specifies a port name that the Kubernetes Service exposes at the destination.
 
 #### Values
 
diff --git a/website/content/docs/services/discovery/dns-configuration.mdx b/website/content/docs/services/discovery/dns-configuration.mdx
index 5a0d890e79bff..369f8fe50ff79 100644
--- a/website/content/docs/services/discovery/dns-configuration.mdx
+++ b/website/content/docs/services/discovery/dns-configuration.mdx
@@ -16,7 +16,7 @@ The Consul DNS is the primary interface for querying records when Consul service
 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) : Consul does not use port `53`, which is typically reserved for the default port for DNS resolvers, by default because it requires an escalated privilege to bind to. 
+- [`ports.dns`](/consul/docs/agent/config/config-files#dns_port) : Consul does not use port `53`, which is typically reserved for the default port for DNS resolvers, by default because it requires an escalated privilege to bind to.
 - [`recursors`](/consul/docs/agent/config/config-files#recursors)
 - [`domain`](/consul/docs/agent/config/config-files#domain)
 - [`alt_domain`](/consul/docs/agent/config/config-files#alt_domain)
diff --git a/website/data/commands-nav-data.json b/website/data/commands-nav-data.json
index f8b8af1587a3e..1b0cadd0447ca 100644
--- a/website/data/commands-nav-data.json
+++ b/website/data/commands-nav-data.json
@@ -575,10 +575,6 @@
       {
         "title": "proxy",
         "path": "troubleshoot/proxy"
-      },
-      {
-        "title": "ports",
-        "path": "troubleshoot/ports"
       }
     ]
   },
diff --git a/website/data/docs-nav-data.json b/website/data/docs-nav-data.json
index bc5175f4d796d..84c08a5c39f73 100644
--- a/website/data/docs-nav-data.json
+++ b/website/data/docs-nav-data.json
@@ -1890,10 +1890,6 @@
             "path": "enterprise/license/faq"
           }
         ]
-      },
-      {
-        "title": "Enterprise to CE downgrade",
-        "path": "enterprise/ent-to-ce-downgrades"
       }
     ]
   },