From 91a493efe9cc3a95850dce1512ce498be756759f Mon Sep 17 00:00:00 2001
From: Eric <eric@haberkorn.co>
Date: Wed, 30 Mar 2022 12:51:56 -0400
Subject: [PATCH] Bump go-control-plane

* `go get cloud.google.com/go@v0.59.0`
* `go get github.com/envoyproxy/go-control-plane@v0.9.9`
* `make envoy-library`
* Bumpprotoc to 3.15.8
---
 GNUmakefile                                   |    4 +-
 agent/auto-config/mock_test.go                |    5 +
 agent/config/runtime_test.go                  |   13 +-
 agent/consul/auto_config_endpoint_test.go     |   77 +-
 agent/consul/state/catalog_events_test.go     |   14 +-
 agent/consul/state/connect_ca_test.go         |    3 +-
 agent/grpc/private/handler_test.go            |    2 +-
 .../private/internal/testservice/simple.pb.go |  288 ++--
 .../services/subscribe/subscribe_test.go      |   29 +-
 agent/grpc/private/stats_test.go              |   12 +-
 agent/rpcclient/health/view.go                |    6 +-
 agent/rpcclient/health/view_test.go           |   24 +-
 agent/structs/structs.go                      |    9 +-
 agent/submatview/materializer.go              |    6 +-
 agent/submatview/store_test.go                |    4 +-
 agent/xds/clusters.go                         |   26 +-
 ...th-chain-and-overrides.envoy-1-20-x.golden |    9 +-
 ...grpc-new-cluster-http1.envoy-1-20-x.golden |    9 +-
 ...aths-new-cluster-http2.envoy-1-20-x.golden |    9 +-
 ...ss-gateway-no-services.envoy-1-20-x.golden |    2 -
 ...sh-gateway-no-services.envoy-1-20-x.golden |    2 -
 ...ng-gateway-no-services.envoy-1-20-x.golden |    2 -
 ...ss-gateway-no-services.envoy-1-20-x.golden |    2 -
 ...sh-gateway-no-services.envoy-1-20-x.golden |    2 -
 ...ng-gateway-no-services.envoy-1-20-x.golden |    2 -
 ...ss-gateway-no-services.envoy-1-20-x.golden |    2 -
 .../routes/defaults.envoy-1-20-x.golden       |    2 -
 ...ress-defaults-no-chain.envoy-1-20-x.golden |    2 -
 ...ith-chain-external-sni.envoy-1-20-x.golden |    2 -
 .../ingress-with-chain.envoy-1-20-x.golden    |    2 -
 agent/xds/xds_protocol_helpers_test.go        |   23 +-
 agent/xds/z_xds_packages.go                   |  129 +-
 .../scripts/envoy-library-references.sh       |    4 +-
 build-support/scripts/proto-gen.sh            |    6 +-
 connect/tls_test.go                           |   10 +-
 go.mod                                        |   15 +-
 go.sum                                        |  250 ++-
 proto/pbacl/acl.pb.go                         |  183 ++-
 proto/pbautoconf/auto_config.pb.go            |  359 ++--
 proto/pbcommon/common.go                      |   12 +-
 proto/pbcommon/common.pb.go                   |  871 ++++++----
 proto/pbconfig/config.pb.go                   | 1133 ++++++++-----
 proto/pbconnect/connect.pb.go                 |  645 +++++---
 proto/pbservice/healthcheck.pb.go             | 1120 ++++++++-----
 proto/pbservice/ids_test.go                   |   14 +-
 proto/pbservice/node.pb.go                    |  643 +++++---
 proto/pbservice/service.pb.go                 | 1441 +++++++++++------
 proto/pbsubscribe/subscribe.pb.go             |  744 ++++++---
 48 files changed, 5269 insertions(+), 2904 deletions(-)

diff --git a/GNUmakefile b/GNUmakefile
index 0649580b3..873d1ad60 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -11,7 +11,7 @@ GOTOOLS = \
 	github.com/golangci/golangci-lint/cmd/golangci-lint@v1.40.1 \
 	github.com/hashicorp/lint-consul-retry@master
 
-PROTOC_VERSION=3.12.3
+PROTOC_VERSION=3.15.8
 PROTOC_OS := $(shell if test "$$(uname)" == "Darwin"; then echo osx; else echo linux; fi)
 PROTOC_ZIP := protoc-$(PROTOC_VERSION)-$(PROTOC_OS)-x86_64.zip
 PROTOC_URL := https://github.com/protocolbuffers/protobuf/releases/download/v$(PROTOC_VERSION)/$(PROTOC_ZIP)
@@ -22,7 +22,7 @@ GOPROTOTOOLS = \
 	github.com/golang/protobuf/protoc-gen-go@$(GOPROTOVERSION) \
 	github.com/hashicorp/protoc-gen-go-binary@master \
 	github.com/favadi/protoc-go-inject-tag@v1.3.0 \
-	github.com/hashicorp/mog@v0.1.1
+	github.com/hashicorp/mog@v0.1.2
 
 GOTAGS ?=
 GOPATH=$(shell go env GOPATH)
diff --git a/agent/auto-config/mock_test.go b/agent/auto-config/mock_test.go
index 49d3ed29e..45fd42ef4 100644
--- a/agent/auto-config/mock_test.go
+++ b/agent/auto-config/mock_test.go
@@ -276,6 +276,11 @@ func (m *mockedConfig) expectInitialTLS(t *testing.T, agentName, datacenter, tok
 	for _, root := range indexedRoots.Roots {
 		pems = append(pems, root.RootCert)
 	}
+	for _, root := range indexedRoots.Roots {
+		if len(root.IntermediateCerts) == 0 {
+			root.IntermediateCerts = nil
+		}
+	}
 
 	// we should update the TLS configurator with the proper certs
 	m.tlsCfg.On("UpdateAutoTLS",
diff --git a/agent/config/runtime_test.go b/agent/config/runtime_test.go
index b239b1ed4..d74650c07 100644
--- a/agent/config/runtime_test.go
+++ b/agent/config/runtime_test.go
@@ -18,7 +18,6 @@ import (
 	"time"
 
 	"github.com/armon/go-metrics/prometheus"
-	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/stretchr/testify/require"
 
@@ -30,6 +29,7 @@ import (
 	"github.com/hashicorp/consul/agent/token"
 	"github.com/hashicorp/consul/lib"
 	"github.com/hashicorp/consul/logging"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
@@ -5604,7 +5604,7 @@ func (tc testCase) run(format string, dataDir string) func(t *testing.T) {
 		expected.ACLResolverSettings.NodeName = expected.NodeName
 		expected.ACLResolverSettings.EnterpriseMeta = *structs.NodeEnterpriseMetaInPartition(expected.PartitionOrDefault())
 
-		assertDeepEqual(t, expected, actual, cmpopts.EquateEmpty())
+		prototest.AssertDeepEqual(t, expected, actual, cmpopts.EquateEmpty())
 	}
 }
 
@@ -5617,13 +5617,6 @@ func runCase(t *testing.T, name string, fn func(t *testing.T)) {
 	})
 }
 
-func assertDeepEqual(t *testing.T, x, y interface{}, opts ...cmp.Option) {
-	t.Helper()
-	if diff := cmp.Diff(x, y, opts...); diff != "" {
-		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
-}
-
 func TestLoad_InvalidConfigFormat(t *testing.T) {
 	_, err := Load(LoadOpts{ConfigFormat: "yaml"})
 	require.Error(t, err)
@@ -6432,7 +6425,7 @@ func TestLoad_FullConfig(t *testing.T) {
 			opts.Overrides = append(opts.Overrides, versionSource("JNtPSav3", "R909Hblt", "ZT1JOQLn"))
 			r, err := Load(opts)
 			require.NoError(t, err)
-			assertDeepEqual(t, expected, r.RuntimeConfig)
+			prototest.AssertDeepEqual(t, expected, r.RuntimeConfig)
 			require.ElementsMatch(t, expectedWarns, r.Warnings, "Warnings: %#v", r.Warnings)
 		})
 	}
diff --git a/agent/consul/auto_config_endpoint_test.go b/agent/consul/auto_config_endpoint_test.go
index f81461bbb..676b126fd 100644
--- a/agent/consul/auto_config_endpoint_test.go
+++ b/agent/consul/auto_config_endpoint_test.go
@@ -23,6 +23,7 @@ import (
 	"github.com/hashicorp/consul/proto/pbautoconf"
 	"github.com/hashicorp/consul/proto/pbconfig"
 	"github.com/hashicorp/consul/proto/pbconnect"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/tlsutil"
 	"github.com/hashicorp/consul/types"
@@ -213,8 +214,8 @@ func TestAutoConfigInitialConfiguration(t *testing.T) {
 	// -------------------------------------------------------------------------
 
 	type testCase struct {
-		request       pbautoconf.AutoConfigRequest
-		expected      pbautoconf.AutoConfigResponse
+		request       *pbautoconf.AutoConfigRequest
+		expected      *pbautoconf.AutoConfigResponse
 		patchResponse func(t *testing.T, srv *Server, resp *pbautoconf.AutoConfigResponse)
 		err           string
 	}
@@ -223,13 +224,13 @@ func TestAutoConfigInitialConfiguration(t *testing.T) {
 
 	cases := map[string]testCase{
 		"wrong-datacenter": {
-			request: pbautoconf.AutoConfigRequest{
+			request: &pbautoconf.AutoConfigRequest{
 				Datacenter: "no-such-dc",
 			},
 			err: `invalid datacenter "no-such-dc" - agent auto configuration cannot target a remote datacenter`,
 		},
 		"unverifiable": {
-			request: pbautoconf.AutoConfigRequest{
+			request: &pbautoconf.AutoConfigRequest{
 				Node: "test-node",
 				// this is signed using an incorrect private key
 				JWT: signJWTWithStandardClaims(t, altpriv, map[string]interface{}{"consul_node_name": "test-node"}),
@@ -237,14 +238,14 @@ func TestAutoConfigInitialConfiguration(t *testing.T) {
 			err: "Permission denied: Failed JWT authorization: no known key successfully validated the token signature",
 		},
 		"claim-assertion-failed": {
-			request: pbautoconf.AutoConfigRequest{
+			request: &pbautoconf.AutoConfigRequest{
 				Node: "test-node",
 				JWT:  signJWTWithStandardClaims(t, priv, map[string]interface{}{"wrong_claim": "test-node"}),
 			},
 			err: "Permission denied: Failed JWT claim assertion",
 		},
 		"bad-csr-id": {
-			request: pbautoconf.AutoConfigRequest{
+			request: &pbautoconf.AutoConfigRequest{
 				Node: "test-node",
 				JWT:  signJWTWithStandardClaims(t, priv, map[string]interface{}{"consul_node_name": "test-node"}),
 				CSR:  altCSR,
@@ -252,12 +253,12 @@ func TestAutoConfigInitialConfiguration(t *testing.T) {
 			err: "Spiffe ID agent name (alt) of the certificate signing request is not for the correct node (test-node)",
 		},
 		"good": {
-			request: pbautoconf.AutoConfigRequest{
+			request: &pbautoconf.AutoConfigRequest{
 				Node: "test-node",
 				JWT:  signJWTWithStandardClaims(t, priv, map[string]interface{}{"consul_node_name": "test-node"}),
 				CSR:  csr,
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				CARoots:             pbroots,
 				ExtraCACertificates: []string{cacert},
 				Config: &pbconfig.Config{
@@ -323,16 +324,16 @@ func TestAutoConfigInitialConfiguration(t *testing.T) {
 
 	for testName, tcase := range cases {
 		t.Run(testName, func(t *testing.T) {
-			var reply pbautoconf.AutoConfigResponse
-			err := msgpackrpc.CallWithCodec(codec, "AutoConfig.InitialConfiguration", &tcase.request, &reply)
+			reply := &pbautoconf.AutoConfigResponse{}
+			err := msgpackrpc.CallWithCodec(codec, "AutoConfig.InitialConfiguration", &tcase.request, reply)
 			if tcase.err != "" {
 				testutil.RequireErrorContains(t, err, tcase.err)
 			} else {
 				require.NoError(t, err)
 				if tcase.patchResponse != nil {
-					tcase.patchResponse(t, s, &reply)
+					tcase.patchResponse(t, s, reply)
 				}
-				require.Equal(t, tcase.expected, reply)
+				prototest.AssertDeepEqual(t, tcase.expected, reply)
 			}
 		})
 	}
@@ -342,7 +343,7 @@ func TestAutoConfig_baseConfig(t *testing.T) {
 	type testCase struct {
 		serverConfig Config
 		opts         AutoConfigOptions
-		expected     pbautoconf.AutoConfigResponse
+		expected     *pbautoconf.AutoConfigResponse
 		err          string
 	}
 
@@ -356,7 +357,7 @@ func TestAutoConfig_baseConfig(t *testing.T) {
 				NodeName:    "lBdc0lsH",
 				SegmentName: "HZiwlWpi",
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{
 					Datacenter:        "oSWzfhnU",
 					PrimaryDatacenter: "53XO9mx4",
@@ -380,8 +381,8 @@ func TestAutoConfig_baseConfig(t *testing.T) {
 				config: &tcase.serverConfig,
 			}
 
-			actual := pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
-			err := ac.baseConfig(tcase.opts, &actual)
+			actual := &pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
+			err := ac.baseConfig(tcase.opts, actual)
 			if tcase.err == "" {
 				require.NoError(t, err)
 				require.Equal(t, tcase.expected, actual)
@@ -403,7 +404,7 @@ func TestAutoConfig_updateTLSSettingsInConfig(t *testing.T) {
 
 	type testCase struct {
 		tlsConfig tlsutil.Config
-		expected  pbautoconf.AutoConfigResponse
+		expected  *pbautoconf.AutoConfigResponse
 	}
 
 	cases := map[string]testCase{
@@ -417,7 +418,7 @@ func TestAutoConfig_updateTLSSettingsInConfig(t *testing.T) {
 					CipherSuites:         []types.TLSCipherSuite{"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"},
 				},
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{
 					TLS: &pbconfig.TLS{
 						VerifyOutgoing:       true,
@@ -438,7 +439,7 @@ func TestAutoConfig_updateTLSSettingsInConfig(t *testing.T) {
 					CipherSuites:         []types.TLSCipherSuite{"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"},
 				},
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{
 					TLS: &pbconfig.TLS{
 						VerifyOutgoing:       true,
@@ -461,8 +462,8 @@ func TestAutoConfig_updateTLSSettingsInConfig(t *testing.T) {
 				tlsConfigurator: configurator,
 			}
 
-			actual := pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
-			err = ac.updateTLSSettingsInConfig(AutoConfigOptions{}, &actual)
+			actual := &pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
+			err = ac.updateTLSSettingsInConfig(AutoConfigOptions{}, actual)
 			require.NoError(t, err)
 			require.Equal(t, tcase.expected, actual)
 		})
@@ -472,7 +473,7 @@ func TestAutoConfig_updateTLSSettingsInConfig(t *testing.T) {
 func TestAutoConfig_updateGossipEncryptionInConfig(t *testing.T) {
 	type testCase struct {
 		conf     memberlist.Config
-		expected pbautoconf.AutoConfigResponse
+		expected *pbautoconf.AutoConfigResponse
 	}
 
 	gossipKey := make([]byte, 32)
@@ -492,7 +493,7 @@ func TestAutoConfig_updateGossipEncryptionInConfig(t *testing.T) {
 				GossipVerifyIncoming: true,
 				GossipVerifyOutgoing: true,
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{
 					Gossip: &pbconfig.Gossip{
 						Encryption: &pbconfig.GossipEncryption{
@@ -510,7 +511,7 @@ func TestAutoConfig_updateGossipEncryptionInConfig(t *testing.T) {
 				GossipVerifyIncoming: false,
 				GossipVerifyOutgoing: false,
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{
 					Gossip: &pbconfig.Gossip{
 						Encryption: &pbconfig.GossipEncryption{
@@ -525,7 +526,7 @@ func TestAutoConfig_updateGossipEncryptionInConfig(t *testing.T) {
 		"encryption-disabled": {
 			// zero values all around - if no keyring is configured then the gossip
 			// encryption settings should not be set.
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{},
 			},
 		},
@@ -540,8 +541,8 @@ func TestAutoConfig_updateGossipEncryptionInConfig(t *testing.T) {
 				config: cfg,
 			}
 
-			actual := pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
-			err := ac.updateGossipEncryptionInConfig(AutoConfigOptions{}, &actual)
+			actual := &pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
+			err := ac.updateGossipEncryptionInConfig(AutoConfigOptions{}, actual)
 			require.NoError(t, err)
 			require.Equal(t, tcase.expected, actual)
 		})
@@ -617,7 +618,7 @@ func TestAutoConfig_updateTLSCertificatesInConfig(t *testing.T) {
 		tlsConfig    tlsutil.Config
 
 		opts     AutoConfigOptions
-		expected pbautoconf.AutoConfigResponse
+		expected *pbautoconf.AutoConfigResponse
 	}
 
 	cases := map[string]testCase{
@@ -634,7 +635,7 @@ func TestAutoConfig_updateTLSCertificatesInConfig(t *testing.T) {
 					CipherSuites:         []types.TLSCipherSuite{"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384", "TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256", "TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384"},
 				},
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				CARoots:             pbroots,
 				ExtraCACertificates: []string{cacert},
 				Config:              &pbconfig.Config{},
@@ -658,7 +659,7 @@ func TestAutoConfig_updateTLSCertificatesInConfig(t *testing.T) {
 				CSR:      csr,
 				SpiffeID: &csrID,
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config:              &pbconfig.Config{},
 				CARoots:             pbroots,
 				ExtraCACertificates: []string{cacert},
@@ -669,7 +670,7 @@ func TestAutoConfig_updateTLSCertificatesInConfig(t *testing.T) {
 			serverConfig: Config{
 				ConnectEnabled: false,
 			},
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{},
 			},
 		},
@@ -690,8 +691,8 @@ func TestAutoConfig_updateTLSCertificatesInConfig(t *testing.T) {
 				backend:         backend,
 			}
 
-			actual := pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
-			err = ac.updateTLSCertificatesInConfig(tcase.opts, &actual)
+			actual := &pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
+			err = ac.updateTLSCertificatesInConfig(tcase.opts, actual)
 			require.NoError(t, err)
 			require.Equal(t, tcase.expected, actual)
 		})
@@ -701,7 +702,7 @@ func TestAutoConfig_updateTLSCertificatesInConfig(t *testing.T) {
 func TestAutoConfig_updateACLsInConfig(t *testing.T) {
 	type testCase struct {
 		config         Config
-		expected       pbautoconf.AutoConfigResponse
+		expected       *pbautoconf.AutoConfigResponse
 		expectACLToken bool
 		err            error
 	}
@@ -729,7 +730,7 @@ func TestAutoConfig_updateACLsInConfig(t *testing.T) {
 				ACLEnableKeyListPolicy: true,
 			},
 			expectACLToken: true,
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{
 					ACL: &pbconfig.ACL{
 						Enabled:             true,
@@ -761,7 +762,7 @@ func TestAutoConfig_updateACLsInConfig(t *testing.T) {
 				ACLEnableKeyListPolicy: true,
 			},
 			expectACLToken: false,
-			expected: pbautoconf.AutoConfigResponse{
+			expected: &pbautoconf.AutoConfigResponse{
 				Config: &pbconfig.Config{
 					ACL: &pbconfig.ACL{
 						Enabled:             false,
@@ -820,8 +821,8 @@ func TestAutoConfig_updateACLsInConfig(t *testing.T) {
 
 			ac := AutoConfig{config: &tcase.config, backend: backend}
 
-			actual := pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
-			err := ac.updateACLsInConfig(AutoConfigOptions{NodeName: "something"}, &actual)
+			actual := &pbautoconf.AutoConfigResponse{Config: &pbconfig.Config{}}
+			err := ac.updateACLsInConfig(AutoConfigOptions{NodeName: "something"}, actual)
 			if tcase.err != nil {
 				testutil.RequireErrorContains(t, err, tcase.err.Error())
 			} else {
diff --git a/agent/consul/state/catalog_events_test.go b/agent/consul/state/catalog_events_test.go
index 16269242e..bb17dae10 100644
--- a/agent/consul/state/catalog_events_test.go
+++ b/agent/consul/state/catalog_events_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/hashicorp/consul/agent/structs"
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -162,7 +163,7 @@ func TestServiceHealthSnapshot(t *testing.T) {
 			}),
 		},
 	}
-	assertDeepEqual(t, expected, buf.events, cmpEvents)
+	prototest.AssertDeepEqual(t, expected, buf.events, cmpEvents)
 }
 
 func TestServiceHealthSnapshot_ConnectTopic(t *testing.T) {
@@ -263,7 +264,7 @@ func TestServiceHealthSnapshot_ConnectTopic(t *testing.T) {
 				}),
 		},
 	}
-	assertDeepEqual(t, expected, buf.events, cmpEvents)
+	prototest.AssertDeepEqual(t, expected, buf.events, cmpEvents)
 }
 
 type snapshotAppender struct {
@@ -1762,7 +1763,7 @@ func (tc eventsTestCase) run(t *testing.T) {
 	}
 	require.NoError(t, err)
 
-	assertDeepEqual(t, tc.WantEvents, got, cmpPartialOrderEvents, cmpopts.EquateEmpty())
+	prototest.AssertDeepEqual(t, tc.WantEvents, got, cmpPartialOrderEvents, cmpopts.EquateEmpty())
 }
 
 func runCase(t *testing.T, name string, fn func(t *testing.T)) bool {
@@ -1855,13 +1856,6 @@ func evServiceIndex(idx uint64) func(e *stream.Event) error {
 	}
 }
 
-func assertDeepEqual(t *testing.T, x, y interface{}, opts ...cmp.Option) {
-	t.Helper()
-	if diff := cmp.Diff(x, y, opts...); diff != "" {
-		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
-}
-
 // cmpPartialOrderEvents returns a compare option which sorts events so that
 // all events for a particular topic are grouped together. The sort is
 // stable so events with the same key retain their relative order.
diff --git a/agent/consul/state/connect_ca_test.go b/agent/consul/state/connect_ca_test.go
index 2b2349c2d..0a39e7632 100644
--- a/agent/consul/state/connect_ca_test.go
+++ b/agent/consul/state/connect_ca_test.go
@@ -4,6 +4,7 @@ import (
 	"reflect"
 	"testing"
 
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 
 	"github.com/hashicorp/go-memdb"
@@ -214,7 +215,7 @@ func TestStore_CARootSetList(t *testing.T) {
 	assert.Nil(t, err)
 	assert.Len(t, roots, 1)
 	actual := roots[0]
-	assertDeepEqual(t, expected, *actual)
+	prototest.AssertDeepEqual(t, expected, *actual)
 }
 
 func TestStore_CARootSet_emptyID(t *testing.T) {
diff --git a/agent/grpc/private/handler_test.go b/agent/grpc/private/handler_test.go
index bb1a7f414..6edf82195 100644
--- a/agent/grpc/private/handler_test.go
+++ b/agent/grpc/private/handler_test.go
@@ -49,7 +49,7 @@ func TestHandler_PanicRecoveryInterceptor(t *testing.T) {
 
 	resp, err := client.Something(ctx, &testservice.Req{})
 	expectedErr := status.Errorf(codes.Internal, "grpc: panic serving request")
-	require.Equal(t, expectedErr, err)
+	require.Equal(t, expectedErr.Error(), err.Error())
 	require.Nil(t, resp)
 
 	// Read the log
diff --git a/agent/grpc/private/internal/testservice/simple.pb.go b/agent/grpc/private/internal/testservice/simple.pb.go
index bfd847a28..4f12adeb9 100644
--- a/agent/grpc/private/internal/testservice/simple.pb.go
+++ b/agent/grpc/private/internal/testservice/simple.pb.go
@@ -1,138 +1,238 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: agent/grpc/private/internal/testservice/simple.proto
 
 package testservice
 
 import (
 	context "context"
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type Req struct {
-	Datacenter           string   `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Datacenter string `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
 }
 
-func (m *Req) Reset()         { *m = Req{} }
-func (m *Req) String() string { return proto.CompactTextString(m) }
-func (*Req) ProtoMessage()    {}
+func (x *Req) Reset() {
+	*x = Req{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_agent_grpc_private_internal_testservice_simple_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Req) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Req) ProtoMessage() {}
+
+func (x *Req) ProtoReflect() protoreflect.Message {
+	mi := &file_agent_grpc_private_internal_testservice_simple_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 Req.ProtoReflect.Descriptor instead.
 func (*Req) Descriptor() ([]byte, []int) {
-	return fileDescriptor_98af0751f806f450, []int{0}
+	return file_agent_grpc_private_internal_testservice_simple_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *Req) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Req.Unmarshal(m, b)
-}
-func (m *Req) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Req.Marshal(b, m, deterministic)
-}
-func (m *Req) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Req.Merge(m, src)
-}
-func (m *Req) XXX_Size() int {
-	return xxx_messageInfo_Req.Size(m)
-}
-func (m *Req) XXX_DiscardUnknown() {
-	xxx_messageInfo_Req.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Req proto.InternalMessageInfo
-
-func (m *Req) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *Req) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
 
 type Resp struct {
-	ServerName           string   `protobuf:"bytes,1,opt,name=ServerName,proto3" json:"ServerName,omitempty"`
-	Datacenter           string   `protobuf:"bytes,2,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	ServerName string `protobuf:"bytes,1,opt,name=ServerName,proto3" json:"ServerName,omitempty"`
+	Datacenter string `protobuf:"bytes,2,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
 }
 
-func (m *Resp) Reset()         { *m = Resp{} }
-func (m *Resp) String() string { return proto.CompactTextString(m) }
-func (*Resp) ProtoMessage()    {}
+func (x *Resp) Reset() {
+	*x = Resp{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_agent_grpc_private_internal_testservice_simple_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Resp) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Resp) ProtoMessage() {}
+
+func (x *Resp) ProtoReflect() protoreflect.Message {
+	mi := &file_agent_grpc_private_internal_testservice_simple_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 Resp.ProtoReflect.Descriptor instead.
 func (*Resp) Descriptor() ([]byte, []int) {
-	return fileDescriptor_98af0751f806f450, []int{1}
+	return file_agent_grpc_private_internal_testservice_simple_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *Resp) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Resp.Unmarshal(m, b)
-}
-func (m *Resp) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Resp.Marshal(b, m, deterministic)
-}
-func (m *Resp) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Resp.Merge(m, src)
-}
-func (m *Resp) XXX_Size() int {
-	return xxx_messageInfo_Resp.Size(m)
-}
-func (m *Resp) XXX_DiscardUnknown() {
-	xxx_messageInfo_Resp.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Resp proto.InternalMessageInfo
-
-func (m *Resp) GetServerName() string {
-	if m != nil {
-		return m.ServerName
+func (x *Resp) GetServerName() string {
+	if x != nil {
+		return x.ServerName
 	}
 	return ""
 }
 
-func (m *Resp) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *Resp) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
 
-func init() {
-	proto.RegisterType((*Req)(nil), "testservice.Req")
-	proto.RegisterType((*Resp)(nil), "testservice.Resp")
+var File_agent_grpc_private_internal_testservice_simple_proto protoreflect.FileDescriptor
+
+var file_agent_grpc_private_internal_testservice_simple_proto_rawDesc = []byte{
+	0x0a, 0x34, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x2f, 0x70, 0x72, 0x69,
+	0x76, 0x61, 0x74, 0x65, 0x2f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x2f, 0x74, 0x65,
+	0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x69, 0x6d, 0x70, 0x6c, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0b, 0x74, 0x65, 0x73, 0x74, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x22, 0x25, 0x0a, 0x03, 0x52, 0x65, 0x71, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x22, 0x46, 0x0a, 0x04, 0x52, 0x65,
+	0x73, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61,
+	0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74,
+	0x65, 0x72, 0x32, 0x6d, 0x0a, 0x06, 0x53, 0x69, 0x6d, 0x70, 0x6c, 0x65, 0x12, 0x32, 0x0a, 0x09,
+	0x53, 0x6f, 0x6d, 0x65, 0x74, 0x68, 0x69, 0x6e, 0x67, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x74, 0x65,
+	0x73, 0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00,
+	0x12, 0x2f, 0x0a, 0x04, 0x46, 0x6c, 0x6f, 0x77, 0x12, 0x10, 0x2e, 0x74, 0x65, 0x73, 0x74, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x71, 0x1a, 0x11, 0x2e, 0x74, 0x65, 0x73,
+	0x74, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x30,
+	0x01, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("agent/grpc/private/internal/testservice/simple.proto", fileDescriptor_98af0751f806f450)
+var (
+	file_agent_grpc_private_internal_testservice_simple_proto_rawDescOnce sync.Once
+	file_agent_grpc_private_internal_testservice_simple_proto_rawDescData = file_agent_grpc_private_internal_testservice_simple_proto_rawDesc
+)
+
+func file_agent_grpc_private_internal_testservice_simple_proto_rawDescGZIP() []byte {
+	file_agent_grpc_private_internal_testservice_simple_proto_rawDescOnce.Do(func() {
+		file_agent_grpc_private_internal_testservice_simple_proto_rawDescData = protoimpl.X.CompressGZIP(file_agent_grpc_private_internal_testservice_simple_proto_rawDescData)
+	})
+	return file_agent_grpc_private_internal_testservice_simple_proto_rawDescData
 }
 
-var fileDescriptor_98af0751f806f450 = []byte{
-	// 189 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x8f, 0xcd, 0x0a, 0x82, 0x40,
-	0x14, 0x85, 0xb3, 0x44, 0xf0, 0xb6, 0xa9, 0x59, 0x45, 0x8b, 0x08, 0x21, 0x68, 0xe5, 0x84, 0xf5,
-	0x08, 0xe1, 0xb2, 0xc5, 0xf8, 0x04, 0x93, 0x5c, 0x6c, 0xc0, 0xf9, 0x71, 0xe6, 0x62, 0xaf, 0x1f,
-	0x0a, 0x91, 0xb8, 0x6a, 0xfb, 0xdd, 0xef, 0x1e, 0xce, 0x81, 0x9b, 0x6c, 0xd0, 0x10, 0x6f, 0xbc,
-	0xab, 0xb9, 0xf3, 0xaa, 0x97, 0x84, 0x5c, 0x19, 0x42, 0x6f, 0x64, 0xcb, 0x09, 0x03, 0x05, 0xf4,
-	0xbd, 0xaa, 0x91, 0x07, 0xa5, 0x5d, 0x8b, 0xb9, 0xf3, 0x96, 0x2c, 0x5b, 0x4f, 0x2e, 0xd9, 0x09,
-	0x56, 0x02, 0x3b, 0x76, 0x00, 0xb8, 0x4b, 0x92, 0x35, 0x0e, 0xdf, 0xbb, 0xe8, 0x18, 0x9d, 0x53,
-	0x31, 0x21, 0x59, 0x09, 0xb1, 0xc0, 0xe0, 0x06, 0xaf, 0x42, 0xdf, 0xa3, 0x7f, 0x48, 0x8d, 0x5f,
-	0xef, 0x47, 0x66, 0x39, 0xcb, 0x79, 0x4e, 0xa1, 0x21, 0xa9, 0xc6, 0x2e, 0xac, 0x80, 0xb4, 0xb2,
-	0x1a, 0xe9, 0xa5, 0x4c, 0xc3, 0x36, 0xf9, 0xa4, 0x53, 0x2e, 0xb0, 0xdb, 0x6f, 0x67, 0x24, 0xb8,
-	0x6c, 0xc1, 0x38, 0xc4, 0x65, 0x6b, 0xdf, 0x7f, 0xea, 0x97, 0xe8, 0x99, 0x8c, 0x8b, 0xaf, 0x9f,
-	0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x5c, 0xf5, 0xcb, 0x29, 0x01, 0x00, 0x00,
+var file_agent_grpc_private_internal_testservice_simple_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_agent_grpc_private_internal_testservice_simple_proto_goTypes = []interface{}{
+	(*Req)(nil),  // 0: testservice.Req
+	(*Resp)(nil), // 1: testservice.Resp
+}
+var file_agent_grpc_private_internal_testservice_simple_proto_depIdxs = []int32{
+	0, // 0: testservice.Simple.Something:input_type -> testservice.Req
+	0, // 1: testservice.Simple.Flow:input_type -> testservice.Req
+	1, // 2: testservice.Simple.Something:output_type -> testservice.Resp
+	1, // 3: testservice.Simple.Flow:output_type -> testservice.Resp
+	2, // [2:4] is the sub-list for method output_type
+	0, // [0:2] 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_agent_grpc_private_internal_testservice_simple_proto_init() }
+func file_agent_grpc_private_internal_testservice_simple_proto_init() {
+	if File_agent_grpc_private_internal_testservice_simple_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_agent_grpc_private_internal_testservice_simple_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Req); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_agent_grpc_private_internal_testservice_simple_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Resp); 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_agent_grpc_private_internal_testservice_simple_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_agent_grpc_private_internal_testservice_simple_proto_goTypes,
+		DependencyIndexes: file_agent_grpc_private_internal_testservice_simple_proto_depIdxs,
+		MessageInfos:      file_agent_grpc_private_internal_testservice_simple_proto_msgTypes,
+	}.Build()
+	File_agent_grpc_private_internal_testservice_simple_proto = out.File
+	file_agent_grpc_private_internal_testservice_simple_proto_rawDesc = nil
+	file_agent_grpc_private_internal_testservice_simple_proto_goTypes = nil
+	file_agent_grpc_private_internal_testservice_simple_proto_depIdxs = nil
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -210,10 +310,10 @@ type SimpleServer interface {
 type UnimplementedSimpleServer struct {
 }
 
-func (*UnimplementedSimpleServer) Something(ctx context.Context, req *Req) (*Resp, error) {
+func (*UnimplementedSimpleServer) Something(context.Context, *Req) (*Resp, error) {
 	return nil, status.Errorf(codes.Unimplemented, "method Something not implemented")
 }
-func (*UnimplementedSimpleServer) Flow(req *Req, srv Simple_FlowServer) error {
+func (*UnimplementedSimpleServer) Flow(*Req, Simple_FlowServer) error {
 	return status.Errorf(codes.Unimplemented, "method Flow not implemented")
 }
 
diff --git a/agent/grpc/private/services/subscribe/subscribe_test.go b/agent/grpc/private/services/subscribe/subscribe_test.go
index aea7669c9..95df5fb13 100644
--- a/agent/grpc/private/services/subscribe/subscribe_test.go
+++ b/agent/grpc/private/services/subscribe/subscribe_test.go
@@ -10,7 +10,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/google/go-cmp/cmp"
 	"github.com/google/go-cmp/cmp/cmpopts"
 	"github.com/hashicorp/go-hclog"
 	"github.com/hashicorp/go-uuid"
@@ -28,6 +27,7 @@ import (
 	"github.com/hashicorp/consul/api"
 	"github.com/hashicorp/consul/proto/pbservice"
 	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -206,7 +206,7 @@ func TestServer_Subscribe_IntegrationWithBackend(t *testing.T) {
 				Payload: &pbsubscribe.Event_EndOfSnapshot{EndOfSnapshot: true},
 			},
 		}
-		assertDeepEqual(t, expected, snapshotEvents)
+		prototest.AssertDeepEqual(t, expected, snapshotEvents)
 	})
 
 	runStep(t, "update the registration by adding a check", func(t *testing.T) {
@@ -271,7 +271,7 @@ func TestServer_Subscribe_IntegrationWithBackend(t *testing.T) {
 				},
 			},
 		}
-		assertDeepEqual(t, expectedEvent, event)
+		prototest.AssertDeepEqual(t, expectedEvent, event)
 	})
 }
 
@@ -311,13 +311,6 @@ func getEvent(t *testing.T, ch chan eventOrError) *pbsubscribe.Event {
 	return nil
 }
 
-func assertDeepEqual(t *testing.T, x, y interface{}, opts ...cmp.Option) {
-	t.Helper()
-	if diff := cmp.Diff(x, y, opts...); diff != "" {
-		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
-}
-
 type testBackend struct {
 	store       *state.Store
 	authorizer  func(token string, entMeta *structs.EnterpriseMeta) acl.Authorizer
@@ -571,7 +564,7 @@ func TestServer_Subscribe_IntegrationWithBackend_ForwardToDC(t *testing.T) {
 				Payload: &pbsubscribe.Event_EndOfSnapshot{EndOfSnapshot: true},
 			},
 		}
-		assertDeepEqual(t, expected, snapshotEvents)
+		prototest.AssertDeepEqual(t, expected, snapshotEvents)
 	})
 
 	runStep(t, "update the registration by adding a check", func(t *testing.T) {
@@ -636,7 +629,7 @@ func TestServer_Subscribe_IntegrationWithBackend_ForwardToDC(t *testing.T) {
 				},
 			},
 		}
-		assertDeepEqual(t, expectedEvent, event)
+		prototest.AssertDeepEqual(t, expectedEvent, event)
 	})
 }
 
@@ -949,20 +942,20 @@ func TestNewEventFromSteamEvent(t *testing.T) {
 	type testCase struct {
 		name     string
 		event    stream.Event
-		expected pbsubscribe.Event
+		expected *pbsubscribe.Event
 	}
 
 	fn := func(t *testing.T, tc testCase) {
 		expected := tc.expected
 		actual := newEventFromStreamEvent(tc.event)
-		assertDeepEqual(t, &expected, actual, cmpopts.EquateEmpty())
+		prototest.AssertDeepEqual(t, expected, actual, cmpopts.EquateEmpty())
 	}
 
 	var testCases = []testCase{
 		{
 			name:  "end of snapshot",
 			event: newEventFromSubscription(t, 0),
-			expected: pbsubscribe.Event{
+			expected: &pbsubscribe.Event{
 				Index:   1,
 				Payload: &pbsubscribe.Event_EndOfSnapshot{EndOfSnapshot: true},
 			},
@@ -970,7 +963,7 @@ func TestNewEventFromSteamEvent(t *testing.T) {
 		{
 			name:  "new snapshot to follow",
 			event: newEventFromSubscription(t, 22),
-			expected: pbsubscribe.Event{
+			expected: &pbsubscribe.Event{
 				Payload: &pbsubscribe.Event_NewSnapshotToFollow{NewSnapshotToFollow: true},
 			},
 		},
@@ -1000,7 +993,7 @@ func TestNewEventFromSteamEvent(t *testing.T) {
 						},
 					}),
 			},
-			expected: pbsubscribe.Event{
+			expected: &pbsubscribe.Event{
 				Index: 2002,
 				Payload: &pbsubscribe.Event_EventBatch{
 					EventBatch: &pbsubscribe.EventBatch{
@@ -1066,7 +1059,7 @@ func TestNewEventFromSteamEvent(t *testing.T) {
 					},
 				},
 			},
-			expected: pbsubscribe.Event{
+			expected: &pbsubscribe.Event{
 				Index: 2002,
 				Payload: &pbsubscribe.Event_ServiceHealth{
 					ServiceHealth: &pbsubscribe.ServiceHealthUpdate{
diff --git a/agent/grpc/private/stats_test.go b/agent/grpc/private/stats_test.go
index 78e63647e..0d7268e4e 100644
--- a/agent/grpc/private/stats_test.go
+++ b/agent/grpc/private/stats_test.go
@@ -15,6 +15,7 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/hashicorp/consul/agent/grpc/private/internal/testservice"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/go-hclog"
 )
 
@@ -86,21 +87,14 @@ func TestHandler_EmitsStats(t *testing.T) {
 		{key: []string{"testing", "grpc", "server", "connections"}, val: 0},
 		{key: []string{"testing", "grpc", "server", "streams"}, val: 0},
 	}
-	assertDeepEqual(t, expectedGauge, sink.gaugeCalls, cmpMetricCalls)
+	prototest.AssertDeepEqual(t, expectedGauge, sink.gaugeCalls, cmpMetricCalls)
 
 	expectedCounter := []metricCall{
 		{key: []string{"testing", "grpc", "server", "connection", "count"}, val: 1},
 		{key: []string{"testing", "grpc", "server", "request", "count"}, val: 1},
 		{key: []string{"testing", "grpc", "server", "stream", "count"}, val: 1},
 	}
-	assertDeepEqual(t, expectedCounter, sink.incrCounterCalls, cmpMetricCalls)
-}
-
-func assertDeepEqual(t *testing.T, x, y interface{}, opts ...cmp.Option) {
-	t.Helper()
-	if diff := cmp.Diff(x, y, opts...); diff != "" {
-		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
+	prototest.AssertDeepEqual(t, expectedCounter, sink.incrCounterCalls, cmpMetricCalls)
 }
 
 func patchGlobalMetrics(t *testing.T) (*fakeMetricsSink, func()) {
diff --git a/agent/rpcclient/health/view.go b/agent/rpcclient/health/view.go
index 7ec0eca26..6343032d9 100644
--- a/agent/rpcclient/health/view.go
+++ b/agent/rpcclient/health/view.go
@@ -21,9 +21,9 @@ type MaterializerDeps struct {
 	Logger hclog.Logger
 }
 
-func newMaterializerRequest(srvReq structs.ServiceSpecificRequest) func(index uint64) pbsubscribe.SubscribeRequest {
-	return func(index uint64) pbsubscribe.SubscribeRequest {
-		req := pbsubscribe.SubscribeRequest{
+func newMaterializerRequest(srvReq structs.ServiceSpecificRequest) func(index uint64) *pbsubscribe.SubscribeRequest {
+	return func(index uint64) *pbsubscribe.SubscribeRequest {
+		req := &pbsubscribe.SubscribeRequest{
 			Topic:      pbsubscribe.Topic_ServiceHealth,
 			Key:        srvReq.ServiceName,
 			Token:      srvReq.Token,
diff --git a/agent/rpcclient/health/view_test.go b/agent/rpcclient/health/view_test.go
index 96bae37a1..c2a7ea79b 100644
--- a/agent/rpcclient/health/view_test.go
+++ b/agent/rpcclient/health/view_test.go
@@ -20,6 +20,7 @@ import (
 	"github.com/hashicorp/consul/proto/pbcommon"
 	"github.com/hashicorp/consul/proto/pbservice"
 	"github.com/hashicorp/consul/proto/pbsubscribe"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/types"
 )
 
@@ -291,7 +292,7 @@ func TestHealthView_IntegrationWithStore_WithFullSnapshot(t *testing.T) {
 		require.Equal(t, uint64(5), result.Index)
 		expected := newExpectedNodes("node1", "node2", "node3")
 		expected.Index = 5
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 
 		req.QueryOptions.MinQueryIndex = result.Index
 	})
@@ -319,7 +320,7 @@ func TestHealthView_IntegrationWithStore_WithFullSnapshot(t *testing.T) {
 		require.Equal(t, uint64(20), result.Index)
 		expected := newExpectedNodes("node2", "node3")
 		expected.Index = 20
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 
 		req.QueryOptions.MinQueryIndex = result.Index
 	})
@@ -349,7 +350,7 @@ func TestHealthView_IntegrationWithStore_WithFullSnapshot(t *testing.T) {
 		require.Equal(t, uint64(50), result.Index)
 		expected := newExpectedNodes("node3", "node4", "node5")
 		expected.Index = 50
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 
 		req.QueryOptions.MinQueryIndex = result.Index
 	})
@@ -376,7 +377,7 @@ func TestHealthView_IntegrationWithStore_WithFullSnapshot(t *testing.T) {
 		require.Equal(t, uint64(50), result.Index)
 		expected := newExpectedNodes("node3", "node4", "node5")
 		expected.Index = 50
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 	})
 }
 
@@ -399,13 +400,6 @@ var cmpCheckServiceNodeNames = cmp.Options{
 	}),
 }
 
-func assertDeepEqual(t *testing.T, x, y interface{}, opts ...cmp.Option) {
-	t.Helper()
-	if diff := cmp.Diff(x, y, opts...); diff != "" {
-		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
-}
-
 func TestHealthView_IntegrationWithStore_EventBatches(t *testing.T) {
 	namespace := getNamespace("ns3")
 	client := newStreamClient(validateNamespace(namespace))
@@ -444,7 +438,7 @@ func TestHealthView_IntegrationWithStore_EventBatches(t *testing.T) {
 
 		expected := newExpectedNodes("node1", "node2", "node3")
 		expected.Index = 5
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 		req.QueryOptions.MinQueryIndex = result.Index
 	})
 
@@ -465,7 +459,7 @@ func TestHealthView_IntegrationWithStore_EventBatches(t *testing.T) {
 		require.Equal(t, uint64(20), result.Index)
 		expected := newExpectedNodes("node2", "node3", "node4")
 		expected.Index = 20
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 
 		req.QueryOptions.MinQueryIndex = result.Index
 	})
@@ -512,7 +506,7 @@ func TestHealthView_IntegrationWithStore_Filtering(t *testing.T) {
 		require.Equal(t, uint64(5), result.Index)
 		expected := newExpectedNodes("node2")
 		expected.Index = 5
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 
 		req.QueryOptions.MinQueryIndex = result.Index
 	})
@@ -532,7 +526,7 @@ func TestHealthView_IntegrationWithStore_Filtering(t *testing.T) {
 		require.Equal(t, uint64(20), result.Index)
 		expected := newExpectedNodes("node2")
 		expected.Index = 20
-		assertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
+		prototest.AssertDeepEqual(t, expected, result.Value, cmpCheckServiceNodeNames)
 	})
 }
 
diff --git a/agent/structs/structs.go b/agent/structs/structs.go
index 80f27dd95..1a678f5c0 100644
--- a/agent/structs/structs.go
+++ b/agent/structs/structs.go
@@ -2566,19 +2566,12 @@ func Encode(t MessageType, msg interface{}) ([]byte, error) {
 	return buf.Bytes(), err
 }
 
-type ProtoMarshaller interface {
-	Size() int
-	MarshalTo([]byte) (int, error)
-	Unmarshal([]byte) error
-	ProtoMessage()
-}
-
 func EncodeProtoInterface(t MessageType, message interface{}) ([]byte, error) {
 	if marshaller, ok := message.(proto.Message); ok {
 		return EncodeProto(t, marshaller)
 	}
 
-	return nil, fmt.Errorf("message does not implement the ProtoMarshaller interface: %T", message)
+	return nil, fmt.Errorf("message does not implement proto.Message: %T", message)
 }
 
 func EncodeProto(t MessageType, pb proto.Message) ([]byte, error) {
diff --git a/agent/submatview/materializer.go b/agent/submatview/materializer.go
index b830689e6..3b870d9e1 100644
--- a/agent/submatview/materializer.go
+++ b/agent/submatview/materializer.go
@@ -63,7 +63,7 @@ type Deps struct {
 	Client  StreamClient
 	Logger  hclog.Logger
 	Waiter  *retry.Waiter
-	Request func(index uint64) pbsubscribe.SubscribeRequest
+	Request func(index uint64) *pbsubscribe.SubscribeRequest
 }
 
 // StreamClient provides a subscription to state change events.
@@ -136,13 +136,13 @@ func isNonTemporaryOrConsecutiveFailure(err error, failures int) bool {
 
 // runSubscription opens a new subscribe streaming call to the servers and runs
 // for it's lifetime or until the view is closed.
-func (m *Materializer) runSubscription(ctx context.Context, req pbsubscribe.SubscribeRequest) error {
+func (m *Materializer) runSubscription(ctx context.Context, req *pbsubscribe.SubscribeRequest) error {
 	ctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
 	m.handler = initialHandler(req.Index)
 
-	s, err := m.deps.Client.Subscribe(ctx, &req)
+	s, err := m.deps.Client.Subscribe(ctx, req)
 	if err != nil {
 		return err
 	}
diff --git a/agent/submatview/store_test.go b/agent/submatview/store_test.go
index 93b04d1e8..b177380d3 100644
--- a/agent/submatview/store_test.go
+++ b/agent/submatview/store_test.go
@@ -225,8 +225,8 @@ func (r *fakeRequest) NewMaterializer() (*Materializer, error) {
 		View:   &fakeView{srvs: make(map[string]*pbservice.CheckServiceNode)},
 		Client: r.client,
 		Logger: hclog.New(nil),
-		Request: func(index uint64) pbsubscribe.SubscribeRequest {
-			req := pbsubscribe.SubscribeRequest{
+		Request: func(index uint64) *pbsubscribe.SubscribeRequest {
+			req := &pbsubscribe.SubscribeRequest{
 				Topic:      pbsubscribe.Topic_ServiceHealth,
 				Key:        "key",
 				Token:      "abcd",
diff --git a/agent/xds/clusters.go b/agent/xds/clusters.go
index 716c320d3..fac6d0cfd 100644
--- a/agent/xds/clusters.go
+++ b/agent/xds/clusters.go
@@ -10,6 +10,7 @@ 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"
 	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
+	envoy_upstreams_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
 	envoy_matcher_v3 "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
 	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 
@@ -18,6 +19,7 @@ import (
 	"github.com/golang/protobuf/ptypes"
 	"github.com/golang/protobuf/ptypes/any"
 	"github.com/golang/protobuf/ptypes/wrappers"
+	"google.golang.org/protobuf/types/known/anypb"
 
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/agent/proxycfg"
@@ -486,7 +488,7 @@ func (s *ResourceGenerator) makeAppCluster(cfgSnap *proxycfg.ConfigSnapshot, nam
 		protocol = cfg.Protocol
 	}
 	if protocol == "http2" || protocol == "grpc" {
-		c.Http2ProtocolOptions = &envoy_core_v3.Http2ProtocolOptions{}
+		s.setHttp2ProtocolOptions(c)
 	}
 
 	return c, err
@@ -537,7 +539,7 @@ func (s *ResourceGenerator) makeUpstreamClusterForPreparedQuery(upstream structs
 			OutlierDetection: ToOutlierDetection(cfg.PassiveHealthCheck),
 		}
 		if cfg.Protocol == "http2" || cfg.Protocol == "grpc" {
-			c.Http2ProtocolOptions = &envoy_core_v3.Http2ProtocolOptions{}
+			s.setHttp2ProtocolOptions(c)
 		}
 	}
 
@@ -742,7 +744,7 @@ func (s *ResourceGenerator) makeUpstreamClustersForDiscoveryChain(
 		}
 
 		if proto == "http2" || proto == "grpc" {
-			c.Http2ProtocolOptions = &envoy_core_v3.Http2ProtocolOptions{}
+			s.setHttp2ProtocolOptions(c)
 		}
 
 		commonTLSContext := makeCommonTLSContextFromLeafWithoutParams(cfgSnap, cfgSnap.Leaf())
@@ -1037,3 +1039,21 @@ func injectLBToCluster(ec *structs.LoadBalancer, c *envoy_cluster_v3.Cluster) er
 	}
 	return nil
 }
+
+func (s *ResourceGenerator) setHttp2ProtocolOptions(c *envoy_cluster_v3.Cluster) {
+	typedExtensionProtocolOptions := &envoy_upstreams_v3.HttpProtocolOptions{
+		UpstreamProtocolOptions: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig_{
+			ExplicitHttpConfig: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig{
+				ProtocolConfig: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig_Http2ProtocolOptions{
+					Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{},
+				},
+			},
+		},
+	}
+	typedExtensionProtocolOptionsEncoded, err := anypb.New(typedExtensionProtocolOptions)
+	if err != nil {
+		s.Logger.Warn("failed to convert http protocol options to anypb")
+	}
+	c.TypedExtensionProtocolOptions = make(map[string]*anypb.Any)
+	c.TypedExtensionProtocolOptions["envoy.extensions.upstreams.http.v3.HttpProtocolOptions"] = typedExtensionProtocolOptionsEncoded
+}
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
index b0e4298f5..fd63324de 100644
--- a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
+++ b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
@@ -18,8 +18,15 @@
       "circuitBreakers": {
 
       },
-      "http2ProtocolOptions": {
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
 
+            }
+          }
+        }
       },
       "outlierDetection": {
 
diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden
index 11d8684b4..b86715755 100644
--- a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden
+++ b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden
@@ -50,8 +50,15 @@
           }
         ]
       },
-      "http2ProtocolOptions": {
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
 
+            }
+          }
+        }
       }
     }
   ],
diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden
index 624b8d8e6..b42be025b 100644
--- a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden
+++ b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden
@@ -25,8 +25,15 @@
           }
         ]
       },
-      "http2ProtocolOptions": {
+      "typedExtensionProtocolOptions": {
+        "envoy.extensions.upstreams.http.v3.HttpProtocolOptions": {
+          "@type": "type.googleapis.com/envoy.extensions.upstreams.http.v3.HttpProtocolOptions",
+          "explicitHttpConfig": {
+            "http2ProtocolOptions": {
 
+            }
+          }
+        }
       }
     },
     {
diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden
index 24861388e..cd8f56517 100644
--- a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden
+++ b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden
index 24861388e..cd8f56517 100644
--- a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden
+++ b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden
index 24861388e..cd8f56517 100644
--- a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden
+++ b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.cluster.v3.Cluster",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden
index 4e316f149..8504dae2b 100644
--- a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden
+++ b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden
index 4e316f149..8504dae2b 100644
--- a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden
+++ b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden
index 4e316f149..8504dae2b 100644
--- a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden
+++ b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.endpoint.v3.ClusterLoadAssignment",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden
index c587fc277..53b67bb37 100644
--- a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden
+++ b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/defaults.envoy-1-20-x.golden b/agent/xds/testdata/routes/defaults.envoy-1-20-x.golden
index 6bbc48e6d..9c050cbe6 100644
--- a/agent/xds/testdata/routes/defaults.envoy-1-20-x.golden
+++ b/agent/xds/testdata/routes/defaults.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden
index 6bbc48e6d..9c050cbe6 100644
--- a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden
+++ b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden
index 6bbc48e6d..9c050cbe6 100644
--- a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden
index 6bbc48e6d..9c050cbe6 100644
--- a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden
+++ b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden
@@ -1,7 +1,5 @@
 {
   "versionInfo": "00000001",
-  "resources": [
-  ],
   "typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
   "nonce": "00000001"
 }
\ No newline at end of file
diff --git a/agent/xds/xds_protocol_helpers_test.go b/agent/xds/xds_protocol_helpers_test.go
index 228cf543b..6f2863f31 100644
--- a/agent/xds/xds_protocol_helpers_test.go
+++ b/agent/xds/xds_protocol_helpers_test.go
@@ -18,6 +18,7 @@ import (
 	envoy_network_rbac_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rbac/v3"
 	envoy_tcp_proxy_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
 	envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
+	envoy_upstreams_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
 	envoy_discovery_v3 "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
 	envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3"
 
@@ -27,6 +28,7 @@ import (
 	"github.com/golang/protobuf/ptypes/wrappers"
 	"github.com/mitchellh/copystructure"
 	"github.com/stretchr/testify/require"
+	"google.golang.org/protobuf/types/known/anypb"
 
 	"github.com/hashicorp/consul/agent/proxycfg"
 	"github.com/hashicorp/consul/agent/structs"
@@ -421,7 +423,7 @@ func makeTestCluster(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName st
 			TransportSocket: xdsNewUpstreamTransportSocket(t, snap, dbSNI, dbURI),
 		}
 	case "http2:db":
-		return &envoy_cluster_v3.Cluster{
+		c := &envoy_cluster_v3.Cluster{
 			Name: dbSNI,
 			ClusterDiscoveryType: &envoy_cluster_v3.Cluster_Type{
 				Type: envoy_cluster_v3.Cluster_EDS,
@@ -435,10 +437,23 @@ func makeTestCluster(t *testing.T, snap *proxycfg.ConfigSnapshot, fixtureName st
 			CommonLbConfig: &envoy_cluster_v3.Cluster_CommonLbConfig{
 				HealthyPanicThreshold: &envoy_type_v3.Percent{Value: 0},
 			},
-			ConnectTimeout:       ptypes.DurationProto(5 * time.Second),
-			TransportSocket:      xdsNewUpstreamTransportSocket(t, snap, dbSNI, dbURI),
-			Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{},
+			ConnectTimeout:  ptypes.DurationProto(5 * time.Second),
+			TransportSocket: xdsNewUpstreamTransportSocket(t, snap, dbSNI, dbURI),
 		}
+		typedExtensionProtocolOptions := &envoy_upstreams_v3.HttpProtocolOptions{
+			UpstreamProtocolOptions: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig_{
+				ExplicitHttpConfig: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig{
+					ProtocolConfig: &envoy_upstreams_v3.HttpProtocolOptions_ExplicitHttpConfig_Http2ProtocolOptions{
+						Http2ProtocolOptions: &envoy_core_v3.Http2ProtocolOptions{},
+					},
+				},
+			},
+		}
+		typedExtensionProtocolOptionsEncoded, err := anypb.New(typedExtensionProtocolOptions)
+		require.NoError(t, err)
+		c.TypedExtensionProtocolOptions = make(map[string]*anypb.Any)
+		c.TypedExtensionProtocolOptions["envoy.extensions.upstreams.http.v3.HttpProtocolOptions"] = typedExtensionProtocolOptionsEncoded
+		return c
 	case "http:db":
 		return &envoy_cluster_v3.Cluster{
 			Name: dbSNI,
diff --git a/agent/xds/z_xds_packages.go b/agent/xds/z_xds_packages.go
index 2c781214a..4528e3ae2 100644
--- a/agent/xds/z_xds_packages.go
+++ b/agent/xds/z_xds_packages.go
@@ -5,6 +5,7 @@ package xds
 import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/admin/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/admin/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/admin/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/annotations"
 	_ "github.com/envoyproxy/go-control-plane/envoy/api/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/api/v2/auth"
@@ -16,15 +17,21 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/api/v2/route"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/accesslog/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/bootstrap/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/aggregate/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/dynamic_forward_proxy/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/redis"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/dynamic_forward_proxy/v2alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/matcher/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/common/tap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/core/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/core/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/filter/dubbo/router/v2alpha1"
@@ -83,21 +90,24 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/zookeeper_proxy/v1alpha1"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/filter/thrift/rate_limit/v2alpha1"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/filter/thrift/router/v2alpha1"
-	_ "github.com/envoyproxy/go-control-plane/envoy/config/filter/udp/dns_filter/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/filter/udp/udp_proxy/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/grpc_credential/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/health_checker/redis/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/listener/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/listener/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/metrics/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/overload/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/overload/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/ratelimit/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/rbac/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/resource_monitor/fixed_heap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/resource_monitor/injected_resource/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/retry/omit_canary_hosts/v2"
@@ -105,14 +115,16 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/retry/previous_hosts/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/retry/previous_priorities"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/route/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/route/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/tap/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/tap/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/trace/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/trace/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/trace/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/config/trace/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/alts/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/raw_buffer/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/config/transport_socket/tap/v2alpha"
-	_ "github.com/envoyproxy/go-control-plane/envoy/config/wasm/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/accesslog/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/cluster/v2alpha"
@@ -121,48 +133,88 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/core/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/dns/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/dns/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/data/dns/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/data/tap/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/file/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/grpc/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/open_telemetry/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/open_telemetry/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/stream/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/stream/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/access_loggers/wasm/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/cache/simple_http_cache/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/aggregate/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/clusters/redis/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/dynamic_forward_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/matching/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/matching/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/tap/v3"
-	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filter/udp/dns_filter/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/common/tap/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/brotli/compressor/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/brotli/decompressor/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/compressor/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/compression/gzip/decompressor/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/dependency/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/fault/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/common/matcher/action/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/adaptive_concurrency/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/admission_control/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/aws_lambda/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/aws_request_signing/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/buffer/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cache/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cache/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cdn_loop/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/composite/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/compressor/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/compressor/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/cors/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/csrf/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/csrf/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/decompressor/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamic_forward_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/dynamo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_authz/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_authz/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ext_proc/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/fault/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_bridge/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_http1_reverse_bridge/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_json_transcoder/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_web/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/gzip/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/gzip/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/header_to_metadata/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/header_to_metadata/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/health_check/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/health_check/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ip_tagging/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/jwt_authn/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/kill_request/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/local_ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/lua/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/oauth2/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/oauth2/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/on_demand/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/original_src/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ratelimit/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/ratelimit/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/router/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/squash/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/tap/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/tap/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/http_inspector/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_dst/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/original_src/v3"
@@ -172,45 +224,110 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/direct_response/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/router/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/dubbo_proxy/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/echo/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_authz/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ext_authz/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/kafka_broker/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/local_ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/mongo_proxy/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/mysql_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/postgres_proxy/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ratelimit/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/ratelimit/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rbac/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rbac/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/redis_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rocketmq_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/rocketmq_proxy/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sni_cluster/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/sni_dynamic_forward_proxy/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/filters/ratelimit/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/router/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/thrift_proxy/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/wasm/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/zookeeper_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/udp/dns_filter/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/udp/dns_filter/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/udp/udp_proxy/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/health_checkers/redis/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/header_formatters/preserve_case/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/custom_header/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/http/original_ip_detection/xff/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/allow_listed_routes/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/previous_routes/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/internal_redirect/safe_cross_scheme/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/common_inputs/environment_variable/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/matching/input_matchers/consistent_hashing/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/network/socket_interface/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/rate_limit_descriptors/expr/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/request_id/uuid/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/fixed_heap/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/resource_monitors/injected_resource/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/omit_canary_hosts/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/omit_host_metadata/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/host/previous_hosts/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/retry/priority/previous_priorities/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/stat_sinks/wasm/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/datadog/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/dynamic_ot/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/lightstep/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/opencensus/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/skywalking/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/xray/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/tracers/zipkin/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/alts/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/proxy_protocol/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/quic/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/quic/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/raw_buffer/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/s2a/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/starttls/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/starttls/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tap/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tap/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/generic/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/http/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/tcp/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/http/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/upstreams/tcp/generic/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/wasm/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/extensions/watchdog/profile_action/v3alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/accesslog/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/auth/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/cluster/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/discovery/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/endpoint/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/event_reporting/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/event_reporting/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/event_reporting/v4alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3alpha"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/extension/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/health/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/health/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/listener/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/load_stats/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/metrics/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/ratelimit/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/route/v3"
@@ -218,16 +335,22 @@ import (
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/secret/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/status/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/status/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/status/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/tap/v2alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/tap/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/tap/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/trace/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/service/trace/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/service/trace/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type"
+	_ "github.com/envoyproxy/go-control-plane/envoy/type/http/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/matcher"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/type/matcher/v4alpha"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/metadata/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v2"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/tracing/v3"
 	_ "github.com/envoyproxy/go-control-plane/envoy/type/v3"
+	_ "github.com/envoyproxy/go-control-plane/envoy/watchdog/v3alpha"
 )
diff --git a/build-support/scripts/envoy-library-references.sh b/build-support/scripts/envoy-library-references.sh
index b91285fa5..819f01e01 100644
--- a/build-support/scripts/envoy-library-references.sh
+++ b/build-support/scripts/envoy-library-references.sh
@@ -66,5 +66,5 @@ goimports -w "${OUTFILE}"
 mv -f "${OUTFILE}" ../../agent/xds
 )
 
-echo "updating vendored code..."
-make update-vendor
+echo "tidying dependencies..."
+make go-mod-tidy
diff --git a/build-support/scripts/proto-gen.sh b/build-support/scripts/proto-gen.sh
index 022b2ff44..eff35b09a 100755
--- a/build-support/scripts/proto-gen.sh
+++ b/build-support/scripts/proto-gen.sh
@@ -147,13 +147,9 @@ function main {
       return 1
    fi
 
-   BUILD_TAGS=$(sed -e '/^[[:space:]]*$/,$d' < "${proto_path}" | grep '// +build')
+   BUILD_TAGS=$(head -n 2 "${proto_path}" | grep '^//go:build\|// +build')
    if test -n "${BUILD_TAGS}"
    then
-      echo -e "${BUILD_TAGS}\n" >> "${proto_go_path}.new"
-      cat "${proto_go_path}" >> "${proto_go_path}.new"
-      mv "${proto_go_path}.new" "${proto_go_path}"
-
       echo -e "${BUILD_TAGS}\n" >> "${proto_go_bin_path}.new"
       cat "${proto_go_bin_path}" >> "${proto_go_bin_path}.new"
       mv "${proto_go_bin_path}.new" "${proto_go_bin_path}"
diff --git a/connect/tls_test.go b/connect/tls_test.go
index 46d20a466..9659cf5be 100644
--- a/connect/tls_test.go
+++ b/connect/tls_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/hashicorp/consul/agent"
 	"github.com/hashicorp/consul/agent/connect"
 	"github.com/hashicorp/consul/api"
+	"github.com/hashicorp/consul/proto/prototest"
 	"github.com/hashicorp/consul/sdk/testutil"
 	"github.com/hashicorp/consul/testrpc"
 )
@@ -265,7 +266,7 @@ func TestServerSideVerifier(t *testing.T) {
 // allows expecting a leaf cert different from the one in expect
 func requireEqualTLSConfig(t *testing.T, expect, got *tls.Config) {
 	require.Equal(t, expect.RootCAs, got.RootCAs)
-	assertDeepEqual(t, expect.ClientCAs, got.ClientCAs, cmpCertPool)
+	prototest.AssertDeepEqual(t, expect.ClientCAs, got.ClientCAs, cmpCertPool)
 	require.Equal(t, expect.InsecureSkipVerify, got.InsecureSkipVerify)
 	require.Equal(t, expect.MinVersion, got.MinVersion)
 	require.Equal(t, expect.CipherSuites, got.CipherSuites)
@@ -298,13 +299,6 @@ var cmpCertPool = cmp.Comparer(func(x, y *x509.CertPool) bool {
 	return cmp.Equal(x.Subjects(), y.Subjects())
 })
 
-func assertDeepEqual(t *testing.T, x, y interface{}, opts ...cmp.Option) {
-	t.Helper()
-	if diff := cmp.Diff(x, y, opts...); diff != "" {
-		t.Fatalf("assertion failed: values are not equal\n--- expected\n+++ actual\n%v", diff)
-	}
-}
-
 // requireCorrectVerifier invokes got.VerifyPeerCertificate and expects the
 // tls.Config arg to be returned on the provided channel. This ensures the
 // correct verifier func was attached to got.
diff --git a/go.mod b/go.mod
index 9f43af2bb..456623d40 100644
--- a/go.mod
+++ b/go.mod
@@ -9,6 +9,7 @@ replace github.com/hashicorp/consul/sdk => ./sdk
 replace launchpad.net/gocheck => github.com/go-check/check v0.0.0-20140225173054-eb6ee6f84d0a
 
 require (
+	cloud.google.com/go v0.59.0 // indirect
 	github.com/Microsoft/go-winio v0.4.3 // indirect
 	github.com/NYTimes/gziphandler v1.0.1
 	github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e
@@ -20,11 +21,11 @@ require (
 	github.com/digitalocean/godo v1.10.0 // indirect
 	github.com/docker/go-connections v0.3.0
 	github.com/elazarl/go-bindata-assetfs v0.0.0-20160803192304-e1a2a7ec64b0
-	github.com/envoyproxy/go-control-plane v0.9.5
+	github.com/envoyproxy/go-control-plane v0.9.9
 	github.com/frankban/quicktest v1.11.0 // indirect
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang/protobuf v1.3.5
+	github.com/golang/protobuf v1.4.3
 	github.com/google/go-cmp v0.5.6
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/gofuzz v1.2.0
@@ -83,18 +84,16 @@ require (
 	github.com/shirou/gopsutil/v3 v3.21.10
 	github.com/stretchr/testify v1.7.0
 	go.etcd.io/bbolt v1.3.5
-	go.opencensus.io v0.22.0 // indirect
 	go.uber.org/goleak v1.1.10
 	golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a
 	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f
-	golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45
+	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
 	golang.org/x/sys v0.0.0-20211013075003-97ac67df715c
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
-	google.golang.org/api v0.9.0 // indirect
-	google.golang.org/appengine v1.6.0 // indirect
-	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
-	google.golang.org/grpc v1.27.1
+	google.golang.org/genproto v0.0.0-20200623002339-fbb79eadd5eb
+	google.golang.org/grpc v1.36.0
+	google.golang.org/protobuf v1.25.0
 	gopkg.in/square/go-jose.v2 v2.5.1
 	gotest.tools/v3 v3.0.3
 	k8s.io/api v0.18.2
diff --git a/go.sum b/go.sum
index 972a1634c..bf61a6bf0 100644
--- a/go.sum
+++ b/go.sum
@@ -1,7 +1,35 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
-cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
+cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
+cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
+cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc=
+cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0=
+cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To=
+cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
+cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
+cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
+cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
+cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
+cloud.google.com/go v0.59.0 h1:BM3svUDU3itpc2m5cu5wCyThIYNDlFlts9GASw31GW8=
+cloud.google.com/go v0.59.0/go.mod h1:qJxNOVCRTxHfwLhvDxxSI9vQc1zI59b9pEglp1Iv60E=
+cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o=
+cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE=
+cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc=
+cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg=
+cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc=
+cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ=
+cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE=
+cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk=
+cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I=
+cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw=
+cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA=
+cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU=
+cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw=
+cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos=
+cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk=
+cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
+dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/Azure/azure-sdk-for-go v44.0.0+incompatible h1:e82Yv2HNpS0kuyeCrV29OPKvEiqfs2/uJHic3/3iKdg=
 github.com/Azure/azure-sdk-for-go v44.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
@@ -34,6 +62,7 @@ github.com/Azure/go-autorest/tracing v0.5.0/go.mod h1:r/s2XiOKccPW3HrqB+W0TQzfbt
 github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUMfuitfgcfuo=
 github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/DataDog/datadog-go v2.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
 github.com/DataDog/datadog-go v3.2.0+incompatible h1:qSG2N4FghB1He/r2mFrWKCaL7dXCilEuNEeAn20fdD4=
 github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
@@ -53,6 +82,7 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy
 github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
+github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e h1:QEF07wC0T1rKkctt1RINW/+RMTVmiwxETico2l3gxJA=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
@@ -91,8 +121,10 @@ github.com/circonus-labs/circonus-gometrics v2.3.1+incompatible/go.mod h1:nmEj6D
 github.com/circonus-labs/circonusllhist v0.1.3 h1:TJH+oke8D16535+jHExHj4nQvzlZrj7ug5D7I/orNUA=
 github.com/circonus-labs/circonusllhist v0.1.3/go.mod h1:kMXHVDlOchFAehlya5ePtbp5jckzBHf4XRpQvBOLI+I=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533 h1:8wZizuKuZVu5COB7EsBYxBQz8nRcXXn5d4Gt91eJLvU=
-github.com/cncf/udpa/go v0.0.0-20200313221541-5f7e5dd04533/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
+github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed h1:OZmjad4L3H8ncOIR8rnb5MREYqG8ixi5+WbeUsquF0c=
+github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cockroachdb/apd v1.1.0/go.mod h1:8Sl8LxpKi29FqWXR16WEFZRNSz3SoPzUzeMeY4+DwBQ=
 github.com/coredns/coredns v1.1.2 h1:bAFHrSsBeTeRG5W3Nf2su3lUGw7Npw2UKeCJm/3A638=
 github.com/coredns/coredns v1.1.2/go.mod h1:zASH/MVDgR6XZTbxvOnsZfffS+31vg6Ackf/wo1+AM0=
@@ -131,8 +163,10 @@ github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkg
 github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
-github.com/envoyproxy/go-control-plane v0.9.5 h1:lRJIqDD8yjV1YyPRqecMdytjDLs2fTXq363aCib5xPU=
-github.com/envoyproxy/go-control-plane v0.9.5/go.mod h1:OXl5to++W0ctG+EHWTFUjiypVxC/Y4VLc/KFU+al13s=
+github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
+github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
+github.com/envoyproxy/go-control-plane v0.9.9 h1:vQLjymTobffN2R0F8eTqw6q7iozfRO5Z0m+/4Vw+/uA=
+github.com/envoyproxy/go-control-plane v0.9.9/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ=
 github.com/envoyproxy/protoc-gen-validate v0.1.0 h1:EQciDnbrYxy13PgWoY8AqoxGiPrpgBZ1R8UNe3ddc+A=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/evanphx/json-patch v4.2.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
@@ -148,6 +182,9 @@ github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5
 github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-asn1-ber/asn1-ber v1.3.1/go.mod h1:hEBeB/ic+5LoWskz+yKT7vGhhPYkProFKoKdwZRWMe0=
+github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
+github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-ldap/ldap/v3 v3.1.3/go.mod h1:3rbOH3jRS2u6jg2rJnKAMLE/xQyCKIveG2Sa/Cohzb8=
@@ -170,18 +207,35 @@ github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zV
 github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
+github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
 github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A=
+github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y=
+github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
+github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw=
 github.com/golang/protobuf v0.0.0-20161109072736-4bd1920723d7/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
-github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
+github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
+github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
+github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
@@ -191,6 +245,8 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -203,11 +259,19 @@ 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/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
+github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
+github.com/google/pprof v0.0.0-20200507031123-427632fa3b1c/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22 h1:ub2sxhs2A0HRa2dWHavvmWxiVGXNfE9wI+gcTMwED8A=
 github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
+github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2 h1:AtvtonGEH/fZK0XPNNBdB6swgy7Iudfx88wzyIpwqJ8=
 github.com/google/tcpproxy v0.0.0-20180808230851-dfa16c61dad2/go.mod h1:DavVbd41y+b7ukKDmlnPR4nGYmkWXR6vHUkjQNiHPBs=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
@@ -223,6 +287,7 @@ github.com/grpc-ecosystem/go-grpc-middleware v1.0.0 h1:Iju5GlWwrvL6UBg4zJJt3btmo
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul-net-rpc v0.0.0-20220307172752-3602954411b4 h1:Com/5n/omNSBusX11zdyIYtidiqewLIanchbm//McZA=
 github.com/hashicorp/consul-net-rpc v0.0.0-20220307172752-3602954411b4/go.mod h1:vWEAHAeAqfOwB3pSgHMQpIu8VH1jL+Ltg54Tw0wt/NI=
 github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA=
@@ -319,6 +384,7 @@ github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKe
 github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493 h1:brI5vBRUlAlM34VFmnLPwjnCL/FxAJp9XvOdX6Zt+XE=
 github.com/hashicorp/yamux v0.0.0-20210826001029-26ff87cf9493/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA=
 github.com/imdario/mergo v0.3.6 h1:xTNEAn+kxVO7dTZGu0CegyqKZmoWFI0rF8UxjlB2d28=
@@ -342,6 +408,7 @@ github.com/json-iterator/go v1.1.8/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/u
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
+github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00=
@@ -480,6 +547,8 @@ github.com/rboyer/safeio v0.2.1/go.mod h1:Cq/cEPK+YXFn622lsQ0K4KsPZSPtaptHHEldsy
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03 h1:Wdi9nwnhFNAlseAOekn6B5G/+GMtks9UKbvRU/CMM/o=
 github.com/renier/xmlrpc v0.0.0-20170708154548-ce4a1a486c03/go.mod h1:gRAiPF5C5Nd0eyyRdqIu9qTiFSoZzpTq727b5B8fkkU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
+github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
+github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/rs/zerolog v1.4.0/go.mod h1:YbFCdg8HfsridGWAh22vktObvhZbQsZXe4/zB0OKkWU=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
@@ -522,6 +591,7 @@ github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -540,14 +610,19 @@ github.com/vmware/govmomi v0.18.0 h1:f7QxSmP7meCtoAmiKZogvVbLInT+CZx6Px6K5rYsJZo
 github.com/vmware/govmomi v0.18.0/go.mod h1:URlwyTFZX72RmxtxuaFL2Uj3fD1JTvZdx59bHWk6aFU=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
+github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
 go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
-go.opencensus.io v0.22.0 h1:C9hSCOW830chIVkdja34wa6Ky+IzWllkUinR+BtRZd4=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
+go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
+go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
+go.opentelemetry.io/proto/otlp v0.7.0 h1:rwOQPCuKAKmwGKq2aVNnYIibI6wnV7EvzgfTCzcdGg8=
+go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/goleak v1.1.10 h1:z+mqJhf6ss6BSfSM671tgKyZBFPTTJM+HLxnhPC3wu0=
 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A=
@@ -559,6 +634,8 @@ golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnf
 golang.org/x/crypto v0.0.0-20190211182817-74369b46fc67/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190418165655-df01cb2cc480/go.mod h1:WFFai1msRO1wXaEeE5yQxYXgSfI8pQAWXbQop6sCtWE=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20190923035154-9ee001bba392/go.mod h1:/lpIB1dKB+9EgE3H3cr1v9wB50oz8l4C4h62xy7jSTY=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -567,13 +644,34 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a h1:kr2P4QFmQr29mSLA43kwrOcgcReGTfbE9N577tCTuBc=
 golang.org/x/crypto v0.0.0-20210513164829-c07d793c2f9a/go.mod h1:P+XmwS30IXTQdn5tA2iutPOUgjI07+tq3H3K9MVA1s8=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
+golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
+golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek=
+golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY=
+golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
+golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
+golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
-golang.org/x/lint v0.0.0-20190930215403-16217165b5de h1:5hukYrvBGR8/eNkX5mdUezrA6JiaEZDtJb9Ei+1LlBs=
+golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
+golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs=
+golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b h1:Wh+f8QHJXR411sJR8/vRBTZ7YapZaRvUcLFFJhusH0k=
+golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o=
+golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0 h1:RM4zey1++hCTbCVQfnWeKs9/IEsaBLA8vTkd0WVtmH4=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
@@ -592,12 +690,25 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
+golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20191004110552-13f9640d40b9/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200602114024-627f9648deb9/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8=
@@ -605,14 +716,17 @@ golang.org/x/net v0.0.0-20211216030914-fe4d6282115f h1:hEYJvxw1lSnWIl8X9ofsYMklz
 golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
-golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
+golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -629,6 +743,7 @@ golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20190209173611-3b5209105503/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190403152447-81d4e9dc473e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -636,19 +751,32 @@ golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190515120540-06a5c4944438/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190523142557-0e01d883c5c5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-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-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -661,6 +789,7 @@ golang.org/x/sys v0.0.0-20211013075003-97ac67df715c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 h1:v+OssWQX+hTHEmOBgwxdZxK4zHq3yOs8F9J7mk0PY8E=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
@@ -669,6 +798,7 @@ golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200416051211-89c76fbcd5d1/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e h1:EHBhcS0mlXEAVwNyO2dLfjToGsyY4j24pTs2ScHnX7s=
 golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
@@ -679,14 +809,43 @@ golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
 golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
+golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
+golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
 golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
+golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
+golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw=
+golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8=
+golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
+golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a h1:CB3a9Nez8M13wwlr/E2YtwoU+qYHKfC+JrDa45RXXoQ=
 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=
@@ -695,35 +854,89 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
-google.golang.org/api v0.9.0 h1:jbyannxz0XFD3zdjgrSUsaJbgpH4eTrkdhRChkHPfO8=
+google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
+google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
+google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
+google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
+google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
+google.golang.org/api v0.28.0 h1:jMF5hhVfMkTZwHW1SDpKq5CkgWLXOb31Foaca9Zr3oM=
+google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
-google.golang.org/appengine v1.6.0 h1:Tfd7cKwKbFRsI8RMAD3oqqw7JPFRrvFlOsfbgVkjOOw=
-google.golang.org/appengine v1.6.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
+google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
+google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
+google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
-google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
+google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
+google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8=
+google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
+google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA=
+google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
+google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
+google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
+google.golang.org/genproto v0.0.0-20200623002339-fbb79eadd5eb h1:PUcq6RTy8Gp9xukBme8m2+2Z8pQCmJ7TbPpQd6xNDvk=
+google.golang.org/genproto v0.0.0-20200623002339-fbb79eadd5eb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
 google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
+google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.22.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
-google.golang.org/grpc v1.27.1 h1:zvIju4sqAGvwKspUQOhwnpcqSbzi7/H6QomNNjTL4sk=
+google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
+google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
+google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
+google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0=
+google.golang.org/grpc v1.36.0 h1:o1bcQ6imQMIOpdrO3SWf2z5RV72WbDwdXuK0MDlc8As=
+google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
+google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
+google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
 gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
@@ -736,6 +949,7 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWD
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.3/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 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
@@ -748,6 +962,9 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
 k8s.io/api v0.18.2 h1:wG5g5ZmSVgm5B+eHMIbI9EGATS2L8Z72rda19RIEgY8=
 k8s.io/api v0.18.2/go.mod h1:SJCWI7OLzhZSvbY7U8zwNl9UA4o1fizoug34OV/2r78=
 k8s.io/apimachinery v0.18.2 h1:44CmtbmkzVDAhCpRVSiP2R5PPrC2RtlIv/MoB8xpdRA=
@@ -762,6 +979,9 @@ k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 h1:d4vVOjXm687F1iLSP2q3lyPPuyvTUt3aVoBpi2DqRsU=
 k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=
+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/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E=
 sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw=
diff --git a/proto/pbacl/acl.pb.go b/proto/pbacl/acl.pb.go
index baaa994e9..b3c4e68a7 100644
--- a/proto/pbacl/acl.pb.go
+++ b/proto/pbacl/acl.pb.go
@@ -1,89 +1,158 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbacl/acl.proto
 
 package pbacl
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type ACLLink struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	// @gotags: hash:ignore-"
-	Name                 string   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Name string `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
 }
 
-func (m *ACLLink) Reset()         { *m = ACLLink{} }
-func (m *ACLLink) String() string { return proto.CompactTextString(m) }
-func (*ACLLink) ProtoMessage()    {}
+func (x *ACLLink) Reset() {
+	*x = ACLLink{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbacl_acl_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACLLink) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACLLink) ProtoMessage() {}
+
+func (x *ACLLink) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbacl_acl_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACLLink.ProtoReflect.Descriptor instead.
 func (*ACLLink) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ad2d2c73a6a0d8b5, []int{0}
+	return file_proto_pbacl_acl_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *ACLLink) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ACLLink.Unmarshal(m, b)
-}
-func (m *ACLLink) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ACLLink.Marshal(b, m, deterministic)
-}
-func (m *ACLLink) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ACLLink.Merge(m, src)
-}
-func (m *ACLLink) XXX_Size() int {
-	return xxx_messageInfo_ACLLink.Size(m)
-}
-func (m *ACLLink) XXX_DiscardUnknown() {
-	xxx_messageInfo_ACLLink.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ACLLink proto.InternalMessageInfo
-
-func (m *ACLLink) GetID() string {
-	if m != nil {
-		return m.ID
+func (x *ACLLink) GetID() string {
+	if x != nil {
+		return x.ID
 	}
 	return ""
 }
 
-func (m *ACLLink) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *ACLLink) GetName() string {
+	if x != nil {
+		return x.Name
 	}
 	return ""
 }
 
-func init() {
-	proto.RegisterType((*ACLLink)(nil), "acl.ACLLink")
+var File_proto_pbacl_acl_proto protoreflect.FileDescriptor
+
+var file_proto_pbacl_acl_proto_rawDesc = []byte{
+	0x0a, 0x15, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x61, 0x63, 0x6c, 0x2f, 0x61, 0x63,
+	0x6c, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x03, 0x61, 0x63, 0x6c, 0x22, 0x2d, 0x0a, 0x07,
+	0x41, 0x43, 0x4c, 0x4c, 0x69, 0x6e, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x42, 0x29, 0x5a, 0x27, 0x67,
+	0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63,
+	0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x70, 0x62, 0x61, 0x63, 0x6c, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbacl/acl.proto", fileDescriptor_ad2d2c73a6a0d8b5)
+var (
+	file_proto_pbacl_acl_proto_rawDescOnce sync.Once
+	file_proto_pbacl_acl_proto_rawDescData = file_proto_pbacl_acl_proto_rawDesc
+)
+
+func file_proto_pbacl_acl_proto_rawDescGZIP() []byte {
+	file_proto_pbacl_acl_proto_rawDescOnce.Do(func() {
+		file_proto_pbacl_acl_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbacl_acl_proto_rawDescData)
+	})
+	return file_proto_pbacl_acl_proto_rawDescData
 }
 
-var fileDescriptor_ad2d2c73a6a0d8b5 = []byte{
-	// 128 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2d, 0x28, 0xca, 0x2f,
-	0xc9, 0xd7, 0x2f, 0x48, 0x4a, 0x4c, 0xce, 0xd1, 0x4f, 0x4c, 0xce, 0xd1, 0x03, 0xf3, 0x85, 0x98,
-	0x13, 0x93, 0x73, 0x94, 0x74, 0xb9, 0xd8, 0x1d, 0x9d, 0x7d, 0x7c, 0x32, 0xf3, 0xb2, 0x85, 0xf8,
-	0xb8, 0x98, 0x3c, 0x5d, 0x24, 0x18, 0x15, 0x18, 0x35, 0x38, 0x83, 0x98, 0x3c, 0x5d, 0x84, 0x84,
-	0xb8, 0x58, 0xfc, 0x12, 0x73, 0x53, 0x25, 0x98, 0xc0, 0x22, 0x60, 0xb6, 0x93, 0x66, 0x94, 0x7a,
-	0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x46, 0x62, 0x71, 0x46, 0x66,
-	0x72, 0x7e, 0x51, 0x81, 0x7e, 0x72, 0x7e, 0x5e, 0x71, 0x69, 0x8e, 0x3e, 0x92, 0x45, 0x49, 0x6c,
-	0x60, 0x8e, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xaf, 0x25, 0x54, 0x7f, 0x7e, 0x00, 0x00, 0x00,
+var file_proto_pbacl_acl_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
+var file_proto_pbacl_acl_proto_goTypes = []interface{}{
+	(*ACLLink)(nil), // 0: acl.ACLLink
+}
+var file_proto_pbacl_acl_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbacl_acl_proto_init() }
+func file_proto_pbacl_acl_proto_init() {
+	if File_proto_pbacl_acl_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbacl_acl_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACLLink); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbacl_acl_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   1,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbacl_acl_proto_goTypes,
+		DependencyIndexes: file_proto_pbacl_acl_proto_depIdxs,
+		MessageInfos:      file_proto_pbacl_acl_proto_msgTypes,
+	}.Build()
+	File_proto_pbacl_acl_proto = out.File
+	file_proto_pbacl_acl_proto_rawDesc = nil
+	file_proto_pbacl_acl_proto_goTypes = nil
+	file_proto_pbacl_acl_proto_depIdxs = nil
 }
diff --git a/proto/pbautoconf/auto_config.pb.go b/proto/pbautoconf/auto_config.pb.go
index 0f64d9688..4e4a60e1c 100644
--- a/proto/pbautoconf/auto_config.pb.go
+++ b/proto/pbautoconf/auto_config.pb.go
@@ -1,30 +1,39 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbautoconf/auto_config.proto
 
 package pbautoconf
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
 	pbconfig "github.com/hashicorp/consul/proto/pbconfig"
 	pbconnect "github.com/hashicorp/consul/proto/pbconnect"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // AutoConfigRequest is the data structure to be sent along with the
 // AutoConfig.InitialConfiguration RPC
 type AutoConfigRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Datacenter is the local datacenter name. This wont actually be set by clients
 	// but rather will be set by the servers to allow for forwarding to
 	// the leader. If it ever happens to be set and differs from the local datacenters
@@ -44,88 +53,96 @@ type AutoConfigRequest struct {
 	ConsulToken string `protobuf:"bytes,6,opt,name=ConsulToken,proto3" json:"ConsulToken,omitempty"`
 	// CSR is a certificate signing request to be used when generating the
 	// agents TLS certificate
-	CSR                  string   `protobuf:"bytes,7,opt,name=CSR,proto3" json:"CSR,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	CSR string `protobuf:"bytes,7,opt,name=CSR,proto3" json:"CSR,omitempty"`
 }
 
-func (m *AutoConfigRequest) Reset()         { *m = AutoConfigRequest{} }
-func (m *AutoConfigRequest) String() string { return proto.CompactTextString(m) }
-func (*AutoConfigRequest) ProtoMessage()    {}
+func (x *AutoConfigRequest) Reset() {
+	*x = AutoConfigRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AutoConfigRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AutoConfigRequest) ProtoMessage() {}
+
+func (x *AutoConfigRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AutoConfigRequest.ProtoReflect.Descriptor instead.
 func (*AutoConfigRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ccc5af992e5daf69, []int{0}
+	return file_proto_pbautoconf_auto_config_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *AutoConfigRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_AutoConfigRequest.Unmarshal(m, b)
-}
-func (m *AutoConfigRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_AutoConfigRequest.Marshal(b, m, deterministic)
-}
-func (m *AutoConfigRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AutoConfigRequest.Merge(m, src)
-}
-func (m *AutoConfigRequest) XXX_Size() int {
-	return xxx_messageInfo_AutoConfigRequest.Size(m)
-}
-func (m *AutoConfigRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_AutoConfigRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_AutoConfigRequest proto.InternalMessageInfo
-
-func (m *AutoConfigRequest) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *AutoConfigRequest) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
 
-func (m *AutoConfigRequest) GetNode() string {
-	if m != nil {
-		return m.Node
+func (x *AutoConfigRequest) GetNode() string {
+	if x != nil {
+		return x.Node
 	}
 	return ""
 }
 
-func (m *AutoConfigRequest) GetSegment() string {
-	if m != nil {
-		return m.Segment
+func (x *AutoConfigRequest) GetSegment() string {
+	if x != nil {
+		return x.Segment
 	}
 	return ""
 }
 
-func (m *AutoConfigRequest) GetPartition() string {
-	if m != nil {
-		return m.Partition
+func (x *AutoConfigRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
 	}
 	return ""
 }
 
-func (m *AutoConfigRequest) GetJWT() string {
-	if m != nil {
-		return m.JWT
+func (x *AutoConfigRequest) GetJWT() string {
+	if x != nil {
+		return x.JWT
 	}
 	return ""
 }
 
-func (m *AutoConfigRequest) GetConsulToken() string {
-	if m != nil {
-		return m.ConsulToken
+func (x *AutoConfigRequest) GetConsulToken() string {
+	if x != nil {
+		return x.ConsulToken
 	}
 	return ""
 }
 
-func (m *AutoConfigRequest) GetCSR() string {
-	if m != nil {
-		return m.CSR
+func (x *AutoConfigRequest) GetCSR() string {
+	if x != nil {
+		return x.CSR
 	}
 	return ""
 }
 
 // AutoConfigResponse is the data structure sent in response to a AutoConfig.InitialConfiguration request
 type AutoConfigResponse struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Config is the partial Consul configuration to inject into the agents own configuration
 	Config *pbconfig.Config `protobuf:"bytes,1,opt,name=Config,proto3" json:"Config,omitempty"`
 	// CARoots is the current list of Connect CA Roots
@@ -134,96 +151,188 @@ type AutoConfigResponse struct {
 	Certificate *pbconnect.IssuedCert `protobuf:"bytes,3,opt,name=Certificate,proto3" json:"Certificate,omitempty"`
 	// ExtraCACertificates holds non-Connect certificates that may be necessary
 	// to verify TLS connections with the Consul servers
-	ExtraCACertificates  []string `protobuf:"bytes,4,rep,name=ExtraCACertificates,proto3" json:"ExtraCACertificates,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	ExtraCACertificates []string `protobuf:"bytes,4,rep,name=ExtraCACertificates,proto3" json:"ExtraCACertificates,omitempty"`
 }
 
-func (m *AutoConfigResponse) Reset()         { *m = AutoConfigResponse{} }
-func (m *AutoConfigResponse) String() string { return proto.CompactTextString(m) }
-func (*AutoConfigResponse) ProtoMessage()    {}
+func (x *AutoConfigResponse) Reset() {
+	*x = AutoConfigResponse{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AutoConfigResponse) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AutoConfigResponse) ProtoMessage() {}
+
+func (x *AutoConfigResponse) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbautoconf_auto_config_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AutoConfigResponse.ProtoReflect.Descriptor instead.
 func (*AutoConfigResponse) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ccc5af992e5daf69, []int{1}
+	return file_proto_pbautoconf_auto_config_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *AutoConfigResponse) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_AutoConfigResponse.Unmarshal(m, b)
-}
-func (m *AutoConfigResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_AutoConfigResponse.Marshal(b, m, deterministic)
-}
-func (m *AutoConfigResponse) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AutoConfigResponse.Merge(m, src)
-}
-func (m *AutoConfigResponse) XXX_Size() int {
-	return xxx_messageInfo_AutoConfigResponse.Size(m)
-}
-func (m *AutoConfigResponse) XXX_DiscardUnknown() {
-	xxx_messageInfo_AutoConfigResponse.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_AutoConfigResponse proto.InternalMessageInfo
-
-func (m *AutoConfigResponse) GetConfig() *pbconfig.Config {
-	if m != nil {
-		return m.Config
+func (x *AutoConfigResponse) GetConfig() *pbconfig.Config {
+	if x != nil {
+		return x.Config
 	}
 	return nil
 }
 
-func (m *AutoConfigResponse) GetCARoots() *pbconnect.CARoots {
-	if m != nil {
-		return m.CARoots
+func (x *AutoConfigResponse) GetCARoots() *pbconnect.CARoots {
+	if x != nil {
+		return x.CARoots
 	}
 	return nil
 }
 
-func (m *AutoConfigResponse) GetCertificate() *pbconnect.IssuedCert {
-	if m != nil {
-		return m.Certificate
+func (x *AutoConfigResponse) GetCertificate() *pbconnect.IssuedCert {
+	if x != nil {
+		return x.Certificate
 	}
 	return nil
 }
 
-func (m *AutoConfigResponse) GetExtraCACertificates() []string {
-	if m != nil {
-		return m.ExtraCACertificates
+func (x *AutoConfigResponse) GetExtraCACertificates() []string {
+	if x != nil {
+		return x.ExtraCACertificates
 	}
 	return nil
 }
 
-func init() {
-	proto.RegisterType((*AutoConfigRequest)(nil), "autoconf.AutoConfigRequest")
-	proto.RegisterType((*AutoConfigResponse)(nil), "autoconf.AutoConfigResponse")
+var File_proto_pbautoconf_auto_config_proto protoreflect.FileDescriptor
+
+var file_proto_pbautoconf_auto_config_proto_rawDesc = []byte{
+	0x0a, 0x22, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f,
+	0x6e, 0x66, 0x2f, 0x61, 0x75, 0x74, 0x6f, 0x5f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x12, 0x08, 0x61, 0x75, 0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0x1a, 0x1b,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2f, 0x63, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc5, 0x01, 0x0a, 0x11, 0x41,
+	0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74,
+	0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x12, 0x12, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
+	0x4e, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x1c,
+	0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03,
+	0x4a, 0x57, 0x54, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4a, 0x57, 0x54, 0x12, 0x20,
+	0x0a, 0x0b, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x06, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0b, 0x43, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x12, 0x10, 0x0a, 0x03, 0x43, 0x53, 0x52, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x43,
+	0x53, 0x52, 0x22, 0xd1, 0x01, 0x0a, 0x12, 0x41, 0x75, 0x74, 0x6f, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x26, 0x0a, 0x06, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x63, 0x6f, 0x6e, 0x66,
+	0x69, 0x67, 0x2e, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x2a, 0x0a, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x10, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x43, 0x41, 0x52,
+	0x6f, 0x6f, 0x74, 0x73, 0x52, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x12, 0x35, 0x0a,
+	0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x13, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x49, 0x73, 0x73,
+	0x75, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x52, 0x0b, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69,
+	0x63, 0x61, 0x74, 0x65, 0x12, 0x30, 0x0a, 0x13, 0x45, 0x78, 0x74, 0x72, 0x61, 0x43, 0x41, 0x43,
+	0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x13, 0x45, 0x78, 0x74, 0x72, 0x61, 0x43, 0x41, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66,
+	0x69, 0x63, 0x61, 0x74, 0x65, 0x73, 0x42, 0x2e, 0x5a, 0x2c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62,
+	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63,
+	0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x61, 0x75,
+	0x74, 0x6f, 0x63, 0x6f, 0x6e, 0x66, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbautoconf/auto_config.proto", fileDescriptor_ccc5af992e5daf69)
+var (
+	file_proto_pbautoconf_auto_config_proto_rawDescOnce sync.Once
+	file_proto_pbautoconf_auto_config_proto_rawDescData = file_proto_pbautoconf_auto_config_proto_rawDesc
+)
+
+func file_proto_pbautoconf_auto_config_proto_rawDescGZIP() []byte {
+	file_proto_pbautoconf_auto_config_proto_rawDescOnce.Do(func() {
+		file_proto_pbautoconf_auto_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbautoconf_auto_config_proto_rawDescData)
+	})
+	return file_proto_pbautoconf_auto_config_proto_rawDescData
 }
 
-var fileDescriptor_ccc5af992e5daf69 = []byte{
-	// 340 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x92, 0xcd, 0x4a, 0xc3, 0x40,
-	0x10, 0xc7, 0x89, 0xad, 0xfd, 0x98, 0x80, 0xd4, 0xed, 0x65, 0xa9, 0x1f, 0x94, 0x1e, 0xa4, 0x88,
-	0x24, 0x52, 0xf1, 0x01, 0x6a, 0xf4, 0xa0, 0x07, 0x91, 0x6d, 0x41, 0xf0, 0x22, 0x69, 0xba, 0x6d,
-	0x83, 0xed, 0x4e, 0xcc, 0xce, 0x82, 0x2f, 0xe8, 0x03, 0xf8, 0x46, 0x92, 0x4d, 0xa2, 0x8b, 0x78,
-	0xca, 0x3f, 0xbf, 0xdf, 0x7f, 0x0e, 0x33, 0x09, 0x8c, 0xb2, 0x1c, 0x09, 0xc3, 0x6c, 0x11, 0x1b,
-	0xc2, 0x04, 0xd5, 0x2a, 0x2c, 0xc2, 0x6b, 0x91, 0xd2, 0x75, 0x60, 0x25, 0xeb, 0xd4, 0x6e, 0x70,
-	0x54, 0xb7, 0x4b, 0x1f, 0xba, 0xb5, 0xc1, 0x89, 0x23, 0x95, 0x4c, 0x28, 0xac, 0x9e, 0xa5, 0x1e,
-	0x7d, 0x7a, 0x70, 0x38, 0x35, 0x84, 0x91, 0x9d, 0x11, 0xf2, 0xdd, 0x48, 0x4d, 0xec, 0x14, 0xe0,
-	0x36, 0xa6, 0x38, 0x91, 0x8a, 0x64, 0xce, 0xbd, 0xa1, 0x37, 0xee, 0x0a, 0x87, 0x30, 0x06, 0xcd,
-	0x47, 0x5c, 0x4a, 0xbe, 0x67, 0x8d, 0xcd, 0x8c, 0x43, 0x7b, 0x26, 0xd7, 0x3b, 0xa9, 0x88, 0x37,
-	0x2d, 0xae, 0x5f, 0xd9, 0x31, 0x74, 0x9f, 0xe2, 0x9c, 0x52, 0x4a, 0x51, 0xf1, 0x8e, 0x75, 0xbf,
-	0x80, 0xf5, 0xa0, 0xf1, 0xf0, 0x3c, 0xe7, 0xfb, 0x96, 0x17, 0x91, 0x0d, 0xc1, 0x8f, 0x50, 0x69,
-	0xb3, 0x9d, 0xe3, 0x9b, 0x54, 0xbc, 0x65, 0x8d, 0x8b, 0x8a, 0x99, 0x68, 0x26, 0x78, 0xbb, 0x9c,
-	0x89, 0x66, 0x62, 0xf4, 0xe5, 0x01, 0x73, 0xf7, 0xd0, 0x19, 0x2a, 0x2d, 0xd9, 0x19, 0xb4, 0x4a,
-	0x62, 0x97, 0xf0, 0x27, 0x07, 0x41, 0x75, 0x9c, 0xaa, 0x57, 0x59, 0x76, 0x0e, 0xed, 0x68, 0x2a,
-	0x10, 0x49, 0xdb, 0x9d, 0xfc, 0x49, 0x2f, 0xa8, 0xef, 0x54, 0x71, 0x51, 0x17, 0xd8, 0x35, 0xf8,
-	0x91, 0xcc, 0x29, 0x5d, 0xa5, 0x49, 0x4c, 0x92, 0x37, 0x6c, 0xbf, 0xff, 0xd3, 0xbf, 0xd7, 0xda,
-	0xc8, 0x65, 0xd1, 0x10, 0x6e, 0x8f, 0x5d, 0x42, 0xff, 0xee, 0x83, 0xf2, 0x38, 0x9a, 0x3a, 0x54,
-	0xf3, 0xe6, 0xb0, 0x31, 0xee, 0x8a, 0xff, 0xd4, 0x4d, 0xf0, 0x72, 0xb1, 0x4e, 0x69, 0x63, 0x16,
-	0x41, 0x82, 0xbb, 0x70, 0x13, 0xeb, 0x4d, 0x9a, 0x60, 0x9e, 0x15, 0x5f, 0x50, 0x9b, 0x6d, 0xf8,
-	0xf7, 0x1f, 0x59, 0xb4, 0x2c, 0xb9, 0xfa, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x29, 0xae, 0x66, 0x30,
-	0x3e, 0x02, 0x00, 0x00,
+var file_proto_pbautoconf_auto_config_proto_msgTypes = make([]protoimpl.MessageInfo, 2)
+var file_proto_pbautoconf_auto_config_proto_goTypes = []interface{}{
+	(*AutoConfigRequest)(nil),    // 0: autoconf.AutoConfigRequest
+	(*AutoConfigResponse)(nil),   // 1: autoconf.AutoConfigResponse
+	(*pbconfig.Config)(nil),      // 2: config.Config
+	(*pbconnect.CARoots)(nil),    // 3: connect.CARoots
+	(*pbconnect.IssuedCert)(nil), // 4: connect.IssuedCert
+}
+var file_proto_pbautoconf_auto_config_proto_depIdxs = []int32{
+	2, // 0: autoconf.AutoConfigResponse.Config:type_name -> config.Config
+	3, // 1: autoconf.AutoConfigResponse.CARoots:type_name -> connect.CARoots
+	4, // 2: autoconf.AutoConfigResponse.Certificate:type_name -> connect.IssuedCert
+	3, // [3:3] is the sub-list for method output_type
+	3, // [3:3] is the sub-list for method input_type
+	3, // [3:3] is the sub-list for extension type_name
+	3, // [3:3] is the sub-list for extension extendee
+	0, // [0:3] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbautoconf_auto_config_proto_init() }
+func file_proto_pbautoconf_auto_config_proto_init() {
+	if File_proto_pbautoconf_auto_config_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbautoconf_auto_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AutoConfigRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbautoconf_auto_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AutoConfigResponse); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbautoconf_auto_config_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   2,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbautoconf_auto_config_proto_goTypes,
+		DependencyIndexes: file_proto_pbautoconf_auto_config_proto_depIdxs,
+		MessageInfos:      file_proto_pbautoconf_auto_config_proto_msgTypes,
+	}.Build()
+	File_proto_pbautoconf_auto_config_proto = out.File
+	file_proto_pbautoconf_auto_config_proto_rawDesc = nil
+	file_proto_pbautoconf_auto_config_proto_goTypes = nil
+	file_proto_pbautoconf_auto_config_proto_depIdxs = nil
 }
diff --git a/proto/pbcommon/common.go b/proto/pbcommon/common.go
index f8211604d..79b1592e5 100644
--- a/proto/pbcommon/common.go
+++ b/proto/pbcommon/common.go
@@ -74,7 +74,7 @@ func (q *QueryOptions) SetStaleIfError(staleIfError time.Duration) {
 	q.StaleIfError = structs.DurationToProto(staleIfError)
 }
 
-func (q QueryOptions) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
+func (q *QueryOptions) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime, defaultQueryTime time.Duration) (bool, error) {
 	maxTime := structs.DurationFromProto(q.MaxQueryTime)
 	o := structs.QueryOptions{
 		MaxQueryTime:  maxTime,
@@ -91,12 +91,12 @@ func (q *QueryOptions) SetFilter(filter string) {
 // WriteRequest only applies to writes, always false
 //
 // IsRead implements structs.RPCInfo
-func (w WriteRequest) IsRead() bool {
+func (w *WriteRequest) IsRead() bool {
 	return false
 }
 
 // SetTokenSecret implements structs.RPCInfo
-func (w WriteRequest) TokenSecret() string {
+func (w *WriteRequest) TokenSecret() string {
 	return w.Token
 }
 
@@ -108,12 +108,12 @@ func (w *WriteRequest) SetTokenSecret(s string) {
 // AllowStaleRead returns whether a stale read should be allowed
 //
 // AllowStaleRead implements structs.RPCInfo
-func (w WriteRequest) AllowStaleRead() bool {
+func (w *WriteRequest) AllowStaleRead() bool {
 	return false
 }
 
 // HasTimedOut implements structs.RPCInfo
-func (w WriteRequest) HasTimedOut(start time.Time, rpcHoldTimeout, _, _ time.Duration) (bool, error) {
+func (w *WriteRequest) HasTimedOut(start time.Time, rpcHoldTimeout, _, _ time.Duration) (bool, error) {
 	return time.Since(start) > rpcHoldTimeout, nil
 }
 
@@ -144,7 +144,7 @@ func (r *ReadRequest) HasTimedOut(start time.Time, rpcHoldTimeout, maxQueryTime,
 }
 
 // RequestDatacenter implements structs.RPCInfo
-func (td TargetDatacenter) RequestDatacenter() string {
+func (td *TargetDatacenter) RequestDatacenter() string {
 	return td.Datacenter
 }
 
diff --git a/proto/pbcommon/common.pb.go b/proto/pbcommon/common.pb.go
index a04042cac..e67bf6139 100644
--- a/proto/pbcommon/common.pb.go
+++ b/proto/pbcommon/common.pb.go
@@ -1,25 +1,30 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbcommon/common.proto
 
 package pbcommon
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	duration "github.com/golang/protobuf/ptypes/duration"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // RaftIndex is used to track the index used while creating
 // or modifying a given struct type.
@@ -31,50 +36,58 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 // name=Structs
 // ignore-fields=state,sizeCache,unknownFields
 type RaftIndex struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// @gotags: bexpr:"-"
 	CreateIndex uint64 `protobuf:"varint,1,opt,name=CreateIndex,proto3" json:"CreateIndex,omitempty" bexpr:"-"`
 	// @gotags: bexpr:"-"
-	ModifyIndex          uint64   `protobuf:"varint,2,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	ModifyIndex uint64 `protobuf:"varint,2,opt,name=ModifyIndex,proto3" json:"ModifyIndex,omitempty" bexpr:"-"`
 }
 
-func (m *RaftIndex) Reset()         { *m = RaftIndex{} }
-func (m *RaftIndex) String() string { return proto.CompactTextString(m) }
-func (*RaftIndex) ProtoMessage()    {}
+func (x *RaftIndex) Reset() {
+	*x = RaftIndex{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *RaftIndex) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*RaftIndex) ProtoMessage() {}
+
+func (x *RaftIndex) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use RaftIndex.ProtoReflect.Descriptor instead.
 func (*RaftIndex) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a6f5ac44994d718c, []int{0}
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *RaftIndex) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_RaftIndex.Unmarshal(m, b)
-}
-func (m *RaftIndex) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_RaftIndex.Marshal(b, m, deterministic)
-}
-func (m *RaftIndex) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_RaftIndex.Merge(m, src)
-}
-func (m *RaftIndex) XXX_Size() int {
-	return xxx_messageInfo_RaftIndex.Size(m)
-}
-func (m *RaftIndex) XXX_DiscardUnknown() {
-	xxx_messageInfo_RaftIndex.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_RaftIndex proto.InternalMessageInfo
-
-func (m *RaftIndex) GetCreateIndex() uint64 {
-	if m != nil {
-		return m.CreateIndex
+func (x *RaftIndex) GetCreateIndex() uint64 {
+	if x != nil {
+		return x.CreateIndex
 	}
 	return 0
 }
 
-func (m *RaftIndex) GetModifyIndex() uint64 {
-	if m != nil {
-		return m.ModifyIndex
+func (x *RaftIndex) GetModifyIndex() uint64 {
+	if x != nil {
+		return x.ModifyIndex
 	}
 	return 0
 }
@@ -82,40 +95,48 @@ func (m *RaftIndex) GetModifyIndex() uint64 {
 // TargetDatacenter is intended to be used within other messages used for RPC routing
 // amongst the various Consul datacenters
 type TargetDatacenter struct {
-	Datacenter           string   `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Datacenter string `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
 }
 
-func (m *TargetDatacenter) Reset()         { *m = TargetDatacenter{} }
-func (m *TargetDatacenter) String() string { return proto.CompactTextString(m) }
-func (*TargetDatacenter) ProtoMessage()    {}
+func (x *TargetDatacenter) Reset() {
+	*x = TargetDatacenter{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TargetDatacenter) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TargetDatacenter) ProtoMessage() {}
+
+func (x *TargetDatacenter) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TargetDatacenter.ProtoReflect.Descriptor instead.
 func (*TargetDatacenter) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a6f5ac44994d718c, []int{1}
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *TargetDatacenter) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_TargetDatacenter.Unmarshal(m, b)
-}
-func (m *TargetDatacenter) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_TargetDatacenter.Marshal(b, m, deterministic)
-}
-func (m *TargetDatacenter) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TargetDatacenter.Merge(m, src)
-}
-func (m *TargetDatacenter) XXX_Size() int {
-	return xxx_messageInfo_TargetDatacenter.Size(m)
-}
-func (m *TargetDatacenter) XXX_DiscardUnknown() {
-	xxx_messageInfo_TargetDatacenter.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_TargetDatacenter proto.InternalMessageInfo
-
-func (m *TargetDatacenter) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *TargetDatacenter) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
@@ -127,42 +148,50 @@ func (m *TargetDatacenter) GetDatacenter() string {
 // name=Structs
 // ignore-fields=state,sizeCache,unknownFields
 type WriteRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Token is the ACL token ID. If not provided, the 'anonymous'
 	// token is assumed for backwards compatibility.
-	Token                string   `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
 }
 
-func (m *WriteRequest) Reset()         { *m = WriteRequest{} }
-func (m *WriteRequest) String() string { return proto.CompactTextString(m) }
-func (*WriteRequest) ProtoMessage()    {}
+func (x *WriteRequest) Reset() {
+	*x = WriteRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *WriteRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*WriteRequest) ProtoMessage() {}
+
+func (x *WriteRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use WriteRequest.ProtoReflect.Descriptor instead.
 func (*WriteRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a6f5ac44994d718c, []int{2}
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{2}
 }
 
-func (m *WriteRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_WriteRequest.Unmarshal(m, b)
-}
-func (m *WriteRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_WriteRequest.Marshal(b, m, deterministic)
-}
-func (m *WriteRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_WriteRequest.Merge(m, src)
-}
-func (m *WriteRequest) XXX_Size() int {
-	return xxx_messageInfo_WriteRequest.Size(m)
-}
-func (m *WriteRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_WriteRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_WriteRequest proto.InternalMessageInfo
-
-func (m *WriteRequest) GetToken() string {
-	if m != nil {
-		return m.Token
+func (x *WriteRequest) GetToken() string {
+	if x != nil {
+		return x.Token
 	}
 	return ""
 }
@@ -174,51 +203,59 @@ func (m *WriteRequest) GetToken() string {
 // It is also similar to WriteRequest. It is a separate type so that in the
 // future we can introduce fields that may only be relevant for reads.
 type ReadRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Token is the ACL token ID. If not provided, the 'anonymous'
 	// token is assumed for backwards compatibility.
 	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
 	// RequireConsistent indicates that the request must be sent to the leader.
-	RequireConsistent    bool     `protobuf:"varint,2,opt,name=RequireConsistent,proto3" json:"RequireConsistent,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	RequireConsistent bool `protobuf:"varint,2,opt,name=RequireConsistent,proto3" json:"RequireConsistent,omitempty"`
 }
 
-func (m *ReadRequest) Reset()         { *m = ReadRequest{} }
-func (m *ReadRequest) String() string { return proto.CompactTextString(m) }
-func (*ReadRequest) ProtoMessage()    {}
+func (x *ReadRequest) Reset() {
+	*x = ReadRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ReadRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ReadRequest) ProtoMessage() {}
+
+func (x *ReadRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ReadRequest.ProtoReflect.Descriptor instead.
 func (*ReadRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a6f5ac44994d718c, []int{3}
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{3}
 }
 
-func (m *ReadRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ReadRequest.Unmarshal(m, b)
-}
-func (m *ReadRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ReadRequest.Marshal(b, m, deterministic)
-}
-func (m *ReadRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ReadRequest.Merge(m, src)
-}
-func (m *ReadRequest) XXX_Size() int {
-	return xxx_messageInfo_ReadRequest.Size(m)
-}
-func (m *ReadRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_ReadRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ReadRequest proto.InternalMessageInfo
-
-func (m *ReadRequest) GetToken() string {
-	if m != nil {
-		return m.Token
+func (x *ReadRequest) GetToken() string {
+	if x != nil {
+		return x.Token
 	}
 	return ""
 }
 
-func (m *ReadRequest) GetRequireConsistent() bool {
-	if m != nil {
-		return m.RequireConsistent
+func (x *ReadRequest) GetRequireConsistent() bool {
+	if x != nil {
+		return x.RequireConsistent
 	}
 	return false
 }
@@ -232,6 +269,10 @@ func (m *ReadRequest) GetRequireConsistent() bool {
 // name=Structs
 // ignore-fields=StaleIfError,AllowNotModifiedResponse,state,sizeCache,unknownFields
 type QueryOptions struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Token is the ACL token ID. If not provided, the 'anonymous'
 	// token is assumed for backwards compatibility.
 	Token string `protobuf:"bytes,1,opt,name=Token,proto3" json:"Token,omitempty"`
@@ -240,7 +281,7 @@ type QueryOptions struct {
 	MinQueryIndex uint64 `protobuf:"varint,2,opt,name=MinQueryIndex,proto3" json:"MinQueryIndex,omitempty"`
 	// Provided with MinQueryIndex to wait for change.
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	MaxQueryTime *duration.Duration `protobuf:"bytes,3,opt,name=MaxQueryTime,proto3" json:"MaxQueryTime,omitempty"`
+	MaxQueryTime *durationpb.Duration `protobuf:"bytes,3,opt,name=MaxQueryTime,proto3" json:"MaxQueryTime,omitempty"`
 	// If set, any follower can service the request. Results
 	// may be arbitrarily stale.
 	AllowStale bool `protobuf:"varint,4,opt,name=AllowStale,proto3" json:"AllowStale,omitempty"`
@@ -259,7 +300,7 @@ type QueryOptions struct {
 	// read, and then will perform a consistent read if stale
 	// read is older than value.
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	MaxStaleDuration *duration.Duration `protobuf:"bytes,7,opt,name=MaxStaleDuration,proto3" json:"MaxStaleDuration,omitempty"`
+	MaxStaleDuration *durationpb.Duration `protobuf:"bytes,7,opt,name=MaxStaleDuration,proto3" json:"MaxStaleDuration,omitempty"`
 	// MaxAge limits how old a cached value will be returned if UseCache is true.
 	// If there is a cached response that is older than the MaxAge, it is treated
 	// as a cache miss and a new fetch invoked. If the fetch fails, the error is
@@ -268,7 +309,7 @@ type QueryOptions struct {
 	// if the endpoint supports background refresh caching. See
 	// https://www.consul.io/api/index.html#agent-caching for more details.
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	MaxAge *duration.Duration `protobuf:"bytes,8,opt,name=MaxAge,proto3" json:"MaxAge,omitempty"`
+	MaxAge *durationpb.Duration `protobuf:"bytes,8,opt,name=MaxAge,proto3" json:"MaxAge,omitempty"`
 	// MustRevalidate forces the agent to fetch a fresh version of a cached
 	// resource or at least validate that the cached version is still fresh. It is
 	// implied by either max-age=0 or must-revalidate Cache-Control headers. It
@@ -280,113 +321,117 @@ type QueryOptions struct {
 	// UseCache is true and MaxAge is set to a lower, non-zero value. It is
 	// ignored if the endpoint supports background refresh caching. See
 	// https://www.consul.io/api/index.html#agent-caching for more details.
-	StaleIfError *duration.Duration `protobuf:"bytes,10,opt,name=StaleIfError,proto3" json:"StaleIfError,omitempty"`
+	StaleIfError *durationpb.Duration `protobuf:"bytes,10,opt,name=StaleIfError,proto3" json:"StaleIfError,omitempty"`
 	// Filter specifies the go-bexpr filter expression to be used for
 	// filtering the data prior to returning a response
-	Filter               string   `protobuf:"bytes,11,opt,name=Filter,proto3" json:"Filter,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Filter string `protobuf:"bytes,11,opt,name=Filter,proto3" json:"Filter,omitempty"`
 }
 
-func (m *QueryOptions) Reset()         { *m = QueryOptions{} }
-func (m *QueryOptions) String() string { return proto.CompactTextString(m) }
-func (*QueryOptions) ProtoMessage()    {}
+func (x *QueryOptions) Reset() {
+	*x = QueryOptions{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *QueryOptions) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*QueryOptions) ProtoMessage() {}
+
+func (x *QueryOptions) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use QueryOptions.ProtoReflect.Descriptor instead.
 func (*QueryOptions) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a6f5ac44994d718c, []int{4}
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{4}
 }
 
-func (m *QueryOptions) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_QueryOptions.Unmarshal(m, b)
-}
-func (m *QueryOptions) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_QueryOptions.Marshal(b, m, deterministic)
-}
-func (m *QueryOptions) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryOptions.Merge(m, src)
-}
-func (m *QueryOptions) XXX_Size() int {
-	return xxx_messageInfo_QueryOptions.Size(m)
-}
-func (m *QueryOptions) XXX_DiscardUnknown() {
-	xxx_messageInfo_QueryOptions.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_QueryOptions proto.InternalMessageInfo
-
-func (m *QueryOptions) GetToken() string {
-	if m != nil {
-		return m.Token
+func (x *QueryOptions) GetToken() string {
+	if x != nil {
+		return x.Token
 	}
 	return ""
 }
 
-func (m *QueryOptions) GetMinQueryIndex() uint64 {
-	if m != nil {
-		return m.MinQueryIndex
+func (x *QueryOptions) GetMinQueryIndex() uint64 {
+	if x != nil {
+		return x.MinQueryIndex
 	}
 	return 0
 }
 
-func (m *QueryOptions) GetMaxQueryTime() *duration.Duration {
-	if m != nil {
-		return m.MaxQueryTime
+func (x *QueryOptions) GetMaxQueryTime() *durationpb.Duration {
+	if x != nil {
+		return x.MaxQueryTime
 	}
 	return nil
 }
 
-func (m *QueryOptions) GetAllowStale() bool {
-	if m != nil {
-		return m.AllowStale
+func (x *QueryOptions) GetAllowStale() bool {
+	if x != nil {
+		return x.AllowStale
 	}
 	return false
 }
 
-func (m *QueryOptions) GetRequireConsistent() bool {
-	if m != nil {
-		return m.RequireConsistent
+func (x *QueryOptions) GetRequireConsistent() bool {
+	if x != nil {
+		return x.RequireConsistent
 	}
 	return false
 }
 
-func (m *QueryOptions) GetUseCache() bool {
-	if m != nil {
-		return m.UseCache
+func (x *QueryOptions) GetUseCache() bool {
+	if x != nil {
+		return x.UseCache
 	}
 	return false
 }
 
-func (m *QueryOptions) GetMaxStaleDuration() *duration.Duration {
-	if m != nil {
-		return m.MaxStaleDuration
+func (x *QueryOptions) GetMaxStaleDuration() *durationpb.Duration {
+	if x != nil {
+		return x.MaxStaleDuration
 	}
 	return nil
 }
 
-func (m *QueryOptions) GetMaxAge() *duration.Duration {
-	if m != nil {
-		return m.MaxAge
+func (x *QueryOptions) GetMaxAge() *durationpb.Duration {
+	if x != nil {
+		return x.MaxAge
 	}
 	return nil
 }
 
-func (m *QueryOptions) GetMustRevalidate() bool {
-	if m != nil {
-		return m.MustRevalidate
+func (x *QueryOptions) GetMustRevalidate() bool {
+	if x != nil {
+		return x.MustRevalidate
 	}
 	return false
 }
 
-func (m *QueryOptions) GetStaleIfError() *duration.Duration {
-	if m != nil {
-		return m.StaleIfError
+func (x *QueryOptions) GetStaleIfError() *durationpb.Duration {
+	if x != nil {
+		return x.StaleIfError
 	}
 	return nil
 }
 
-func (m *QueryOptions) GetFilter() string {
-	if m != nil {
-		return m.Filter
+func (x *QueryOptions) GetFilter() string {
+	if x != nil {
+		return x.Filter
 	}
 	return ""
 }
@@ -401,13 +446,17 @@ func (m *QueryOptions) GetFilter() string {
 // name=Structs
 // ignore-fields=NotModified,Backend,state,sizeCache,unknownFields
 type QueryMeta struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// This is the index associated with the read
 	Index uint64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
 	// If AllowStale is used, this is time elapsed since
 	// last contact between the follower and leader. This
 	// can be used to gauge staleness.
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	LastContact *duration.Duration `protobuf:"bytes,2,opt,name=LastContact,proto3" json:"LastContact,omitempty"`
+	LastContact *durationpb.Duration `protobuf:"bytes,2,opt,name=LastContact,proto3" json:"LastContact,omitempty"`
 	// Used to indicate if there is a known leader node
 	KnownLeader bool `protobuf:"varint,3,opt,name=KnownLeader,proto3" json:"KnownLeader,omitempty"`
 	// Consistencylevel returns the consistency used to serve the query
@@ -417,68 +466,72 @@ type QueryMeta struct {
 	// ResultsFilteredByACLs is true when some of the query's results were
 	// filtered out by enforcing ACLs. It may be false because nothing was
 	// removed, or because the endpoint does not yet support this flag.
-	ResultsFilteredByACLs bool     `protobuf:"varint,7,opt,name=ResultsFilteredByACLs,proto3" json:"ResultsFilteredByACLs,omitempty"`
-	XXX_NoUnkeyedLiteral  struct{} `json:"-"`
-	XXX_unrecognized      []byte   `json:"-"`
-	XXX_sizecache         int32    `json:"-"`
+	ResultsFilteredByACLs bool `protobuf:"varint,7,opt,name=ResultsFilteredByACLs,proto3" json:"ResultsFilteredByACLs,omitempty"`
 }
 
-func (m *QueryMeta) Reset()         { *m = QueryMeta{} }
-func (m *QueryMeta) String() string { return proto.CompactTextString(m) }
-func (*QueryMeta) ProtoMessage()    {}
+func (x *QueryMeta) Reset() {
+	*x = QueryMeta{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *QueryMeta) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*QueryMeta) ProtoMessage() {}
+
+func (x *QueryMeta) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use QueryMeta.ProtoReflect.Descriptor instead.
 func (*QueryMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a6f5ac44994d718c, []int{5}
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{5}
 }
 
-func (m *QueryMeta) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_QueryMeta.Unmarshal(m, b)
-}
-func (m *QueryMeta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_QueryMeta.Marshal(b, m, deterministic)
-}
-func (m *QueryMeta) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_QueryMeta.Merge(m, src)
-}
-func (m *QueryMeta) XXX_Size() int {
-	return xxx_messageInfo_QueryMeta.Size(m)
-}
-func (m *QueryMeta) XXX_DiscardUnknown() {
-	xxx_messageInfo_QueryMeta.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_QueryMeta proto.InternalMessageInfo
-
-func (m *QueryMeta) GetIndex() uint64 {
-	if m != nil {
-		return m.Index
+func (x *QueryMeta) GetIndex() uint64 {
+	if x != nil {
+		return x.Index
 	}
 	return 0
 }
 
-func (m *QueryMeta) GetLastContact() *duration.Duration {
-	if m != nil {
-		return m.LastContact
+func (x *QueryMeta) GetLastContact() *durationpb.Duration {
+	if x != nil {
+		return x.LastContact
 	}
 	return nil
 }
 
-func (m *QueryMeta) GetKnownLeader() bool {
-	if m != nil {
-		return m.KnownLeader
+func (x *QueryMeta) GetKnownLeader() bool {
+	if x != nil {
+		return x.KnownLeader
 	}
 	return false
 }
 
-func (m *QueryMeta) GetConsistencyLevel() string {
-	if m != nil {
-		return m.ConsistencyLevel
+func (x *QueryMeta) GetConsistencyLevel() string {
+	if x != nil {
+		return x.ConsistencyLevel
 	}
 	return ""
 }
 
-func (m *QueryMeta) GetResultsFilteredByACLs() bool {
-	if m != nil {
-		return m.ResultsFilteredByACLs
+func (x *QueryMeta) GetResultsFilteredByACLs() bool {
+	if x != nil {
+		return x.ResultsFilteredByACLs
 	}
 	return false
 }
@@ -486,103 +539,285 @@ func (m *QueryMeta) GetResultsFilteredByACLs() bool {
 // EnterpriseMeta contains metadata that is only used by the Enterprise version
 // of Consul.
 type EnterpriseMeta struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Namespace in which the entity exists.
 	Namespace string `protobuf:"bytes,1,opt,name=Namespace,proto3" json:"Namespace,omitempty"`
 	// Partition in which the entity exists.
-	Partition            string   `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Partition string `protobuf:"bytes,2,opt,name=Partition,proto3" json:"Partition,omitempty"`
 }
 
-func (m *EnterpriseMeta) Reset()         { *m = EnterpriseMeta{} }
-func (m *EnterpriseMeta) String() string { return proto.CompactTextString(m) }
-func (*EnterpriseMeta) ProtoMessage()    {}
+func (x *EnterpriseMeta) Reset() {
+	*x = EnterpriseMeta{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbcommon_common_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EnterpriseMeta) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EnterpriseMeta) ProtoMessage() {}
+
+func (x *EnterpriseMeta) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbcommon_common_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use EnterpriseMeta.ProtoReflect.Descriptor instead.
 func (*EnterpriseMeta) Descriptor() ([]byte, []int) {
-	return fileDescriptor_a6f5ac44994d718c, []int{6}
+	return file_proto_pbcommon_common_proto_rawDescGZIP(), []int{6}
 }
 
-func (m *EnterpriseMeta) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_EnterpriseMeta.Unmarshal(m, b)
-}
-func (m *EnterpriseMeta) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_EnterpriseMeta.Marshal(b, m, deterministic)
-}
-func (m *EnterpriseMeta) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EnterpriseMeta.Merge(m, src)
-}
-func (m *EnterpriseMeta) XXX_Size() int {
-	return xxx_messageInfo_EnterpriseMeta.Size(m)
-}
-func (m *EnterpriseMeta) XXX_DiscardUnknown() {
-	xxx_messageInfo_EnterpriseMeta.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_EnterpriseMeta proto.InternalMessageInfo
-
-func (m *EnterpriseMeta) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+func (x *EnterpriseMeta) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
 	}
 	return ""
 }
 
-func (m *EnterpriseMeta) GetPartition() string {
-	if m != nil {
-		return m.Partition
+func (x *EnterpriseMeta) GetPartition() string {
+	if x != nil {
+		return x.Partition
 	}
 	return ""
 }
 
-func init() {
-	proto.RegisterType((*RaftIndex)(nil), "common.RaftIndex")
-	proto.RegisterType((*TargetDatacenter)(nil), "common.TargetDatacenter")
-	proto.RegisterType((*WriteRequest)(nil), "common.WriteRequest")
-	proto.RegisterType((*ReadRequest)(nil), "common.ReadRequest")
-	proto.RegisterType((*QueryOptions)(nil), "common.QueryOptions")
-	proto.RegisterType((*QueryMeta)(nil), "common.QueryMeta")
-	proto.RegisterType((*EnterpriseMeta)(nil), "common.EnterpriseMeta")
+var File_proto_pbcommon_common_proto protoreflect.FileDescriptor
+
+var file_proto_pbcommon_common_proto_rawDesc = []byte{
+	0x0a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x1a, 0x1e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x4f, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64,
+	0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x12, 0x20, 0x0a, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66, 0x79, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0b, 0x4d, 0x6f, 0x64, 0x69, 0x66,
+	0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x32, 0x0a, 0x10, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74,
+	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61,
+	0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a,
+	0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x22, 0x24, 0x0a, 0x0c, 0x57, 0x72,
+	0x69, 0x74, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x22, 0x51, 0x0a, 0x0b, 0x52, 0x65, 0x61, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65,
+	0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x74, 0x22, 0xec, 0x03, 0x0a, 0x0c, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x24, 0x0a, 0x0d, 0x4d, 0x69,
+	0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x04, 0x52, 0x0d, 0x4d, 0x69, 0x6e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x49, 0x6e, 0x64, 0x65, 0x78,
+	0x12, 0x3d, 0x0a, 0x0c, 0x4d, 0x61, 0x78, 0x51, 0x75, 0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f,
+	0x6e, 0x52, 0x0c, 0x4d, 0x61, 0x78, 0x51, 0x75, 0x65, 0x72, 0x79, 0x54, 0x69, 0x6d, 0x65, 0x12,
+	0x1e, 0x0a, 0x0a, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x18, 0x04, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0a, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x12,
+	0x2c, 0x0a, 0x11, 0x52, 0x65, 0x71, 0x75, 0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73,
+	0x74, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x52, 0x65, 0x71, 0x75,
+	0x69, 0x72, 0x65, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a,
+	0x08, 0x55, 0x73, 0x65, 0x43, 0x61, 0x63, 0x68, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x08, 0x52,
+	0x08, 0x55, 0x73, 0x65, 0x43, 0x61, 0x63, 0x68, 0x65, 0x12, 0x45, 0x0a, 0x10, 0x4d, 0x61, 0x78,
+	0x53, 0x74, 0x61, 0x6c, 0x65, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x07, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x10,
+	0x4d, 0x61, 0x78, 0x53, 0x74, 0x61, 0x6c, 0x65, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x12, 0x31, 0x0a, 0x06, 0x4d, 0x61, 0x78, 0x41, 0x67, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x4d, 0x61, 0x78,
+	0x41, 0x67, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x75, 0x73, 0x74, 0x52, 0x65, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x4d, 0x75, 0x73,
+	0x74, 0x52, 0x65, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x12, 0x3d, 0x0a, 0x0c, 0x53,
+	0x74, 0x61, 0x6c, 0x65, 0x49, 0x66, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0c, 0x53, 0x74,
+	0x61, 0x6c, 0x65, 0x49, 0x66, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x46, 0x69,
+	0x6c, 0x74, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x22, 0xee, 0x01, 0x0a, 0x09, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61,
+	0x12, 0x14, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52,
+	0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x3b, 0x0a, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f,
+	0x6e, 0x74, 0x61, 0x63, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f,
+	0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75,
+	0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0b, 0x4c, 0x61, 0x73, 0x74, 0x43, 0x6f, 0x6e, 0x74,
+	0x61, 0x63, 0x74, 0x12, 0x20, 0x0a, 0x0b, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x4c, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x4c,
+	0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x2a, 0x0a, 0x10, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74,
+	0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x10, 0x43, 0x6f, 0x6e, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x79, 0x4c, 0x65, 0x76, 0x65,
+	0x6c, 0x12, 0x34, 0x0a, 0x15, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x74,
+	0x65, 0x72, 0x65, 0x64, 0x42, 0x79, 0x41, 0x43, 0x4c, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x15, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x73, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65,
+	0x64, 0x42, 0x79, 0x41, 0x43, 0x4c, 0x73, 0x4a, 0x04, 0x08, 0x05, 0x10, 0x06, 0x4a, 0x04, 0x08,
+	0x06, 0x10, 0x07, 0x22, 0x4c, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73,
+	0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x42, 0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbcommon/common.proto", fileDescriptor_a6f5ac44994d718c)
+var (
+	file_proto_pbcommon_common_proto_rawDescOnce sync.Once
+	file_proto_pbcommon_common_proto_rawDescData = file_proto_pbcommon_common_proto_rawDesc
+)
+
+func file_proto_pbcommon_common_proto_rawDescGZIP() []byte {
+	file_proto_pbcommon_common_proto_rawDescOnce.Do(func() {
+		file_proto_pbcommon_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbcommon_common_proto_rawDescData)
+	})
+	return file_proto_pbcommon_common_proto_rawDescData
 }
 
-var fileDescriptor_a6f5ac44994d718c = []byte{
-	// 558 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x51, 0x6f, 0xd3, 0x30,
-	0x10, 0x56, 0xb7, 0x2e, 0x4b, 0xae, 0x65, 0x2a, 0x16, 0xa0, 0x30, 0xd0, 0x54, 0x45, 0x13, 0x9a,
-	0xa6, 0xa9, 0x11, 0x83, 0x37, 0xc4, 0x43, 0xd7, 0x15, 0x69, 0xa3, 0x61, 0xcc, 0x14, 0x21, 0xf1,
-	0xe6, 0x26, 0xd7, 0xd6, 0x22, 0x8d, 0x83, 0xed, 0x6c, 0xed, 0x7f, 0x46, 0xfc, 0x06, 0x14, 0xa7,
-	0xed, 0x52, 0xba, 0xad, 0x4f, 0xd1, 0xf7, 0xdd, 0xe7, 0xf3, 0xdd, 0x7d, 0xe7, 0xc0, 0xab, 0x54,
-	0x0a, 0x2d, 0xfc, 0x74, 0x10, 0x8a, 0xc9, 0x44, 0x24, 0x7e, 0xf1, 0x69, 0x19, 0x96, 0x58, 0x05,
-	0xda, 0x3f, 0x18, 0x09, 0x31, 0x8a, 0xd1, 0x37, 0xec, 0x20, 0x1b, 0xfa, 0x51, 0x26, 0x99, 0xe6,
-	0x0b, 0x9d, 0x77, 0x05, 0x0e, 0x65, 0x43, 0x7d, 0x91, 0x44, 0x38, 0x25, 0x4d, 0xa8, 0x75, 0x24,
-	0x32, 0x8d, 0x06, 0xba, 0x95, 0x66, 0xe5, 0xa8, 0x4a, 0xcb, 0x54, 0xae, 0x08, 0x44, 0xc4, 0x87,
-	0xb3, 0x42, 0xb1, 0x55, 0x28, 0x4a, 0x94, 0x77, 0x0a, 0x8d, 0x3e, 0x93, 0x23, 0xd4, 0xe7, 0x4c,
-	0xb3, 0x10, 0x13, 0x8d, 0x92, 0x1c, 0x00, 0xdc, 0x21, 0x93, 0xd6, 0xa1, 0x25, 0xc6, 0x3b, 0x84,
-	0xfa, 0x0f, 0xc9, 0x35, 0x52, 0xfc, 0x9d, 0xa1, 0xd2, 0xe4, 0x19, 0xec, 0xf4, 0xc5, 0x2f, 0x4c,
-	0xe6, 0xd2, 0x02, 0x78, 0xd7, 0x50, 0xa3, 0xc8, 0xa2, 0x47, 0x45, 0xe4, 0x04, 0x9e, 0xe6, 0x02,
-	0x2e, 0xb1, 0x23, 0x12, 0xc5, 0x95, 0xc6, 0x44, 0x9b, 0x32, 0x6d, 0xba, 0x1e, 0xf0, 0xfe, 0x6c,
-	0x43, 0xfd, 0x3a, 0x43, 0x39, 0xbb, 0x4a, 0xf3, 0x99, 0xa8, 0x07, 0x92, 0x1e, 0xc2, 0x93, 0x80,
-	0x27, 0x46, 0x58, 0xee, 0x7b, 0x95, 0x24, 0x1f, 0xa1, 0x1e, 0xb0, 0xa9, 0x21, 0xfa, 0x7c, 0x82,
-	0xee, 0x76, 0xb3, 0x72, 0x54, 0x3b, 0x7d, 0xd9, 0x2a, 0x1c, 0x68, 0x2d, 0x1c, 0x68, 0x9d, 0xcf,
-	0x1d, 0xa0, 0x2b, 0xf2, 0x7c, 0x48, 0xed, 0x38, 0x16, 0xb7, 0xdf, 0x34, 0x8b, 0xd1, 0xad, 0x9a,
-	0x92, 0x4b, 0xcc, 0xfd, 0x9d, 0xed, 0x3c, 0xd0, 0x19, 0xd9, 0x07, 0xfb, 0xbb, 0xc2, 0x0e, 0x0b,
-	0xc7, 0xe8, 0x5a, 0x46, 0xb4, 0xc4, 0xa4, 0x0b, 0x8d, 0x80, 0x4d, 0x4d, 0xd6, 0x45, 0x2d, 0xee,
-	0xee, 0xa6, 0x62, 0xd7, 0x8e, 0x90, 0xb7, 0x60, 0x05, 0x6c, 0xda, 0x1e, 0xa1, 0x6b, 0x6f, 0x3a,
-	0x3c, 0x17, 0x92, 0x37, 0xb0, 0x17, 0x64, 0x4a, 0x53, 0xbc, 0x61, 0x31, 0x8f, 0x98, 0x46, 0xd7,
-	0x31, 0xb5, 0xfd, 0xc7, 0xe6, 0xa3, 0x34, 0x77, 0x5d, 0x0c, 0xbb, 0x52, 0x0a, 0xe9, 0xc2, 0xc6,
-	0x51, 0x96, 0xe5, 0xe4, 0x05, 0x58, 0x9f, 0x78, 0x9c, 0xef, 0x5a, 0xcd, 0xd8, 0x38, 0x47, 0xde,
-	0xdf, 0x0a, 0x38, 0x66, 0xe0, 0x01, 0x6a, 0x96, 0x7b, 0x5d, 0xde, 0xf3, 0x02, 0x90, 0x0f, 0x50,
-	0xeb, 0x31, 0xa5, 0x3b, 0x22, 0xd1, 0x2c, 0x2c, 0x56, 0xe7, 0xd1, 0x9b, 0xcb, 0xea, 0xfc, 0x79,
-	0x7c, 0x4e, 0xc4, 0x6d, 0xd2, 0x43, 0x16, 0xa1, 0x34, 0x1b, 0x60, 0xd3, 0x32, 0x45, 0x8e, 0xa1,
-	0xb1, 0x74, 0x29, 0x9c, 0xf5, 0xf0, 0x06, 0x63, 0xe3, 0xb5, 0x43, 0xd7, 0x78, 0xf2, 0x1e, 0x9e,
-	0x53, 0x54, 0x59, 0xac, 0x55, 0x51, 0x3f, 0x46, 0x67, 0xb3, 0x76, 0xa7, 0xa7, 0x8c, 0x59, 0x36,
-	0xbd, 0x3f, 0x78, 0x59, 0xb5, 0x77, 0x1a, 0xd6, 0x65, 0xd5, 0xb6, 0x1a, 0xbb, 0x5e, 0x0f, 0xf6,
-	0xba, 0xf9, 0x0b, 0x4b, 0x25, 0x57, 0x68, 0x9a, 0x7e, 0x0d, 0xce, 0x17, 0x36, 0x41, 0x95, 0xb2,
-	0x10, 0xe7, 0x4b, 0x7e, 0x47, 0xe4, 0xd1, 0xaf, 0x4c, 0x6a, 0x6e, 0x56, 0x62, 0xab, 0x88, 0x2e,
-	0x89, 0xb3, 0x93, 0x9f, 0xc7, 0x23, 0xae, 0xc7, 0xd9, 0xa0, 0x15, 0x8a, 0x89, 0x3f, 0x66, 0x6a,
-	0xcc, 0x43, 0x21, 0x53, 0x3f, 0x14, 0x89, 0xca, 0x62, 0x7f, 0xf5, 0x77, 0x34, 0xb0, 0x0c, 0x7e,
-	0xf7, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x35, 0xe5, 0x62, 0x05, 0xa7, 0x04, 0x00, 0x00,
+var file_proto_pbcommon_common_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_proto_pbcommon_common_proto_goTypes = []interface{}{
+	(*RaftIndex)(nil),           // 0: common.RaftIndex
+	(*TargetDatacenter)(nil),    // 1: common.TargetDatacenter
+	(*WriteRequest)(nil),        // 2: common.WriteRequest
+	(*ReadRequest)(nil),         // 3: common.ReadRequest
+	(*QueryOptions)(nil),        // 4: common.QueryOptions
+	(*QueryMeta)(nil),           // 5: common.QueryMeta
+	(*EnterpriseMeta)(nil),      // 6: common.EnterpriseMeta
+	(*durationpb.Duration)(nil), // 7: google.protobuf.Duration
+}
+var file_proto_pbcommon_common_proto_depIdxs = []int32{
+	7, // 0: common.QueryOptions.MaxQueryTime:type_name -> google.protobuf.Duration
+	7, // 1: common.QueryOptions.MaxStaleDuration:type_name -> google.protobuf.Duration
+	7, // 2: common.QueryOptions.MaxAge:type_name -> google.protobuf.Duration
+	7, // 3: common.QueryOptions.StaleIfError:type_name -> google.protobuf.Duration
+	7, // 4: common.QueryMeta.LastContact:type_name -> google.protobuf.Duration
+	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_proto_pbcommon_common_proto_init() }
+func file_proto_pbcommon_common_proto_init() {
+	if File_proto_pbcommon_common_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbcommon_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*RaftIndex); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TargetDatacenter); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*WriteRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ReadRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*QueryOptions); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*QueryMeta); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbcommon_common_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EnterpriseMeta); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbcommon_common_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   7,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbcommon_common_proto_goTypes,
+		DependencyIndexes: file_proto_pbcommon_common_proto_depIdxs,
+		MessageInfos:      file_proto_pbcommon_common_proto_msgTypes,
+	}.Build()
+	File_proto_pbcommon_common_proto = out.File
+	file_proto_pbcommon_common_proto_rawDesc = nil
+	file_proto_pbcommon_common_proto_goTypes = nil
+	file_proto_pbcommon_common_proto_depIdxs = nil
 }
diff --git a/proto/pbconfig/config.pb.go b/proto/pbconfig/config.pb.go
index a3dfa4c81..e7443fc37 100644
--- a/proto/pbconfig/config.pb.go
+++ b/proto/pbconfig/config.pb.go
@@ -1,305 +1,348 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbconfig/config.proto
 
 package pbconfig
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 type Config struct {
-	Datacenter           string       `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
-	PrimaryDatacenter    string       `protobuf:"bytes,2,opt,name=PrimaryDatacenter,proto3" json:"PrimaryDatacenter,omitempty"`
-	NodeName             string       `protobuf:"bytes,3,opt,name=NodeName,proto3" json:"NodeName,omitempty"`
-	SegmentName          string       `protobuf:"bytes,4,opt,name=SegmentName,proto3" json:"SegmentName,omitempty"`
-	Partition            string       `protobuf:"bytes,9,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	ACL                  *ACL         `protobuf:"bytes,5,opt,name=ACL,proto3" json:"ACL,omitempty"`
-	AutoEncrypt          *AutoEncrypt `protobuf:"bytes,6,opt,name=AutoEncrypt,proto3" json:"AutoEncrypt,omitempty"`
-	Gossip               *Gossip      `protobuf:"bytes,7,opt,name=Gossip,proto3" json:"Gossip,omitempty"`
-	TLS                  *TLS         `protobuf:"bytes,8,opt,name=TLS,proto3" json:"TLS,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}     `json:"-"`
-	XXX_unrecognized     []byte       `json:"-"`
-	XXX_sizecache        int32        `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Datacenter        string       `protobuf:"bytes,1,opt,name=Datacenter,proto3" json:"Datacenter,omitempty"`
+	PrimaryDatacenter string       `protobuf:"bytes,2,opt,name=PrimaryDatacenter,proto3" json:"PrimaryDatacenter,omitempty"`
+	NodeName          string       `protobuf:"bytes,3,opt,name=NodeName,proto3" json:"NodeName,omitempty"`
+	SegmentName       string       `protobuf:"bytes,4,opt,name=SegmentName,proto3" json:"SegmentName,omitempty"`
+	Partition         string       `protobuf:"bytes,9,opt,name=Partition,proto3" json:"Partition,omitempty"`
+	ACL               *ACL         `protobuf:"bytes,5,opt,name=ACL,proto3" json:"ACL,omitempty"`
+	AutoEncrypt       *AutoEncrypt `protobuf:"bytes,6,opt,name=AutoEncrypt,proto3" json:"AutoEncrypt,omitempty"`
+	Gossip            *Gossip      `protobuf:"bytes,7,opt,name=Gossip,proto3" json:"Gossip,omitempty"`
+	TLS               *TLS         `protobuf:"bytes,8,opt,name=TLS,proto3" json:"TLS,omitempty"`
 }
 
-func (m *Config) Reset()         { *m = Config{} }
-func (m *Config) String() string { return proto.CompactTextString(m) }
-func (*Config) ProtoMessage()    {}
+func (x *Config) Reset() {
+	*x = Config{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Config) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Config) ProtoMessage() {}
+
+func (x *Config) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Config.ProtoReflect.Descriptor instead.
 func (*Config) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{0}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *Config) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Config.Unmarshal(m, b)
-}
-func (m *Config) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Config.Marshal(b, m, deterministic)
-}
-func (m *Config) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Config.Merge(m, src)
-}
-func (m *Config) XXX_Size() int {
-	return xxx_messageInfo_Config.Size(m)
-}
-func (m *Config) XXX_DiscardUnknown() {
-	xxx_messageInfo_Config.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Config proto.InternalMessageInfo
-
-func (m *Config) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *Config) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
 
-func (m *Config) GetPrimaryDatacenter() string {
-	if m != nil {
-		return m.PrimaryDatacenter
+func (x *Config) GetPrimaryDatacenter() string {
+	if x != nil {
+		return x.PrimaryDatacenter
 	}
 	return ""
 }
 
-func (m *Config) GetNodeName() string {
-	if m != nil {
-		return m.NodeName
+func (x *Config) GetNodeName() string {
+	if x != nil {
+		return x.NodeName
 	}
 	return ""
 }
 
-func (m *Config) GetSegmentName() string {
-	if m != nil {
-		return m.SegmentName
+func (x *Config) GetSegmentName() string {
+	if x != nil {
+		return x.SegmentName
 	}
 	return ""
 }
 
-func (m *Config) GetPartition() string {
-	if m != nil {
-		return m.Partition
+func (x *Config) GetPartition() string {
+	if x != nil {
+		return x.Partition
 	}
 	return ""
 }
 
-func (m *Config) GetACL() *ACL {
-	if m != nil {
-		return m.ACL
+func (x *Config) GetACL() *ACL {
+	if x != nil {
+		return x.ACL
 	}
 	return nil
 }
 
-func (m *Config) GetAutoEncrypt() *AutoEncrypt {
-	if m != nil {
-		return m.AutoEncrypt
+func (x *Config) GetAutoEncrypt() *AutoEncrypt {
+	if x != nil {
+		return x.AutoEncrypt
 	}
 	return nil
 }
 
-func (m *Config) GetGossip() *Gossip {
-	if m != nil {
-		return m.Gossip
+func (x *Config) GetGossip() *Gossip {
+	if x != nil {
+		return x.Gossip
 	}
 	return nil
 }
 
-func (m *Config) GetTLS() *TLS {
-	if m != nil {
-		return m.TLS
+func (x *Config) GetTLS() *TLS {
+	if x != nil {
+		return x.TLS
 	}
 	return nil
 }
 
 type Gossip struct {
-	Encryption           *GossipEncryption `protobuf:"bytes,1,opt,name=Encryption,proto3" json:"Encryption,omitempty"`
-	RetryJoinLAN         []string          `protobuf:"bytes,2,rep,name=RetryJoinLAN,proto3" json:"RetryJoinLAN,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}          `json:"-"`
-	XXX_unrecognized     []byte            `json:"-"`
-	XXX_sizecache        int32             `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Encryption   *GossipEncryption `protobuf:"bytes,1,opt,name=Encryption,proto3" json:"Encryption,omitempty"`
+	RetryJoinLAN []string          `protobuf:"bytes,2,rep,name=RetryJoinLAN,proto3" json:"RetryJoinLAN,omitempty"`
 }
 
-func (m *Gossip) Reset()         { *m = Gossip{} }
-func (m *Gossip) String() string { return proto.CompactTextString(m) }
-func (*Gossip) ProtoMessage()    {}
+func (x *Gossip) Reset() {
+	*x = Gossip{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Gossip) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Gossip) ProtoMessage() {}
+
+func (x *Gossip) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Gossip.ProtoReflect.Descriptor instead.
 func (*Gossip) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{1}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *Gossip) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Gossip.Unmarshal(m, b)
-}
-func (m *Gossip) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Gossip.Marshal(b, m, deterministic)
-}
-func (m *Gossip) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Gossip.Merge(m, src)
-}
-func (m *Gossip) XXX_Size() int {
-	return xxx_messageInfo_Gossip.Size(m)
-}
-func (m *Gossip) XXX_DiscardUnknown() {
-	xxx_messageInfo_Gossip.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Gossip proto.InternalMessageInfo
-
-func (m *Gossip) GetEncryption() *GossipEncryption {
-	if m != nil {
-		return m.Encryption
+func (x *Gossip) GetEncryption() *GossipEncryption {
+	if x != nil {
+		return x.Encryption
 	}
 	return nil
 }
 
-func (m *Gossip) GetRetryJoinLAN() []string {
-	if m != nil {
-		return m.RetryJoinLAN
+func (x *Gossip) GetRetryJoinLAN() []string {
+	if x != nil {
+		return x.RetryJoinLAN
 	}
 	return nil
 }
 
 type GossipEncryption struct {
-	Key                  string   `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
-	VerifyIncoming       bool     `protobuf:"varint,2,opt,name=VerifyIncoming,proto3" json:"VerifyIncoming,omitempty"`
-	VerifyOutgoing       bool     `protobuf:"varint,3,opt,name=VerifyOutgoing,proto3" json:"VerifyOutgoing,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Key            string `protobuf:"bytes,1,opt,name=Key,proto3" json:"Key,omitempty"`
+	VerifyIncoming bool   `protobuf:"varint,2,opt,name=VerifyIncoming,proto3" json:"VerifyIncoming,omitempty"`
+	VerifyOutgoing bool   `protobuf:"varint,3,opt,name=VerifyOutgoing,proto3" json:"VerifyOutgoing,omitempty"`
 }
 
-func (m *GossipEncryption) Reset()         { *m = GossipEncryption{} }
-func (m *GossipEncryption) String() string { return proto.CompactTextString(m) }
-func (*GossipEncryption) ProtoMessage()    {}
+func (x *GossipEncryption) Reset() {
+	*x = GossipEncryption{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *GossipEncryption) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*GossipEncryption) ProtoMessage() {}
+
+func (x *GossipEncryption) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use GossipEncryption.ProtoReflect.Descriptor instead.
 func (*GossipEncryption) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{2}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{2}
 }
 
-func (m *GossipEncryption) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_GossipEncryption.Unmarshal(m, b)
-}
-func (m *GossipEncryption) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_GossipEncryption.Marshal(b, m, deterministic)
-}
-func (m *GossipEncryption) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_GossipEncryption.Merge(m, src)
-}
-func (m *GossipEncryption) XXX_Size() int {
-	return xxx_messageInfo_GossipEncryption.Size(m)
-}
-func (m *GossipEncryption) XXX_DiscardUnknown() {
-	xxx_messageInfo_GossipEncryption.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_GossipEncryption proto.InternalMessageInfo
-
-func (m *GossipEncryption) GetKey() string {
-	if m != nil {
-		return m.Key
+func (x *GossipEncryption) GetKey() string {
+	if x != nil {
+		return x.Key
 	}
 	return ""
 }
 
-func (m *GossipEncryption) GetVerifyIncoming() bool {
-	if m != nil {
-		return m.VerifyIncoming
+func (x *GossipEncryption) GetVerifyIncoming() bool {
+	if x != nil {
+		return x.VerifyIncoming
 	}
 	return false
 }
 
-func (m *GossipEncryption) GetVerifyOutgoing() bool {
-	if m != nil {
-		return m.VerifyOutgoing
+func (x *GossipEncryption) GetVerifyOutgoing() bool {
+	if x != nil {
+		return x.VerifyOutgoing
 	}
 	return false
 }
 
 type TLS struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	VerifyOutgoing       bool   `protobuf:"varint,1,opt,name=VerifyOutgoing,proto3" json:"VerifyOutgoing,omitempty"`
 	VerifyServerHostname bool   `protobuf:"varint,2,opt,name=VerifyServerHostname,proto3" json:"VerifyServerHostname,omitempty"`
 	CipherSuites         string `protobuf:"bytes,3,opt,name=CipherSuites,proto3" json:"CipherSuites,omitempty"`
 	MinVersion           string `protobuf:"bytes,4,opt,name=MinVersion,proto3" json:"MinVersion,omitempty"`
 	// Deprecated_PreferServerCipherSuites is deprecated. It is no longer
 	// populated and should be ignored by clients.
-	Deprecated_PreferServerCipherSuites bool     `protobuf:"varint,5,opt,name=Deprecated_PreferServerCipherSuites,json=DeprecatedPreferServerCipherSuites,proto3" json:"Deprecated_PreferServerCipherSuites,omitempty"` // Deprecated: Do not use.
-	XXX_NoUnkeyedLiteral                struct{} `json:"-"`
-	XXX_unrecognized                    []byte   `json:"-"`
-	XXX_sizecache                       int32    `json:"-"`
+	//
+	// Deprecated: Do not use.
+	Deprecated_PreferServerCipherSuites bool `protobuf:"varint,5,opt,name=Deprecated_PreferServerCipherSuites,json=DeprecatedPreferServerCipherSuites,proto3" json:"Deprecated_PreferServerCipherSuites,omitempty"`
 }
 
-func (m *TLS) Reset()         { *m = TLS{} }
-func (m *TLS) String() string { return proto.CompactTextString(m) }
-func (*TLS) ProtoMessage()    {}
+func (x *TLS) Reset() {
+	*x = TLS{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TLS) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TLS) ProtoMessage() {}
+
+func (x *TLS) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TLS.ProtoReflect.Descriptor instead.
 func (*TLS) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{3}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{3}
 }
 
-func (m *TLS) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_TLS.Unmarshal(m, b)
-}
-func (m *TLS) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_TLS.Marshal(b, m, deterministic)
-}
-func (m *TLS) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TLS.Merge(m, src)
-}
-func (m *TLS) XXX_Size() int {
-	return xxx_messageInfo_TLS.Size(m)
-}
-func (m *TLS) XXX_DiscardUnknown() {
-	xxx_messageInfo_TLS.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_TLS proto.InternalMessageInfo
-
-func (m *TLS) GetVerifyOutgoing() bool {
-	if m != nil {
-		return m.VerifyOutgoing
+func (x *TLS) GetVerifyOutgoing() bool {
+	if x != nil {
+		return x.VerifyOutgoing
 	}
 	return false
 }
 
-func (m *TLS) GetVerifyServerHostname() bool {
-	if m != nil {
-		return m.VerifyServerHostname
+func (x *TLS) GetVerifyServerHostname() bool {
+	if x != nil {
+		return x.VerifyServerHostname
 	}
 	return false
 }
 
-func (m *TLS) GetCipherSuites() string {
-	if m != nil {
-		return m.CipherSuites
+func (x *TLS) GetCipherSuites() string {
+	if x != nil {
+		return x.CipherSuites
 	}
 	return ""
 }
 
-func (m *TLS) GetMinVersion() string {
-	if m != nil {
-		return m.MinVersion
+func (x *TLS) GetMinVersion() string {
+	if x != nil {
+		return x.MinVersion
 	}
 	return ""
 }
 
 // Deprecated: Do not use.
-func (m *TLS) GetDeprecated_PreferServerCipherSuites() bool {
-	if m != nil {
-		return m.Deprecated_PreferServerCipherSuites
+func (x *TLS) GetDeprecated_PreferServerCipherSuites() bool {
+	if x != nil {
+		return x.Deprecated_PreferServerCipherSuites
 	}
 	return false
 }
 
 type ACL struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	Enabled             bool       `protobuf:"varint,1,opt,name=Enabled,proto3" json:"Enabled,omitempty"`
 	PolicyTTL           string     `protobuf:"bytes,2,opt,name=PolicyTTL,proto3" json:"PolicyTTL,omitempty"`
 	RoleTTL             string     `protobuf:"bytes,3,opt,name=RoleTTL,proto3" json:"RoleTTL,omitempty"`
@@ -310,372 +353,612 @@ type ACL struct {
 	Tokens              *ACLTokens `protobuf:"bytes,8,opt,name=Tokens,proto3" json:"Tokens,omitempty"`
 	// Deprecated_DisabledTTL is deprecated. It is no longer populated and should
 	// be ignored by clients.
-	Deprecated_DisabledTTL string   `protobuf:"bytes,9,opt,name=Deprecated_DisabledTTL,json=DeprecatedDisabledTTL,proto3" json:"Deprecated_DisabledTTL,omitempty"` // Deprecated: Do not use.
-	EnableTokenPersistence bool     `protobuf:"varint,10,opt,name=EnableTokenPersistence,proto3" json:"EnableTokenPersistence,omitempty"`
-	MSPDisableBootstrap    bool     `protobuf:"varint,11,opt,name=MSPDisableBootstrap,proto3" json:"MSPDisableBootstrap,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
-	XXX_unrecognized       []byte   `json:"-"`
-	XXX_sizecache          int32    `json:"-"`
+	//
+	// Deprecated: Do not use.
+	Deprecated_DisabledTTL string `protobuf:"bytes,9,opt,name=Deprecated_DisabledTTL,json=DeprecatedDisabledTTL,proto3" json:"Deprecated_DisabledTTL,omitempty"`
+	EnableTokenPersistence bool   `protobuf:"varint,10,opt,name=EnableTokenPersistence,proto3" json:"EnableTokenPersistence,omitempty"`
+	MSPDisableBootstrap    bool   `protobuf:"varint,11,opt,name=MSPDisableBootstrap,proto3" json:"MSPDisableBootstrap,omitempty"`
 }
 
-func (m *ACL) Reset()         { *m = ACL{} }
-func (m *ACL) String() string { return proto.CompactTextString(m) }
-func (*ACL) ProtoMessage()    {}
+func (x *ACL) Reset() {
+	*x = ACL{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACL) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACL) ProtoMessage() {}
+
+func (x *ACL) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACL.ProtoReflect.Descriptor instead.
 func (*ACL) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{4}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{4}
 }
 
-func (m *ACL) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ACL.Unmarshal(m, b)
-}
-func (m *ACL) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ACL.Marshal(b, m, deterministic)
-}
-func (m *ACL) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ACL.Merge(m, src)
-}
-func (m *ACL) XXX_Size() int {
-	return xxx_messageInfo_ACL.Size(m)
-}
-func (m *ACL) XXX_DiscardUnknown() {
-	xxx_messageInfo_ACL.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ACL proto.InternalMessageInfo
-
-func (m *ACL) GetEnabled() bool {
-	if m != nil {
-		return m.Enabled
+func (x *ACL) GetEnabled() bool {
+	if x != nil {
+		return x.Enabled
 	}
 	return false
 }
 
-func (m *ACL) GetPolicyTTL() string {
-	if m != nil {
-		return m.PolicyTTL
+func (x *ACL) GetPolicyTTL() string {
+	if x != nil {
+		return x.PolicyTTL
 	}
 	return ""
 }
 
-func (m *ACL) GetRoleTTL() string {
-	if m != nil {
-		return m.RoleTTL
+func (x *ACL) GetRoleTTL() string {
+	if x != nil {
+		return x.RoleTTL
 	}
 	return ""
 }
 
-func (m *ACL) GetTokenTTL() string {
-	if m != nil {
-		return m.TokenTTL
+func (x *ACL) GetTokenTTL() string {
+	if x != nil {
+		return x.TokenTTL
 	}
 	return ""
 }
 
-func (m *ACL) GetDownPolicy() string {
-	if m != nil {
-		return m.DownPolicy
+func (x *ACL) GetDownPolicy() string {
+	if x != nil {
+		return x.DownPolicy
 	}
 	return ""
 }
 
-func (m *ACL) GetDefaultPolicy() string {
-	if m != nil {
-		return m.DefaultPolicy
+func (x *ACL) GetDefaultPolicy() string {
+	if x != nil {
+		return x.DefaultPolicy
 	}
 	return ""
 }
 
-func (m *ACL) GetEnableKeyListPolicy() bool {
-	if m != nil {
-		return m.EnableKeyListPolicy
+func (x *ACL) GetEnableKeyListPolicy() bool {
+	if x != nil {
+		return x.EnableKeyListPolicy
 	}
 	return false
 }
 
-func (m *ACL) GetTokens() *ACLTokens {
-	if m != nil {
-		return m.Tokens
+func (x *ACL) GetTokens() *ACLTokens {
+	if x != nil {
+		return x.Tokens
 	}
 	return nil
 }
 
 // Deprecated: Do not use.
-func (m *ACL) GetDeprecated_DisabledTTL() string {
-	if m != nil {
-		return m.Deprecated_DisabledTTL
+func (x *ACL) GetDeprecated_DisabledTTL() string {
+	if x != nil {
+		return x.Deprecated_DisabledTTL
 	}
 	return ""
 }
 
-func (m *ACL) GetEnableTokenPersistence() bool {
-	if m != nil {
-		return m.EnableTokenPersistence
+func (x *ACL) GetEnableTokenPersistence() bool {
+	if x != nil {
+		return x.EnableTokenPersistence
 	}
 	return false
 }
 
-func (m *ACL) GetMSPDisableBootstrap() bool {
-	if m != nil {
-		return m.MSPDisableBootstrap
+func (x *ACL) GetMSPDisableBootstrap() bool {
+	if x != nil {
+		return x.MSPDisableBootstrap
 	}
 	return false
 }
 
 type ACLTokens struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	InitialManagement      string                     `protobuf:"bytes,1,opt,name=InitialManagement,proto3" json:"InitialManagement,omitempty"`
 	Replication            string                     `protobuf:"bytes,2,opt,name=Replication,proto3" json:"Replication,omitempty"`
 	AgentRecovery          string                     `protobuf:"bytes,3,opt,name=AgentRecovery,proto3" json:"AgentRecovery,omitempty"`
 	Default                string                     `protobuf:"bytes,4,opt,name=Default,proto3" json:"Default,omitempty"`
 	Agent                  string                     `protobuf:"bytes,5,opt,name=Agent,proto3" json:"Agent,omitempty"`
 	ManagedServiceProvider []*ACLServiceProviderToken `protobuf:"bytes,6,rep,name=ManagedServiceProvider,proto3" json:"ManagedServiceProvider,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{}                   `json:"-"`
-	XXX_unrecognized       []byte                     `json:"-"`
-	XXX_sizecache          int32                      `json:"-"`
 }
 
-func (m *ACLTokens) Reset()         { *m = ACLTokens{} }
-func (m *ACLTokens) String() string { return proto.CompactTextString(m) }
-func (*ACLTokens) ProtoMessage()    {}
+func (x *ACLTokens) Reset() {
+	*x = ACLTokens{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACLTokens) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACLTokens) ProtoMessage() {}
+
+func (x *ACLTokens) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACLTokens.ProtoReflect.Descriptor instead.
 func (*ACLTokens) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{5}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{5}
 }
 
-func (m *ACLTokens) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ACLTokens.Unmarshal(m, b)
-}
-func (m *ACLTokens) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ACLTokens.Marshal(b, m, deterministic)
-}
-func (m *ACLTokens) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ACLTokens.Merge(m, src)
-}
-func (m *ACLTokens) XXX_Size() int {
-	return xxx_messageInfo_ACLTokens.Size(m)
-}
-func (m *ACLTokens) XXX_DiscardUnknown() {
-	xxx_messageInfo_ACLTokens.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ACLTokens proto.InternalMessageInfo
-
-func (m *ACLTokens) GetInitialManagement() string {
-	if m != nil {
-		return m.InitialManagement
+func (x *ACLTokens) GetInitialManagement() string {
+	if x != nil {
+		return x.InitialManagement
 	}
 	return ""
 }
 
-func (m *ACLTokens) GetReplication() string {
-	if m != nil {
-		return m.Replication
+func (x *ACLTokens) GetReplication() string {
+	if x != nil {
+		return x.Replication
 	}
 	return ""
 }
 
-func (m *ACLTokens) GetAgentRecovery() string {
-	if m != nil {
-		return m.AgentRecovery
+func (x *ACLTokens) GetAgentRecovery() string {
+	if x != nil {
+		return x.AgentRecovery
 	}
 	return ""
 }
 
-func (m *ACLTokens) GetDefault() string {
-	if m != nil {
-		return m.Default
+func (x *ACLTokens) GetDefault() string {
+	if x != nil {
+		return x.Default
 	}
 	return ""
 }
 
-func (m *ACLTokens) GetAgent() string {
-	if m != nil {
-		return m.Agent
+func (x *ACLTokens) GetAgent() string {
+	if x != nil {
+		return x.Agent
 	}
 	return ""
 }
 
-func (m *ACLTokens) GetManagedServiceProvider() []*ACLServiceProviderToken {
-	if m != nil {
-		return m.ManagedServiceProvider
+func (x *ACLTokens) GetManagedServiceProvider() []*ACLServiceProviderToken {
+	if x != nil {
+		return x.ManagedServiceProvider
 	}
 	return nil
 }
 
 type ACLServiceProviderToken struct {
-	AccessorID           string   `protobuf:"bytes,1,opt,name=AccessorID,proto3" json:"AccessorID,omitempty"`
-	SecretID             string   `protobuf:"bytes,2,opt,name=SecretID,proto3" json:"SecretID,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	AccessorID string `protobuf:"bytes,1,opt,name=AccessorID,proto3" json:"AccessorID,omitempty"`
+	SecretID   string `protobuf:"bytes,2,opt,name=SecretID,proto3" json:"SecretID,omitempty"`
 }
 
-func (m *ACLServiceProviderToken) Reset()         { *m = ACLServiceProviderToken{} }
-func (m *ACLServiceProviderToken) String() string { return proto.CompactTextString(m) }
-func (*ACLServiceProviderToken) ProtoMessage()    {}
+func (x *ACLServiceProviderToken) Reset() {
+	*x = ACLServiceProviderToken{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ACLServiceProviderToken) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ACLServiceProviderToken) ProtoMessage() {}
+
+func (x *ACLServiceProviderToken) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ACLServiceProviderToken.ProtoReflect.Descriptor instead.
 func (*ACLServiceProviderToken) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{6}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{6}
 }
 
-func (m *ACLServiceProviderToken) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ACLServiceProviderToken.Unmarshal(m, b)
-}
-func (m *ACLServiceProviderToken) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ACLServiceProviderToken.Marshal(b, m, deterministic)
-}
-func (m *ACLServiceProviderToken) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ACLServiceProviderToken.Merge(m, src)
-}
-func (m *ACLServiceProviderToken) XXX_Size() int {
-	return xxx_messageInfo_ACLServiceProviderToken.Size(m)
-}
-func (m *ACLServiceProviderToken) XXX_DiscardUnknown() {
-	xxx_messageInfo_ACLServiceProviderToken.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ACLServiceProviderToken proto.InternalMessageInfo
-
-func (m *ACLServiceProviderToken) GetAccessorID() string {
-	if m != nil {
-		return m.AccessorID
+func (x *ACLServiceProviderToken) GetAccessorID() string {
+	if x != nil {
+		return x.AccessorID
 	}
 	return ""
 }
 
-func (m *ACLServiceProviderToken) GetSecretID() string {
-	if m != nil {
-		return m.SecretID
+func (x *ACLServiceProviderToken) GetSecretID() string {
+	if x != nil {
+		return x.SecretID
 	}
 	return ""
 }
 
 type AutoEncrypt struct {
-	TLS                  bool     `protobuf:"varint,1,opt,name=TLS,proto3" json:"TLS,omitempty"`
-	DNSSAN               []string `protobuf:"bytes,2,rep,name=DNSSAN,proto3" json:"DNSSAN,omitempty"`
-	IPSAN                []string `protobuf:"bytes,3,rep,name=IPSAN,proto3" json:"IPSAN,omitempty"`
-	AllowTLS             bool     `protobuf:"varint,4,opt,name=AllowTLS,proto3" json:"AllowTLS,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	TLS      bool     `protobuf:"varint,1,opt,name=TLS,proto3" json:"TLS,omitempty"`
+	DNSSAN   []string `protobuf:"bytes,2,rep,name=DNSSAN,proto3" json:"DNSSAN,omitempty"`
+	IPSAN    []string `protobuf:"bytes,3,rep,name=IPSAN,proto3" json:"IPSAN,omitempty"`
+	AllowTLS bool     `protobuf:"varint,4,opt,name=AllowTLS,proto3" json:"AllowTLS,omitempty"`
 }
 
-func (m *AutoEncrypt) Reset()         { *m = AutoEncrypt{} }
-func (m *AutoEncrypt) String() string { return proto.CompactTextString(m) }
-func (*AutoEncrypt) ProtoMessage()    {}
+func (x *AutoEncrypt) Reset() {
+	*x = AutoEncrypt{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconfig_config_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *AutoEncrypt) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*AutoEncrypt) ProtoMessage() {}
+
+func (x *AutoEncrypt) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconfig_config_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use AutoEncrypt.ProtoReflect.Descriptor instead.
 func (*AutoEncrypt) Descriptor() ([]byte, []int) {
-	return fileDescriptor_aefa824db7b74d77, []int{7}
+	return file_proto_pbconfig_config_proto_rawDescGZIP(), []int{7}
 }
 
-func (m *AutoEncrypt) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_AutoEncrypt.Unmarshal(m, b)
-}
-func (m *AutoEncrypt) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_AutoEncrypt.Marshal(b, m, deterministic)
-}
-func (m *AutoEncrypt) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_AutoEncrypt.Merge(m, src)
-}
-func (m *AutoEncrypt) XXX_Size() int {
-	return xxx_messageInfo_AutoEncrypt.Size(m)
-}
-func (m *AutoEncrypt) XXX_DiscardUnknown() {
-	xxx_messageInfo_AutoEncrypt.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_AutoEncrypt proto.InternalMessageInfo
-
-func (m *AutoEncrypt) GetTLS() bool {
-	if m != nil {
-		return m.TLS
+func (x *AutoEncrypt) GetTLS() bool {
+	if x != nil {
+		return x.TLS
 	}
 	return false
 }
 
-func (m *AutoEncrypt) GetDNSSAN() []string {
-	if m != nil {
-		return m.DNSSAN
+func (x *AutoEncrypt) GetDNSSAN() []string {
+	if x != nil {
+		return x.DNSSAN
 	}
 	return nil
 }
 
-func (m *AutoEncrypt) GetIPSAN() []string {
-	if m != nil {
-		return m.IPSAN
+func (x *AutoEncrypt) GetIPSAN() []string {
+	if x != nil {
+		return x.IPSAN
 	}
 	return nil
 }
 
-func (m *AutoEncrypt) GetAllowTLS() bool {
-	if m != nil {
-		return m.AllowTLS
+func (x *AutoEncrypt) GetAllowTLS() bool {
+	if x != nil {
+		return x.AllowTLS
 	}
 	return false
 }
 
-func init() {
-	proto.RegisterType((*Config)(nil), "config.Config")
-	proto.RegisterType((*Gossip)(nil), "config.Gossip")
-	proto.RegisterType((*GossipEncryption)(nil), "config.GossipEncryption")
-	proto.RegisterType((*TLS)(nil), "config.TLS")
-	proto.RegisterType((*ACL)(nil), "config.ACL")
-	proto.RegisterType((*ACLTokens)(nil), "config.ACLTokens")
-	proto.RegisterType((*ACLServiceProviderToken)(nil), "config.ACLServiceProviderToken")
-	proto.RegisterType((*AutoEncrypt)(nil), "config.AutoEncrypt")
+var File_proto_pbconfig_config_proto protoreflect.FileDescriptor
+
+var file_proto_pbconfig_config_proto_rawDesc = []byte{
+	0x0a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x63,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0xcf, 0x02, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72,
+	0x12, 0x2c, 0x0a, 0x11, 0x50, 0x72, 0x69, 0x6d, 0x61, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x63,
+	0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x50, 0x72, 0x69,
+	0x6d, 0x61, 0x72, 0x79, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x1a,
+	0x0a, 0x08, 0x4e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x4e, 0x6f, 0x64, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65,
+	0x67, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0b, 0x53, 0x65, 0x67, 0x6d, 0x65, 0x6e, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09,
+	0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1d, 0x0a, 0x03, 0x41, 0x43,
+	0x4c, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x2e, 0x41, 0x43, 0x4c, 0x52, 0x03, 0x41, 0x43, 0x4c, 0x12, 0x35, 0x0a, 0x0b, 0x41, 0x75, 0x74,
+	0x6f, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13,
+	0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72,
+	0x79, 0x70, 0x74, 0x52, 0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74,
+	0x12, 0x26, 0x0a, 0x06, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x0e, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70,
+	0x52, 0x06, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x12, 0x1d, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18,
+	0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x54,
+	0x4c, 0x53, 0x52, 0x03, 0x54, 0x4c, 0x53, 0x22, 0x66, 0x0a, 0x06, 0x47, 0x6f, 0x73, 0x73, 0x69,
+	0x70, 0x12, 0x38, 0x0a, 0x0a, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x47,
+	0x6f, 0x73, 0x73, 0x69, 0x70, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0a, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x22, 0x0a, 0x0c, 0x52,
+	0x65, 0x74, 0x72, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x4c, 0x41, 0x4e, 0x18, 0x02, 0x20, 0x03, 0x28,
+	0x09, 0x52, 0x0c, 0x52, 0x65, 0x74, 0x72, 0x79, 0x4a, 0x6f, 0x69, 0x6e, 0x4c, 0x41, 0x4e, 0x22,
+	0x74, 0x0a, 0x10, 0x47, 0x6f, 0x73, 0x73, 0x69, 0x70, 0x45, 0x6e, 0x63, 0x72, 0x79, 0x70, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x26, 0x0a, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x49,
+	0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x56,
+	0x65, 0x72, 0x69, 0x66, 0x79, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x69, 0x6e, 0x67, 0x12, 0x26, 0x0a,
+	0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74,
+	0x67, 0x6f, 0x69, 0x6e, 0x67, 0x22, 0xfa, 0x01, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x26, 0x0a,
+	0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74, 0x67, 0x6f, 0x69, 0x6e, 0x67, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0e, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x4f, 0x75, 0x74,
+	0x67, 0x6f, 0x69, 0x6e, 0x67, 0x12, 0x32, 0x0a, 0x14, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x53,
+	0x65, 0x72, 0x76, 0x65, 0x72, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x14, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x53, 0x65, 0x72, 0x76, 0x65,
+	0x72, 0x48, 0x6f, 0x73, 0x74, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x43, 0x69, 0x70,
+	0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0c, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a,
+	0x0a, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x4d, 0x69, 0x6e, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x53, 0x0a,
+	0x23, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x50, 0x72, 0x65, 0x66,
+	0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75,
+	0x69, 0x74, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x42, 0x02, 0x18, 0x01, 0x52, 0x22,
+	0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x50, 0x72, 0x65, 0x66, 0x65, 0x72,
+	0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x69, 0x70, 0x68, 0x65, 0x72, 0x53, 0x75, 0x69, 0x74,
+	0x65, 0x73, 0x22, 0xbb, 0x03, 0x0a, 0x03, 0x41, 0x43, 0x4c, 0x12, 0x18, 0x0a, 0x07, 0x45, 0x6e,
+	0x61, 0x62, 0x6c, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x45, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54, 0x54,
+	0x4c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x54,
+	0x54, 0x4c, 0x12, 0x18, 0x0a, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x54, 0x54, 0x4c, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x07, 0x52, 0x6f, 0x6c, 0x65, 0x54, 0x54, 0x4c, 0x12, 0x1a, 0x0a, 0x08,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x54, 0x54, 0x4c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x54, 0x54, 0x4c, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x6f, 0x77, 0x6e,
+	0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x6f,
+	0x77, 0x6e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x24, 0x0a, 0x0d, 0x44, 0x65, 0x66, 0x61,
+	0x75, 0x6c, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0d, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x12, 0x30,
+	0x0a, 0x13, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x50,
+	0x6f, 0x6c, 0x69, 0x63, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x45, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x4b, 0x65, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79,
+	0x12, 0x29, 0x0a, 0x06, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x43, 0x4c, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x73, 0x52, 0x06, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x39, 0x0a, 0x16, 0x44,
+	0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x5f, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c,
+	0x65, 0x64, 0x54, 0x54, 0x4c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x42, 0x02, 0x18, 0x01, 0x52,
+	0x15, 0x44, 0x65, 0x70, 0x72, 0x65, 0x63, 0x61, 0x74, 0x65, 0x64, 0x44, 0x69, 0x73, 0x61, 0x62,
+	0x6c, 0x65, 0x64, 0x54, 0x54, 0x4c, 0x12, 0x36, 0x0a, 0x16, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65,
+	0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x50, 0x65, 0x72, 0x73, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x30,
+	0x0a, 0x13, 0x4d, 0x53, 0x50, 0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x6f, 0x6f, 0x74,
+	0x73, 0x74, 0x72, 0x61, 0x70, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x4d, 0x53, 0x50,
+	0x44, 0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x42, 0x6f, 0x6f, 0x74, 0x73, 0x74, 0x72, 0x61, 0x70,
+	0x22, 0x8a, 0x02, 0x0a, 0x09, 0x41, 0x43, 0x4c, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x73, 0x12, 0x2c,
+	0x0a, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d,
+	0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x49, 0x6e, 0x69, 0x74, 0x69,
+	0x61, 0x6c, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x12, 0x20, 0x0a, 0x0b,
+	0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0b, 0x52, 0x65, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x24,
+	0x0a, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x63, 0x6f,
+	0x76, 0x65, 0x72, 0x79, 0x12, 0x18, 0x0a, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6c, 0x74, 0x12, 0x14,
+	0x0a, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41,
+	0x67, 0x65, 0x6e, 0x74, 0x12, 0x57, 0x0a, 0x16, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x18, 0x06,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2e, 0x41, 0x43,
+	0x4c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x16, 0x4d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x64, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x72, 0x22, 0x55, 0x0a,
+	0x17, 0x41, 0x43, 0x4c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x72, 0x6f, 0x76, 0x69,
+	0x64, 0x65, 0x72, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x41, 0x63, 0x63, 0x65,
+	0x73, 0x73, 0x6f, 0x72, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x41, 0x63,
+	0x63, 0x65, 0x73, 0x73, 0x6f, 0x72, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x65, 0x63, 0x72,
+	0x65, 0x74, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x53, 0x65, 0x63, 0x72,
+	0x65, 0x74, 0x49, 0x44, 0x22, 0x69, 0x0a, 0x0b, 0x41, 0x75, 0x74, 0x6f, 0x45, 0x6e, 0x63, 0x72,
+	0x79, 0x70, 0x74, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x4c, 0x53, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08,
+	0x52, 0x03, 0x54, 0x4c, 0x53, 0x12, 0x16, 0x0a, 0x06, 0x44, 0x4e, 0x53, 0x53, 0x41, 0x4e, 0x18,
+	0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x06, 0x44, 0x4e, 0x53, 0x53, 0x41, 0x4e, 0x12, 0x14, 0x0a,
+	0x05, 0x49, 0x50, 0x53, 0x41, 0x4e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x49, 0x50,
+	0x53, 0x41, 0x4e, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x54, 0x4c, 0x53, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x41, 0x6c, 0x6c, 0x6f, 0x77, 0x54, 0x4c, 0x53, 0x42,
+	0x2c, 0x5a, 0x2a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61,
+	0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x62, 0x06, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbconfig/config.proto", fileDescriptor_aefa824db7b74d77)
+var (
+	file_proto_pbconfig_config_proto_rawDescOnce sync.Once
+	file_proto_pbconfig_config_proto_rawDescData = file_proto_pbconfig_config_proto_rawDesc
+)
+
+func file_proto_pbconfig_config_proto_rawDescGZIP() []byte {
+	file_proto_pbconfig_config_proto_rawDescOnce.Do(func() {
+		file_proto_pbconfig_config_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbconfig_config_proto_rawDescData)
+	})
+	return file_proto_pbconfig_config_proto_rawDescData
 }
 
-var fileDescriptor_aefa824db7b74d77 = []byte{
-	// 805 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x55, 0xdd, 0x8e, 0x22, 0x45,
-	0x14, 0x0e, 0xf4, 0x6e, 0x0f, 0x14, 0xba, 0xd9, 0xad, 0x5d, 0xb1, 0xe3, 0x2f, 0x69, 0xcd, 0x06,
-	0xcd, 0x66, 0x30, 0x63, 0x34, 0x7a, 0xc9, 0xc0, 0x46, 0x71, 0x19, 0x24, 0xdd, 0x38, 0x26, 0xde,
-	0x98, 0xa6, 0x39, 0x40, 0xc5, 0xa6, 0xaa, 0x53, 0x5d, 0xcc, 0xa4, 0x5f, 0xc1, 0x57, 0xf2, 0x21,
-	0x7c, 0x1f, 0xaf, 0xcc, 0xa9, 0xaa, 0xfe, 0x9b, 0x81, 0x2b, 0x38, 0xdf, 0xf7, 0xd5, 0xa9, 0x73,
-	0xea, 0xfc, 0x34, 0xf9, 0x38, 0x95, 0x42, 0x89, 0x51, 0xba, 0x8e, 0x05, 0xdf, 0xb2, 0xdd, 0xc8,
-	0xfc, 0x5c, 0x6a, 0x94, 0xba, 0xc6, 0xf2, 0xff, 0x6d, 0x13, 0x77, 0xa2, 0xff, 0xd2, 0xcf, 0x08,
-	0x99, 0x46, 0x2a, 0x8a, 0x81, 0x2b, 0x90, 0x5e, 0x6b, 0xd0, 0x1a, 0x76, 0x83, 0x1a, 0x42, 0xdf,
-	0x90, 0x17, 0x4b, 0xc9, 0x0e, 0x91, 0xcc, 0x6b, 0xb2, 0xb6, 0x96, 0x3d, 0x26, 0xe8, 0x47, 0xa4,
-	0xb3, 0x10, 0x1b, 0x58, 0x44, 0x07, 0xf0, 0x1c, 0x2d, 0x2a, 0x6d, 0x3a, 0x20, 0xbd, 0x10, 0x76,
-	0x07, 0xe0, 0x4a, 0xd3, 0x4f, 0x34, 0x5d, 0x87, 0xe8, 0x27, 0xa4, 0xbb, 0x8c, 0xa4, 0x62, 0x8a,
-	0x09, 0xee, 0x75, 0x35, 0x5f, 0x01, 0xf4, 0x53, 0xe2, 0x8c, 0x27, 0x73, 0xef, 0xe9, 0xa0, 0x35,
-	0xec, 0x5d, 0xf5, 0x2e, 0x6d, 0x62, 0xe3, 0xc9, 0x3c, 0x40, 0x9c, 0x7e, 0x47, 0x7a, 0xe3, 0xa3,
-	0x12, 0x6f, 0x79, 0x2c, 0xf3, 0x54, 0x79, 0xae, 0x96, 0xbd, 0x2c, 0x65, 0x15, 0x15, 0xd4, 0x75,
-	0xf4, 0x35, 0x71, 0x7f, 0x12, 0x59, 0xc6, 0x52, 0xef, 0x42, 0x9f, 0x78, 0x56, 0x9c, 0x30, 0x68,
-	0x60, 0x59, 0xbc, 0x7d, 0x35, 0x0f, 0xbd, 0x4e, 0xf3, 0xf6, 0xd5, 0x3c, 0x0c, 0x10, 0xf7, 0xb7,
-	0x85, 0x1b, 0xfa, 0x03, 0x21, 0xd6, 0x37, 0x66, 0xd1, 0xd2, 0x7a, 0xaf, 0xe9, 0xb4, 0xe2, 0x83,
-	0x9a, 0x96, 0xfa, 0xe4, 0xbd, 0x00, 0x94, 0xcc, 0x7f, 0x11, 0x8c, 0xcf, 0xc7, 0x0b, 0xaf, 0x3d,
-	0x70, 0x86, 0xdd, 0xa0, 0x81, 0xf9, 0x8a, 0x3c, 0x7f, 0xe8, 0x83, 0x3e, 0x27, 0xce, 0x3b, 0xc8,
-	0x6d, 0xed, 0xf0, 0x2f, 0x7d, 0x4d, 0x9e, 0xdd, 0x82, 0x64, 0xdb, 0x7c, 0xc6, 0x63, 0x71, 0x60,
-	0x7c, 0xa7, 0x2b, 0xd6, 0x09, 0x1e, 0xa0, 0x95, 0xee, 0xd7, 0xa3, 0xda, 0x09, 0xd4, 0x39, 0x75,
-	0x5d, 0x81, 0xfa, 0xff, 0xb5, 0x74, 0xf6, 0x27, 0xf4, 0xad, 0x53, 0x7a, 0x7a, 0x45, 0x5e, 0x19,
-	0x24, 0x04, 0x79, 0x07, 0xf2, 0x67, 0x91, 0x29, 0x8e, 0x35, 0x37, 0x51, 0x9c, 0xe4, 0x30, 0xfb,
-	0x09, 0x4b, 0xf7, 0x20, 0xc3, 0x23, 0x53, 0x90, 0xd9, 0xf6, 0x69, 0x60, 0xd8, 0xac, 0x37, 0x8c,
-	0xdf, 0x82, 0xcc, 0xf0, 0x6d, 0x4d, 0x07, 0xd5, 0x10, 0x1a, 0x92, 0x2f, 0xa6, 0x90, 0x4a, 0x88,
-	0x23, 0x05, 0x9b, 0x3f, 0x97, 0x12, 0xb6, 0x20, 0xcd, 0x35, 0x0d, 0xd7, 0xd8, 0x42, 0x9d, 0xeb,
-	0xb6, 0xd7, 0x0a, 0xfc, 0x4a, 0x7e, 0x4e, 0xed, 0xff, 0xe3, 0xe8, 0xc6, 0xa3, 0x1e, 0xb9, 0x78,
-	0xcb, 0xa3, 0x75, 0x02, 0x1b, 0x9b, 0x75, 0x61, 0xea, 0xbe, 0x15, 0x09, 0x8b, 0xf3, 0xd5, 0x6a,
-	0x6e, 0x67, 0xa3, 0x02, 0xf0, 0x5c, 0x20, 0x12, 0x40, 0xce, 0xe4, 0x54, 0x98, 0x38, 0x2d, 0x2b,
-	0xf1, 0x17, 0x70, 0xa4, 0x4c, 0x32, 0xa5, 0xad, 0xe7, 0x52, 0xdc, 0x73, 0xe3, 0x46, 0x47, 0x8c,
-	0x73, 0x59, 0x22, 0xf4, 0x4b, 0xf2, 0xfe, 0x14, 0xb6, 0xd1, 0x31, 0x51, 0x56, 0xe2, 0x6a, 0x49,
-	0x13, 0xa4, 0xdf, 0x90, 0x97, 0x26, 0xc8, 0x77, 0x90, 0xcf, 0x59, 0x56, 0x68, 0x2f, 0x74, 0xfc,
-	0xa7, 0x28, 0xfa, 0x15, 0x71, 0x75, 0x0c, 0x99, 0x6d, 0xf5, 0x17, 0xb5, 0x41, 0x33, 0x44, 0x60,
-	0x05, 0xf4, 0x47, 0xd2, 0xaf, 0xbd, 0xf6, 0x94, 0x65, 0xfa, 0x35, 0x30, 0x19, 0x3d, 0xbb, 0xfa,
-	0x81, 0x3f, 0xa8, 0x14, 0x35, 0x01, 0xfd, 0x9e, 0xf4, 0xcd, 0xe5, 0xda, 0xd5, 0x12, 0xcb, 0x97,
-	0x29, 0xe0, 0x31, 0x78, 0x44, 0x87, 0x76, 0x86, 0xc5, 0x7c, 0x6e, 0xc2, 0xa5, 0xf5, 0x74, 0x2d,
-	0x84, 0xca, 0x94, 0x8c, 0x52, 0xaf, 0x67, 0xf2, 0x39, 0x41, 0xf9, 0x7f, 0xb7, 0x49, 0xb7, 0x0c,
-	0x1d, 0xb7, 0xd9, 0x8c, 0x33, 0xc5, 0xa2, 0xe4, 0x26, 0xe2, 0xd1, 0x0e, 0x70, 0xf5, 0xd8, 0xc1,
-	0x79, 0x4c, 0xe0, 0xc6, 0x0a, 0x20, 0x4d, 0x58, 0x1c, 0xe9, 0x59, 0x36, 0x95, 0xad, 0x43, 0x58,
-	0x85, 0xf1, 0x0e, 0xb8, 0x0a, 0x20, 0x16, 0x77, 0x20, 0x73, 0x5b, 0xe1, 0x26, 0x88, 0x1d, 0x60,
-	0xcb, 0x62, 0xcb, 0x5c, 0x98, 0xf4, 0x15, 0x79, 0xaa, 0xa5, 0xb6, 0xc0, 0xc6, 0xa0, 0xbf, 0x93,
-	0xbe, 0x89, 0x62, 0x83, 0xed, 0xc8, 0x62, 0x58, 0x4a, 0x71, 0xc7, 0x36, 0x20, 0x3d, 0x77, 0xe0,
-	0x0c, 0x7b, 0x57, 0x9f, 0xd7, 0x6a, 0xf2, 0x40, 0xa1, 0xf3, 0x0c, 0xce, 0x1c, 0xf7, 0x7f, 0x23,
-	0x1f, 0x9e, 0x39, 0x82, 0xfd, 0x36, 0x8e, 0x63, 0xc8, 0x32, 0x21, 0x67, 0xd3, 0xe2, 0x3b, 0x50,
-	0x21, 0xd8, 0xab, 0x21, 0xc4, 0x12, 0xd4, 0x6c, 0x6a, 0x1f, 0xa2, 0xb4, 0x7d, 0xd6, 0x58, 0xbd,
-	0xb8, 0x8f, 0x70, 0x55, 0x9a, 0x21, 0xd1, 0x7b, 0xa3, 0x4f, 0xdc, 0xe9, 0x22, 0x0c, 0xcb, 0x9d,
-	0x66, 0x2d, 0x4c, 0x7f, 0xb6, 0x44, 0xd8, 0xd1, 0xb0, 0x31, 0xf0, 0xaa, 0x71, 0x92, 0x88, 0x7b,
-	0x74, 0xf2, 0x44, 0x3b, 0x29, 0xed, 0xeb, 0x37, 0x7f, 0x7c, 0xbd, 0x63, 0x6a, 0x7f, 0x5c, 0x5f,
-	0xc6, 0xe2, 0x30, 0xda, 0x47, 0xd9, 0x9e, 0xc5, 0x42, 0xa6, 0xf8, 0x99, 0xcb, 0x8e, 0xc9, 0xa8,
-	0xf9, 0xf1, 0x5b, 0xbb, 0xda, 0xfe, 0xf6, 0xff, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x97, 0xb9,
-	0xb8, 0x15, 0x07, 0x00, 0x00,
+var file_proto_pbconfig_config_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
+var file_proto_pbconfig_config_proto_goTypes = []interface{}{
+	(*Config)(nil),                  // 0: config.Config
+	(*Gossip)(nil),                  // 1: config.Gossip
+	(*GossipEncryption)(nil),        // 2: config.GossipEncryption
+	(*TLS)(nil),                     // 3: config.TLS
+	(*ACL)(nil),                     // 4: config.ACL
+	(*ACLTokens)(nil),               // 5: config.ACLTokens
+	(*ACLServiceProviderToken)(nil), // 6: config.ACLServiceProviderToken
+	(*AutoEncrypt)(nil),             // 7: config.AutoEncrypt
+}
+var file_proto_pbconfig_config_proto_depIdxs = []int32{
+	4, // 0: config.Config.ACL:type_name -> config.ACL
+	7, // 1: config.Config.AutoEncrypt:type_name -> config.AutoEncrypt
+	1, // 2: config.Config.Gossip:type_name -> config.Gossip
+	3, // 3: config.Config.TLS:type_name -> config.TLS
+	2, // 4: config.Gossip.Encryption:type_name -> config.GossipEncryption
+	5, // 5: config.ACL.Tokens:type_name -> config.ACLTokens
+	6, // 6: config.ACLTokens.ManagedServiceProvider:type_name -> config.ACLServiceProviderToken
+	7, // [7:7] is the sub-list for method output_type
+	7, // [7:7] is the sub-list for method input_type
+	7, // [7:7] is the sub-list for extension type_name
+	7, // [7:7] is the sub-list for extension extendee
+	0, // [0:7] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbconfig_config_proto_init() }
+func file_proto_pbconfig_config_proto_init() {
+	if File_proto_pbconfig_config_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbconfig_config_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Config); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Gossip); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*GossipEncryption); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TLS); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACL); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACLTokens); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ACLServiceProviderToken); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconfig_config_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*AutoEncrypt); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbconfig_config_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   8,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbconfig_config_proto_goTypes,
+		DependencyIndexes: file_proto_pbconfig_config_proto_depIdxs,
+		MessageInfos:      file_proto_pbconfig_config_proto_msgTypes,
+	}.Build()
+	File_proto_pbconfig_config_proto = out.File
+	file_proto_pbconfig_config_proto_rawDesc = nil
+	file_proto_pbconfig_config_proto_goTypes = nil
+	file_proto_pbconfig_config_proto_depIdxs = nil
 }
diff --git a/proto/pbconnect/connect.pb.go b/proto/pbconnect/connect.pb.go
index 97ce17def..4197003bc 100644
--- a/proto/pbconnect/connect.pb.go
+++ b/proto/pbconnect/connect.pb.go
@@ -1,26 +1,31 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbconnect/connect.proto
 
 package pbconnect
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	timestamp "github.com/golang/protobuf/ptypes/timestamp"
 	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	timestamppb "google.golang.org/protobuf/types/known/timestamppb"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // CARoots is the list of all currently trusted CA Roots.
 //
@@ -30,6 +35,10 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 // output=connect.gen.go
 // name=StructsIndexedCARoots
 type CARoots struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// ActiveRootID is the ID of a root in Roots that is the active CA root.
 	// Other roots are still valid if they're in the Roots list but are in
 	// the process of being rotated out.
@@ -62,61 +71,65 @@ type CARoots struct {
 	// QueryMeta here is mainly used to contain the latest Raft Index that could
 	// be used to perform a blocking query.
 	// mog: func-to=QueryMetaTo func-from=QueryMetaFrom
-	QueryMeta            *pbcommon.QueryMeta `protobuf:"bytes,4,opt,name=QueryMeta,proto3" json:"QueryMeta,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
+	QueryMeta *pbcommon.QueryMeta `protobuf:"bytes,4,opt,name=QueryMeta,proto3" json:"QueryMeta,omitempty"`
 }
 
-func (m *CARoots) Reset()         { *m = CARoots{} }
-func (m *CARoots) String() string { return proto.CompactTextString(m) }
-func (*CARoots) ProtoMessage()    {}
+func (x *CARoots) Reset() {
+	*x = CARoots{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconnect_connect_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CARoots) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CARoots) ProtoMessage() {}
+
+func (x *CARoots) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconnect_connect_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CARoots.ProtoReflect.Descriptor instead.
 func (*CARoots) Descriptor() ([]byte, []int) {
-	return fileDescriptor_80627e709958eb04, []int{0}
+	return file_proto_pbconnect_connect_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *CARoots) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CARoots.Unmarshal(m, b)
-}
-func (m *CARoots) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CARoots.Marshal(b, m, deterministic)
-}
-func (m *CARoots) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CARoots.Merge(m, src)
-}
-func (m *CARoots) XXX_Size() int {
-	return xxx_messageInfo_CARoots.Size(m)
-}
-func (m *CARoots) XXX_DiscardUnknown() {
-	xxx_messageInfo_CARoots.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_CARoots proto.InternalMessageInfo
-
-func (m *CARoots) GetActiveRootID() string {
-	if m != nil {
-		return m.ActiveRootID
+func (x *CARoots) GetActiveRootID() string {
+	if x != nil {
+		return x.ActiveRootID
 	}
 	return ""
 }
 
-func (m *CARoots) GetTrustDomain() string {
-	if m != nil {
-		return m.TrustDomain
+func (x *CARoots) GetTrustDomain() string {
+	if x != nil {
+		return x.TrustDomain
 	}
 	return ""
 }
 
-func (m *CARoots) GetRoots() []*CARoot {
-	if m != nil {
-		return m.Roots
+func (x *CARoots) GetRoots() []*CARoot {
+	if x != nil {
+		return x.Roots
 	}
 	return nil
 }
 
-func (m *CARoots) GetQueryMeta() *pbcommon.QueryMeta {
-	if m != nil {
-		return m.QueryMeta
+func (x *CARoots) GetQueryMeta() *pbcommon.QueryMeta {
+	if x != nil {
+		return x.QueryMeta
 	}
 	return nil
 }
@@ -129,6 +142,10 @@ func (m *CARoots) GetQueryMeta() *pbcommon.QueryMeta {
 // output=connect.gen.go
 // name=StructsCARoot
 type CARoot struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// ID is a globally unique ID (UUID) representing this CA root.
 	ID string `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	// Name is a human-friendly name for this CA root. This value is
@@ -151,9 +168,9 @@ type CARoot struct {
 	ExternalTrustDomain string `protobuf:"bytes,5,opt,name=ExternalTrustDomain,proto3" json:"ExternalTrustDomain,omitempty"`
 	// Time validity bounds.
 	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	NotBefore *timestamp.Timestamp `protobuf:"bytes,6,opt,name=NotBefore,proto3" json:"NotBefore,omitempty"`
+	NotBefore *timestamppb.Timestamp `protobuf:"bytes,6,opt,name=NotBefore,proto3" json:"NotBefore,omitempty"`
 	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	NotAfter *timestamp.Timestamp `protobuf:"bytes,7,opt,name=NotAfter,proto3" json:"NotAfter,omitempty"`
+	NotAfter *timestamppb.Timestamp `protobuf:"bytes,7,opt,name=NotAfter,proto3" json:"NotAfter,omitempty"`
 	// RootCert is the PEM-encoded public certificate.
 	RootCert string `protobuf:"bytes,8,opt,name=RootCert,proto3" json:"RootCert,omitempty"`
 	// IntermediateCerts is a list of PEM-encoded intermediate certs to
@@ -173,7 +190,7 @@ type CARoot struct {
 	// This will only be set on roots that have been rotated out from being the
 	// active root.
 	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	RotatedOutAt *timestamp.Timestamp `protobuf:"bytes,13,opt,name=RotatedOutAt,proto3" json:"RotatedOutAt,omitempty"`
+	RotatedOutAt *timestamppb.Timestamp `protobuf:"bytes,13,opt,name=RotatedOutAt,proto3" json:"RotatedOutAt,omitempty"`
 	// PrivateKeyType is the type of the private key used to sign certificates. It
 	// may be "rsa" or "ec". This is provided as a convenience to avoid parsing
 	// the public key to from the certificate to infer the type.
@@ -184,145 +201,149 @@ type CARoot struct {
 	// mog: func-to=int func-from=int32
 	PrivateKeyBits int32 `protobuf:"varint,15,opt,name=PrivateKeyBits,proto3" json:"PrivateKeyBits,omitempty"`
 	// mog: func-to=RaftIndexTo func-from=RaftIndexFrom
-	RaftIndex            *pbcommon.RaftIndex `protobuf:"bytes,16,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,16,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
 }
 
-func (m *CARoot) Reset()         { *m = CARoot{} }
-func (m *CARoot) String() string { return proto.CompactTextString(m) }
-func (*CARoot) ProtoMessage()    {}
+func (x *CARoot) Reset() {
+	*x = CARoot{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconnect_connect_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CARoot) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CARoot) ProtoMessage() {}
+
+func (x *CARoot) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconnect_connect_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CARoot.ProtoReflect.Descriptor instead.
 func (*CARoot) Descriptor() ([]byte, []int) {
-	return fileDescriptor_80627e709958eb04, []int{1}
+	return file_proto_pbconnect_connect_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *CARoot) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CARoot.Unmarshal(m, b)
-}
-func (m *CARoot) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CARoot.Marshal(b, m, deterministic)
-}
-func (m *CARoot) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CARoot.Merge(m, src)
-}
-func (m *CARoot) XXX_Size() int {
-	return xxx_messageInfo_CARoot.Size(m)
-}
-func (m *CARoot) XXX_DiscardUnknown() {
-	xxx_messageInfo_CARoot.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_CARoot proto.InternalMessageInfo
-
-func (m *CARoot) GetID() string {
-	if m != nil {
-		return m.ID
+func (x *CARoot) GetID() string {
+	if x != nil {
+		return x.ID
 	}
 	return ""
 }
 
-func (m *CARoot) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *CARoot) GetName() string {
+	if x != nil {
+		return x.Name
 	}
 	return ""
 }
 
-func (m *CARoot) GetSerialNumber() uint64 {
-	if m != nil {
-		return m.SerialNumber
+func (x *CARoot) GetSerialNumber() uint64 {
+	if x != nil {
+		return x.SerialNumber
 	}
 	return 0
 }
 
-func (m *CARoot) GetSigningKeyID() string {
-	if m != nil {
-		return m.SigningKeyID
+func (x *CARoot) GetSigningKeyID() string {
+	if x != nil {
+		return x.SigningKeyID
 	}
 	return ""
 }
 
-func (m *CARoot) GetExternalTrustDomain() string {
-	if m != nil {
-		return m.ExternalTrustDomain
+func (x *CARoot) GetExternalTrustDomain() string {
+	if x != nil {
+		return x.ExternalTrustDomain
 	}
 	return ""
 }
 
-func (m *CARoot) GetNotBefore() *timestamp.Timestamp {
-	if m != nil {
-		return m.NotBefore
+func (x *CARoot) GetNotBefore() *timestamppb.Timestamp {
+	if x != nil {
+		return x.NotBefore
 	}
 	return nil
 }
 
-func (m *CARoot) GetNotAfter() *timestamp.Timestamp {
-	if m != nil {
-		return m.NotAfter
+func (x *CARoot) GetNotAfter() *timestamppb.Timestamp {
+	if x != nil {
+		return x.NotAfter
 	}
 	return nil
 }
 
-func (m *CARoot) GetRootCert() string {
-	if m != nil {
-		return m.RootCert
+func (x *CARoot) GetRootCert() string {
+	if x != nil {
+		return x.RootCert
 	}
 	return ""
 }
 
-func (m *CARoot) GetIntermediateCerts() []string {
-	if m != nil {
-		return m.IntermediateCerts
+func (x *CARoot) GetIntermediateCerts() []string {
+	if x != nil {
+		return x.IntermediateCerts
 	}
 	return nil
 }
 
-func (m *CARoot) GetSigningCert() string {
-	if m != nil {
-		return m.SigningCert
+func (x *CARoot) GetSigningCert() string {
+	if x != nil {
+		return x.SigningCert
 	}
 	return ""
 }
 
-func (m *CARoot) GetSigningKey() string {
-	if m != nil {
-		return m.SigningKey
+func (x *CARoot) GetSigningKey() string {
+	if x != nil {
+		return x.SigningKey
 	}
 	return ""
 }
 
-func (m *CARoot) GetActive() bool {
-	if m != nil {
-		return m.Active
+func (x *CARoot) GetActive() bool {
+	if x != nil {
+		return x.Active
 	}
 	return false
 }
 
-func (m *CARoot) GetRotatedOutAt() *timestamp.Timestamp {
-	if m != nil {
-		return m.RotatedOutAt
+func (x *CARoot) GetRotatedOutAt() *timestamppb.Timestamp {
+	if x != nil {
+		return x.RotatedOutAt
 	}
 	return nil
 }
 
-func (m *CARoot) GetPrivateKeyType() string {
-	if m != nil {
-		return m.PrivateKeyType
+func (x *CARoot) GetPrivateKeyType() string {
+	if x != nil {
+		return x.PrivateKeyType
 	}
 	return ""
 }
 
-func (m *CARoot) GetPrivateKeyBits() int32 {
-	if m != nil {
-		return m.PrivateKeyBits
+func (x *CARoot) GetPrivateKeyBits() int32 {
+	if x != nil {
+		return x.PrivateKeyBits
 	}
 	return 0
 }
 
-func (m *CARoot) GetRaftIndex() *pbcommon.RaftIndex {
-	if m != nil {
-		return m.RaftIndex
+func (x *CARoot) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
 	}
 	return nil
 }
@@ -336,6 +357,10 @@ func (m *CARoot) GetRaftIndex() *pbcommon.RaftIndex {
 // output=connect.gen.go
 // name=StructsIssuedCert
 type IssuedCert struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// SerialNumber is the unique serial number for this certificate.
 	// This is encoded in standard hex separated by :.
 	SerialNumber string `protobuf:"bytes,1,opt,name=SerialNumber,proto3" json:"SerialNumber,omitempty"`
@@ -355,171 +380,319 @@ type IssuedCert struct {
 	// ValidAfter and ValidBefore are the validity periods for the
 	// certificate.
 	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	ValidAfter *timestamp.Timestamp `protobuf:"bytes,8,opt,name=ValidAfter,proto3" json:"ValidAfter,omitempty"`
+	ValidAfter *timestamppb.Timestamp `protobuf:"bytes,8,opt,name=ValidAfter,proto3" json:"ValidAfter,omitempty"`
 	// mog: func-to=structs.TimeFromProto func-from=structs.TimeToProto
-	ValidBefore *timestamp.Timestamp `protobuf:"bytes,9,opt,name=ValidBefore,proto3" json:"ValidBefore,omitempty"`
+	ValidBefore *timestamppb.Timestamp `protobuf:"bytes,9,opt,name=ValidBefore,proto3" json:"ValidBefore,omitempty"`
 	// EnterpriseMeta is the Consul Enterprise specific metadata
 	// mog: func-to=EnterpriseMetaTo func-from=EnterpriseMetaFrom
 	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,10,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
 	// mog: func-to=RaftIndexTo func-from=RaftIndexFrom
-	RaftIndex            *pbcommon.RaftIndex `protobuf:"bytes,11,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,11,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
 }
 
-func (m *IssuedCert) Reset()         { *m = IssuedCert{} }
-func (m *IssuedCert) String() string { return proto.CompactTextString(m) }
-func (*IssuedCert) ProtoMessage()    {}
+func (x *IssuedCert) Reset() {
+	*x = IssuedCert{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbconnect_connect_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *IssuedCert) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*IssuedCert) ProtoMessage() {}
+
+func (x *IssuedCert) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbconnect_connect_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use IssuedCert.ProtoReflect.Descriptor instead.
 func (*IssuedCert) Descriptor() ([]byte, []int) {
-	return fileDescriptor_80627e709958eb04, []int{2}
+	return file_proto_pbconnect_connect_proto_rawDescGZIP(), []int{2}
 }
 
-func (m *IssuedCert) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_IssuedCert.Unmarshal(m, b)
-}
-func (m *IssuedCert) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_IssuedCert.Marshal(b, m, deterministic)
-}
-func (m *IssuedCert) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_IssuedCert.Merge(m, src)
-}
-func (m *IssuedCert) XXX_Size() int {
-	return xxx_messageInfo_IssuedCert.Size(m)
-}
-func (m *IssuedCert) XXX_DiscardUnknown() {
-	xxx_messageInfo_IssuedCert.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_IssuedCert proto.InternalMessageInfo
-
-func (m *IssuedCert) GetSerialNumber() string {
-	if m != nil {
-		return m.SerialNumber
+func (x *IssuedCert) GetSerialNumber() string {
+	if x != nil {
+		return x.SerialNumber
 	}
 	return ""
 }
 
-func (m *IssuedCert) GetCertPEM() string {
-	if m != nil {
-		return m.CertPEM
+func (x *IssuedCert) GetCertPEM() string {
+	if x != nil {
+		return x.CertPEM
 	}
 	return ""
 }
 
-func (m *IssuedCert) GetPrivateKeyPEM() string {
-	if m != nil {
-		return m.PrivateKeyPEM
+func (x *IssuedCert) GetPrivateKeyPEM() string {
+	if x != nil {
+		return x.PrivateKeyPEM
 	}
 	return ""
 }
 
-func (m *IssuedCert) GetService() string {
-	if m != nil {
-		return m.Service
+func (x *IssuedCert) GetService() string {
+	if x != nil {
+		return x.Service
 	}
 	return ""
 }
 
-func (m *IssuedCert) GetServiceURI() string {
-	if m != nil {
-		return m.ServiceURI
+func (x *IssuedCert) GetServiceURI() string {
+	if x != nil {
+		return x.ServiceURI
 	}
 	return ""
 }
 
-func (m *IssuedCert) GetAgent() string {
-	if m != nil {
-		return m.Agent
+func (x *IssuedCert) GetAgent() string {
+	if x != nil {
+		return x.Agent
 	}
 	return ""
 }
 
-func (m *IssuedCert) GetAgentURI() string {
-	if m != nil {
-		return m.AgentURI
+func (x *IssuedCert) GetAgentURI() string {
+	if x != nil {
+		return x.AgentURI
 	}
 	return ""
 }
 
-func (m *IssuedCert) GetValidAfter() *timestamp.Timestamp {
-	if m != nil {
-		return m.ValidAfter
+func (x *IssuedCert) GetValidAfter() *timestamppb.Timestamp {
+	if x != nil {
+		return x.ValidAfter
 	}
 	return nil
 }
 
-func (m *IssuedCert) GetValidBefore() *timestamp.Timestamp {
-	if m != nil {
-		return m.ValidBefore
+func (x *IssuedCert) GetValidBefore() *timestamppb.Timestamp {
+	if x != nil {
+		return x.ValidBefore
 	}
 	return nil
 }
 
-func (m *IssuedCert) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if m != nil {
-		return m.EnterpriseMeta
+func (x *IssuedCert) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
 	}
 	return nil
 }
 
-func (m *IssuedCert) GetRaftIndex() *pbcommon.RaftIndex {
-	if m != nil {
-		return m.RaftIndex
+func (x *IssuedCert) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
 	}
 	return nil
 }
 
-func init() {
-	proto.RegisterType((*CARoots)(nil), "connect.CARoots")
-	proto.RegisterType((*CARoot)(nil), "connect.CARoot")
-	proto.RegisterType((*IssuedCert)(nil), "connect.IssuedCert")
+var File_proto_pbconnect_connect_proto protoreflect.FileDescriptor
+
+var file_proto_pbconnect_connect_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x2f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x07, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x1a, 0x1f, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74,
+	0x61, 0x6d, 0x70, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xa7, 0x01, 0x0a, 0x07, 0x43, 0x41, 0x52, 0x6f, 0x6f,
+	0x74, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x52, 0x6f, 0x6f, 0x74,
+	0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65,
+	0x52, 0x6f, 0x6f, 0x74, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44,
+	0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x54, 0x72, 0x75,
+	0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x25, 0x0a, 0x05, 0x52, 0x6f, 0x6f, 0x74,
+	0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x2e, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x52, 0x05, 0x52, 0x6f, 0x6f, 0x74, 0x73, 0x12,
+	0x2f, 0x0a, 0x09, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x51, 0x75, 0x65, 0x72,
+	0x79, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x09, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4d, 0x65, 0x74, 0x61,
+	0x22, 0xfd, 0x04, 0x0a, 0x06, 0x43, 0x41, 0x52, 0x6f, 0x6f, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x49,
+	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e,
+	0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12,
+	0x22, 0x0a, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+	0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65,
+	0x79, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69,
+	0x6e, 0x67, 0x4b, 0x65, 0x79, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x13, 0x45, 0x78, 0x74, 0x65, 0x72,
+	0x6e, 0x61, 0x6c, 0x54, 0x72, 0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x45, 0x78, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x54, 0x72,
+	0x75, 0x73, 0x74, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x38, 0x0a, 0x09, 0x4e, 0x6f, 0x74,
+	0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67,
+	0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54,
+	0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x4e, 0x6f, 0x74, 0x42, 0x65, 0x66,
+	0x6f, 0x72, 0x65, 0x12, 0x36, 0x0a, 0x08, 0x4e, 0x6f, 0x74, 0x41, 0x66, 0x74, 0x65, 0x72, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x52, 0x08, 0x4e, 0x6f, 0x74, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x52,
+	0x6f, 0x6f, 0x74, 0x43, 0x65, 0x72, 0x74, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x52,
+	0x6f, 0x6f, 0x74, 0x43, 0x65, 0x72, 0x74, 0x12, 0x2c, 0x0a, 0x11, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65, 0x43, 0x65, 0x72, 0x74, 0x73, 0x18, 0x09, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x11, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x74, 0x65,
+	0x43, 0x65, 0x72, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67,
+	0x43, 0x65, 0x72, 0x74, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x69, 0x67, 0x6e,
+	0x69, 0x6e, 0x67, 0x43, 0x65, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x69, 0x67, 0x6e, 0x69,
+	0x6e, 0x67, 0x4b, 0x65, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x69, 0x67,
+	0x6e, 0x69, 0x6e, 0x67, 0x4b, 0x65, 0x79, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x76,
+	0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x76, 0x65, 0x12,
+	0x3e, 0x0a, 0x0c, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x75, 0x74, 0x41, 0x74, 0x18,
+	0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x52, 0x0c, 0x52, 0x6f, 0x74, 0x61, 0x74, 0x65, 0x64, 0x4f, 0x75, 0x74, 0x41, 0x74, 0x12,
+	0x26, 0x0a, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x54, 0x79, 0x70,
+	0x65, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65,
+	0x4b, 0x65, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x26, 0x0a, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x61,
+	0x74, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x69, 0x74, 0x73, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x0e, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x42, 0x69, 0x74, 0x73, 0x12,
+	0x2f, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x10, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78,
+	0x22, 0xc7, 0x03, 0x0a, 0x0a, 0x49, 0x73, 0x73, 0x75, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x12,
+	0x22, 0x0a, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x53, 0x65, 0x72, 0x69, 0x61, 0x6c, 0x4e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x65, 0x72, 0x74, 0x50, 0x45, 0x4d, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x43, 0x65, 0x72, 0x74, 0x50, 0x45, 0x4d, 0x12, 0x24, 0x0a,
+	0x0d, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x50, 0x45, 0x4d, 0x18, 0x03,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x50, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79,
+	0x50, 0x45, 0x4d, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x1e, 0x0a,
+	0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x55, 0x52, 0x49, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0a, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x55, 0x52, 0x49, 0x12, 0x14, 0x0a,
+	0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x41, 0x67,
+	0x65, 0x6e, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x52, 0x49, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x55, 0x52, 0x49, 0x12,
+	0x3a, 0x0a, 0x0a, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x66, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52,
+	0x0a, 0x56, 0x61, 0x6c, 0x69, 0x64, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x0b, 0x56,
+	0x61, 0x6c, 0x69, 0x64, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0b, 0x56, 0x61,
+	0x6c, 0x69, 0x64, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x12, 0x3e, 0x0a, 0x0e, 0x45, 0x6e, 0x74,
+	0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x0a, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x16, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72,
+	0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72,
+	0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x2f, 0x0a, 0x09, 0x52, 0x61, 0x66,
+	0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52,
+	0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69,
+	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f,
+	0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x70, 0x62, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbconnect/connect.proto", fileDescriptor_80627e709958eb04)
+var (
+	file_proto_pbconnect_connect_proto_rawDescOnce sync.Once
+	file_proto_pbconnect_connect_proto_rawDescData = file_proto_pbconnect_connect_proto_rawDesc
+)
+
+func file_proto_pbconnect_connect_proto_rawDescGZIP() []byte {
+	file_proto_pbconnect_connect_proto_rawDescOnce.Do(func() {
+		file_proto_pbconnect_connect_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbconnect_connect_proto_rawDescData)
+	})
+	return file_proto_pbconnect_connect_proto_rawDescData
 }
 
-var fileDescriptor_80627e709958eb04 = []byte{
-	// 632 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x54, 0x5d, 0x6f, 0xd3, 0x30,
-	0x14, 0x55, 0xd7, 0xcf, 0xdc, 0x6e, 0x1d, 0x33, 0x68, 0xb2, 0x8a, 0x80, 0xa8, 0x02, 0x14, 0x09,
-	0x68, 0xd0, 0x90, 0x10, 0x42, 0x68, 0x52, 0xb7, 0xee, 0x21, 0x9a, 0x56, 0x86, 0x37, 0x78, 0xe0,
-	0x2d, 0x6d, 0x6f, 0x3b, 0x4b, 0x4d, 0x5c, 0x39, 0xce, 0xb4, 0xfe, 0x22, 0x7e, 0x0a, 0xbf, 0x0a,
-	0x09, 0xd9, 0x4e, 0xda, 0xa4, 0x20, 0xf5, 0x29, 0xbe, 0xe7, 0x1e, 0x5f, 0xdf, 0xeb, 0x73, 0x62,
-	0x78, 0xb6, 0x94, 0x42, 0x09, 0x7f, 0x39, 0x9e, 0x88, 0x38, 0xc6, 0x89, 0xf2, 0xb3, 0x6f, 0xdf,
-	0xe0, 0xa4, 0x99, 0x85, 0xdd, 0x17, 0x73, 0x21, 0xe6, 0x0b, 0xf4, 0x0d, 0x3c, 0x4e, 0x67, 0xbe,
-	0xe2, 0x11, 0x26, 0x2a, 0x8c, 0x96, 0x96, 0xd9, 0x7d, 0xba, 0x29, 0x14, 0x45, 0x22, 0xf6, 0xed,
-	0xc7, 0x26, 0x7b, 0xbf, 0x2a, 0xd0, 0x3c, 0x1f, 0x30, 0x21, 0x54, 0x42, 0x7a, 0xb0, 0x3f, 0x98,
-	0x28, 0x7e, 0x8f, 0x3a, 0x0c, 0x86, 0xb4, 0xe2, 0x56, 0x3c, 0x87, 0x95, 0x30, 0xe2, 0x42, 0xfb,
-	0x56, 0xa6, 0x89, 0x1a, 0x8a, 0x28, 0xe4, 0x31, 0xdd, 0x33, 0x94, 0x22, 0x44, 0x5e, 0x41, 0xdd,
-	0x94, 0xa3, 0x55, 0xb7, 0xea, 0xb5, 0x4f, 0x0e, 0xfb, 0x79, 0xdf, 0xf6, 0x18, 0x66, 0xb3, 0xc4,
-	0x07, 0xe7, 0x5b, 0x8a, 0x72, 0x75, 0x85, 0x2a, 0xa4, 0x35, 0xb7, 0xe2, 0xb5, 0x4f, 0x8e, 0xfa,
-	0x59, 0x6b, 0xeb, 0x04, 0xdb, 0x70, 0x7a, 0x7f, 0x6a, 0xd0, 0xb0, 0x25, 0x48, 0x07, 0xf6, 0xd6,
-	0xed, 0xed, 0x05, 0x43, 0x42, 0xa0, 0x36, 0x0a, 0x23, 0xcc, 0xba, 0x31, 0x6b, 0x3d, 0xcc, 0x0d,
-	0x4a, 0x1e, 0x2e, 0x46, 0x69, 0x34, 0x46, 0x49, 0xab, 0x6e, 0xc5, 0xab, 0xb1, 0x12, 0x66, 0x38,
-	0x7c, 0x1e, 0xf3, 0x78, 0x7e, 0x89, 0xab, 0x60, 0x68, 0xda, 0x70, 0x58, 0x09, 0x23, 0xef, 0xe1,
-	0xf1, 0xc5, 0x83, 0x42, 0x19, 0x87, 0x8b, 0xe2, 0xe0, 0x75, 0x43, 0xfd, 0x5f, 0x8a, 0x7c, 0x02,
-	0x67, 0x24, 0xd4, 0x19, 0xce, 0x84, 0x44, 0xda, 0x30, 0x93, 0x75, 0xfb, 0x56, 0xa4, 0x7e, 0x2e,
-	0x52, 0xff, 0x36, 0x17, 0x89, 0x6d, 0xc8, 0xe4, 0x23, 0xb4, 0x46, 0x42, 0x0d, 0x66, 0x0a, 0x25,
-	0x6d, 0xee, 0xdc, 0xb8, 0xe6, 0x92, 0x2e, 0xb4, 0xf4, 0xbd, 0x9c, 0xa3, 0x54, 0xb4, 0x65, 0x1a,
-	0x5b, 0xc7, 0xe4, 0x2d, 0x1c, 0x05, 0xb1, 0x42, 0x19, 0xe1, 0x94, 0x87, 0x0a, 0x35, 0x96, 0x50,
-	0xc7, 0xad, 0x7a, 0x0e, 0xfb, 0x37, 0xa1, 0xe5, 0xcd, 0xa6, 0x37, 0xc5, 0xc0, 0xca, 0x5b, 0x80,
-	0xc8, 0x73, 0x80, 0xcd, 0xfd, 0xd0, 0xb6, 0x21, 0x14, 0x10, 0x72, 0x0c, 0x0d, 0x6b, 0x18, 0xba,
-	0xef, 0x56, 0xbc, 0x16, 0xcb, 0x22, 0x72, 0x0a, 0xfb, 0x4c, 0xa8, 0x50, 0xe1, 0xf4, 0x6b, 0xaa,
-	0x06, 0x8a, 0x1e, 0xec, 0x9c, 0xaf, 0xc4, 0x27, 0xaf, 0xa1, 0x73, 0x2d, 0xf9, 0x7d, 0xa8, 0xf0,
-	0x12, 0x57, 0xb7, 0xab, 0x25, 0xd2, 0x8e, 0x39, 0x7b, 0x0b, 0x2d, 0xf3, 0xce, 0xb8, 0x4a, 0xe8,
-	0xa1, 0x5b, 0xf1, 0xea, 0x6c, 0x0b, 0xd5, 0xfe, 0x63, 0xe1, 0x4c, 0x05, 0xf1, 0x14, 0x1f, 0xe8,
-	0xa3, 0xb2, 0xff, 0xd6, 0x09, 0xb6, 0xe1, 0xf4, 0x7e, 0x57, 0x01, 0x82, 0x24, 0x49, 0x71, 0x6a,
-	0xee, 0x61, 0xdb, 0x5f, 0xd9, 0xcf, 0x52, 0xf2, 0x17, 0x85, 0xa6, 0xe6, 0x5e, 0x5f, 0x5c, 0x65,
-	0xd6, 0xcc, 0x43, 0xf2, 0x12, 0x0e, 0x36, 0xfd, 0xe8, 0x7c, 0xd5, 0xe4, 0xcb, 0xa0, 0xde, 0x7f,
-	0x83, 0xf2, 0x9e, 0x4f, 0x30, 0xb3, 0x66, 0x1e, 0x1a, 0x15, 0xec, 0xf2, 0x3b, 0x0b, 0x32, 0x33,
-	0x16, 0x10, 0xf2, 0x04, 0xea, 0x83, 0x39, 0xc6, 0xca, 0xf8, 0xcf, 0x61, 0x36, 0xd0, 0x3e, 0x31,
-	0x0b, 0xbd, 0xa7, 0x69, 0x7d, 0x92, 0xc7, 0xe4, 0x33, 0xc0, 0x8f, 0x70, 0xc1, 0xa7, 0xd6, 0x7d,
-	0xad, 0x9d, 0xea, 0x14, 0xd8, 0xe4, 0x0b, 0xb4, 0x4d, 0x94, 0x79, 0xde, 0xd9, 0xb9, 0xb9, 0x48,
-	0x27, 0xa7, 0xd0, 0xb9, 0xd0, 0x46, 0x5c, 0x4a, 0x9e, 0xa0, 0x79, 0x0e, 0xc0, 0x14, 0x38, 0xce,
-	0xe5, 0x28, 0x67, 0xd9, 0x16, 0xbb, 0xac, 0x64, 0x7b, 0xb7, 0x92, 0x67, 0xef, 0x7e, 0xbe, 0x99,
-	0x73, 0x75, 0x97, 0x8e, 0x35, 0xcb, 0xbf, 0x0b, 0x93, 0x3b, 0x3e, 0x11, 0x72, 0xa9, 0x1f, 0xd8,
-	0x24, 0x5d, 0xf8, 0x5b, 0xef, 0xee, 0xb8, 0x61, 0x80, 0x0f, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff,
-	0x77, 0x18, 0x20, 0xcd, 0x91, 0x05, 0x00, 0x00,
+var file_proto_pbconnect_connect_proto_msgTypes = make([]protoimpl.MessageInfo, 3)
+var file_proto_pbconnect_connect_proto_goTypes = []interface{}{
+	(*CARoots)(nil),                 // 0: connect.CARoots
+	(*CARoot)(nil),                  // 1: connect.CARoot
+	(*IssuedCert)(nil),              // 2: connect.IssuedCert
+	(*pbcommon.QueryMeta)(nil),      // 3: common.QueryMeta
+	(*timestamppb.Timestamp)(nil),   // 4: google.protobuf.Timestamp
+	(*pbcommon.RaftIndex)(nil),      // 5: common.RaftIndex
+	(*pbcommon.EnterpriseMeta)(nil), // 6: common.EnterpriseMeta
+}
+var file_proto_pbconnect_connect_proto_depIdxs = []int32{
+	1,  // 0: connect.CARoots.Roots:type_name -> connect.CARoot
+	3,  // 1: connect.CARoots.QueryMeta:type_name -> common.QueryMeta
+	4,  // 2: connect.CARoot.NotBefore:type_name -> google.protobuf.Timestamp
+	4,  // 3: connect.CARoot.NotAfter:type_name -> google.protobuf.Timestamp
+	4,  // 4: connect.CARoot.RotatedOutAt:type_name -> google.protobuf.Timestamp
+	5,  // 5: connect.CARoot.RaftIndex:type_name -> common.RaftIndex
+	4,  // 6: connect.IssuedCert.ValidAfter:type_name -> google.protobuf.Timestamp
+	4,  // 7: connect.IssuedCert.ValidBefore:type_name -> google.protobuf.Timestamp
+	6,  // 8: connect.IssuedCert.EnterpriseMeta:type_name -> common.EnterpriseMeta
+	5,  // 9: connect.IssuedCert.RaftIndex:type_name -> common.RaftIndex
+	10, // [10:10] is the sub-list for method output_type
+	10, // [10:10] is the sub-list for method input_type
+	10, // [10:10] is the sub-list for extension type_name
+	10, // [10:10] is the sub-list for extension extendee
+	0,  // [0:10] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbconnect_connect_proto_init() }
+func file_proto_pbconnect_connect_proto_init() {
+	if File_proto_pbconnect_connect_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbconnect_connect_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CARoots); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconnect_connect_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CARoot); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbconnect_connect_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*IssuedCert); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbconnect_connect_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   3,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbconnect_connect_proto_goTypes,
+		DependencyIndexes: file_proto_pbconnect_connect_proto_depIdxs,
+		MessageInfos:      file_proto_pbconnect_connect_proto_msgTypes,
+	}.Build()
+	File_proto_pbconnect_connect_proto = out.File
+	file_proto_pbconnect_connect_proto_rawDesc = nil
+	file_proto_pbconnect_connect_proto_goTypes = nil
+	file_proto_pbconnect_connect_proto_depIdxs = nil
 }
diff --git a/proto/pbservice/healthcheck.pb.go b/proto/pbservice/healthcheck.pb.go
index 3f5fe637b..a0dbe715c 100644
--- a/proto/pbservice/healthcheck.pb.go
+++ b/proto/pbservice/healthcheck.pb.go
@@ -1,26 +1,31 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbservice/healthcheck.proto
 
 package pbservice
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	duration "github.com/golang/protobuf/ptypes/duration"
 	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	durationpb "google.golang.org/protobuf/types/known/durationpb"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // HealthCheck represents a single check on a given node
 //
@@ -30,203 +35,219 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 // output=healthcheck.gen.go
 // name=Structs
 type HealthCheck struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	Node string `protobuf:"bytes,1,opt,name=Node,proto3" json:"Node,omitempty"`
 	// mog: func-to=CheckIDType func-from=string
 	CheckID     string                 `protobuf:"bytes,2,opt,name=CheckID,proto3" json:"CheckID,omitempty"`
 	Name        string                 `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"`
-	Status      string                 `protobuf:"bytes,4,opt,name=Status,proto3" json:"Status,omitempty"`
-	Notes       string                 `protobuf:"bytes,5,opt,name=Notes,proto3" json:"Notes,omitempty"`
-	Output      string                 `protobuf:"bytes,6,opt,name=Output,proto3" json:"Output,omitempty"`
-	ServiceID   string                 `protobuf:"bytes,7,opt,name=ServiceID,proto3" json:"ServiceID,omitempty"`
-	ServiceName string                 `protobuf:"bytes,8,opt,name=ServiceName,proto3" json:"ServiceName,omitempty"`
-	ServiceTags []string               `protobuf:"bytes,9,rep,name=ServiceTags,proto3" json:"ServiceTags,omitempty"`
-	Type        string                 `protobuf:"bytes,12,opt,name=Type,proto3" json:"Type,omitempty"`
+	Status      string                 `protobuf:"bytes,4,opt,name=Status,proto3" json:"Status,omitempty"`           // The current check status
+	Notes       string                 `protobuf:"bytes,5,opt,name=Notes,proto3" json:"Notes,omitempty"`             // Additional notes with the status
+	Output      string                 `protobuf:"bytes,6,opt,name=Output,proto3" json:"Output,omitempty"`           // Holds output of script runs
+	ServiceID   string                 `protobuf:"bytes,7,opt,name=ServiceID,proto3" json:"ServiceID,omitempty"`     // optional associated service
+	ServiceName string                 `protobuf:"bytes,8,opt,name=ServiceName,proto3" json:"ServiceName,omitempty"` // optional service name
+	ServiceTags []string               `protobuf:"bytes,9,rep,name=ServiceTags,proto3" json:"ServiceTags,omitempty"` // optional service tags
+	Type        string                 `protobuf:"bytes,12,opt,name=Type,proto3" json:"Type,omitempty"`              // Check type: http/ttl/tcp/etc
 	Definition  *HealthCheckDefinition `protobuf:"bytes,10,opt,name=Definition,proto3" json:"Definition,omitempty"`
 	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
 	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,11,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
 	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
 	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,13,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
 	// mog: func-to=int func-from=int32
-	ExposedPort          int32    `protobuf:"varint,14,opt,name=ExposedPort,proto3" json:"ExposedPort,omitempty"`
-	Interval             string   `protobuf:"bytes,15,opt,name=Interval,proto3" json:"Interval,omitempty"`
-	Timeout              string   `protobuf:"bytes,16,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	ExposedPort int32  `protobuf:"varint,14,opt,name=ExposedPort,proto3" json:"ExposedPort,omitempty"`
+	Interval    string `protobuf:"bytes,15,opt,name=Interval,proto3" json:"Interval,omitempty"`
+	Timeout     string `protobuf:"bytes,16,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
 }
 
-func (m *HealthCheck) Reset()         { *m = HealthCheck{} }
-func (m *HealthCheck) String() string { return proto.CompactTextString(m) }
-func (*HealthCheck) ProtoMessage()    {}
+func (x *HealthCheck) Reset() {
+	*x = HealthCheck{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HealthCheck) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HealthCheck) ProtoMessage() {}
+
+func (x *HealthCheck) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HealthCheck.ProtoReflect.Descriptor instead.
 func (*HealthCheck) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8a6f7448747c9fbe, []int{0}
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *HealthCheck) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_HealthCheck.Unmarshal(m, b)
-}
-func (m *HealthCheck) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_HealthCheck.Marshal(b, m, deterministic)
-}
-func (m *HealthCheck) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HealthCheck.Merge(m, src)
-}
-func (m *HealthCheck) XXX_Size() int {
-	return xxx_messageInfo_HealthCheck.Size(m)
-}
-func (m *HealthCheck) XXX_DiscardUnknown() {
-	xxx_messageInfo_HealthCheck.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_HealthCheck proto.InternalMessageInfo
-
-func (m *HealthCheck) GetNode() string {
-	if m != nil {
-		return m.Node
+func (x *HealthCheck) GetNode() string {
+	if x != nil {
+		return x.Node
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetCheckID() string {
-	if m != nil {
-		return m.CheckID
+func (x *HealthCheck) GetCheckID() string {
+	if x != nil {
+		return x.CheckID
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *HealthCheck) GetName() string {
+	if x != nil {
+		return x.Name
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetStatus() string {
-	if m != nil {
-		return m.Status
+func (x *HealthCheck) GetStatus() string {
+	if x != nil {
+		return x.Status
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetNotes() string {
-	if m != nil {
-		return m.Notes
+func (x *HealthCheck) GetNotes() string {
+	if x != nil {
+		return x.Notes
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetOutput() string {
-	if m != nil {
-		return m.Output
+func (x *HealthCheck) GetOutput() string {
+	if x != nil {
+		return x.Output
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetServiceID() string {
-	if m != nil {
-		return m.ServiceID
+func (x *HealthCheck) GetServiceID() string {
+	if x != nil {
+		return x.ServiceID
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetServiceName() string {
-	if m != nil {
-		return m.ServiceName
+func (x *HealthCheck) GetServiceName() string {
+	if x != nil {
+		return x.ServiceName
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetServiceTags() []string {
-	if m != nil {
-		return m.ServiceTags
+func (x *HealthCheck) GetServiceTags() []string {
+	if x != nil {
+		return x.ServiceTags
 	}
 	return nil
 }
 
-func (m *HealthCheck) GetType() string {
-	if m != nil {
-		return m.Type
+func (x *HealthCheck) GetType() string {
+	if x != nil {
+		return x.Type
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetDefinition() *HealthCheckDefinition {
-	if m != nil {
-		return m.Definition
+func (x *HealthCheck) GetDefinition() *HealthCheckDefinition {
+	if x != nil {
+		return x.Definition
 	}
 	return nil
 }
 
-func (m *HealthCheck) GetRaftIndex() *pbcommon.RaftIndex {
-	if m != nil {
-		return m.RaftIndex
+func (x *HealthCheck) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
 	}
 	return nil
 }
 
-func (m *HealthCheck) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if m != nil {
-		return m.EnterpriseMeta
+func (x *HealthCheck) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
 	}
 	return nil
 }
 
-func (m *HealthCheck) GetExposedPort() int32 {
-	if m != nil {
-		return m.ExposedPort
+func (x *HealthCheck) GetExposedPort() int32 {
+	if x != nil {
+		return x.ExposedPort
 	}
 	return 0
 }
 
-func (m *HealthCheck) GetInterval() string {
-	if m != nil {
-		return m.Interval
+func (x *HealthCheck) GetInterval() string {
+	if x != nil {
+		return x.Interval
 	}
 	return ""
 }
 
-func (m *HealthCheck) GetTimeout() string {
-	if m != nil {
-		return m.Timeout
+func (x *HealthCheck) GetTimeout() string {
+	if x != nil {
+		return x.Timeout
 	}
 	return ""
 }
 
 type HeaderValue struct {
-	Value                []string `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Value []string `protobuf:"bytes,1,rep,name=Value,proto3" json:"Value,omitempty"`
 }
 
-func (m *HeaderValue) Reset()         { *m = HeaderValue{} }
-func (m *HeaderValue) String() string { return proto.CompactTextString(m) }
-func (*HeaderValue) ProtoMessage()    {}
+func (x *HeaderValue) Reset() {
+	*x = HeaderValue{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HeaderValue) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HeaderValue) ProtoMessage() {}
+
+func (x *HeaderValue) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HeaderValue.ProtoReflect.Descriptor instead.
 func (*HeaderValue) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8a6f7448747c9fbe, []int{1}
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *HeaderValue) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_HeaderValue.Unmarshal(m, b)
-}
-func (m *HeaderValue) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_HeaderValue.Marshal(b, m, deterministic)
-}
-func (m *HeaderValue) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HeaderValue.Merge(m, src)
-}
-func (m *HeaderValue) XXX_Size() int {
-	return xxx_messageInfo_HeaderValue.Size(m)
-}
-func (m *HeaderValue) XXX_DiscardUnknown() {
-	xxx_messageInfo_HeaderValue.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_HeaderValue proto.InternalMessageInfo
-
-func (m *HeaderValue) GetValue() []string {
-	if m != nil {
-		return m.Value
+func (x *HeaderValue) GetValue() []string {
+	if x != nil {
+		return x.Value
 	}
 	return nil
 }
@@ -239,6 +260,10 @@ func (m *HeaderValue) GetValue() []string {
 // output=healthcheck.gen.go
 // name=Structs
 type HealthCheckDefinition struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	HTTP          string `protobuf:"bytes,1,opt,name=HTTP,proto3" json:"HTTP,omitempty"`
 	TLSServerName string `protobuf:"bytes,19,opt,name=TLSServerName,proto3" json:"TLSServerName,omitempty"`
 	TLSSkipVerify bool   `protobuf:"varint,2,opt,name=TLSSkipVerify,proto3" json:"TLSSkipVerify,omitempty"`
@@ -248,197 +273,201 @@ type HealthCheckDefinition struct {
 	Body   string                  `protobuf:"bytes,18,opt,name=Body,proto3" json:"Body,omitempty"`
 	TCP    string                  `protobuf:"bytes,5,opt,name=TCP,proto3" json:"TCP,omitempty"`
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Interval *duration.Duration `protobuf:"bytes,6,opt,name=Interval,proto3" json:"Interval,omitempty"`
+	Interval *durationpb.Duration `protobuf:"bytes,6,opt,name=Interval,proto3" json:"Interval,omitempty"`
 	// mog: func-to=uint func-from=uint32
 	OutputMaxSize uint32 `protobuf:"varint,9,opt,name=OutputMaxSize,proto3" json:"OutputMaxSize,omitempty"`
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Timeout *duration.Duration `protobuf:"bytes,7,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,7,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	DeregisterCriticalServiceAfter *duration.Duration `protobuf:"bytes,8,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
-	ScriptArgs                     []string           `protobuf:"bytes,10,rep,name=ScriptArgs,proto3" json:"ScriptArgs,omitempty"`
-	DockerContainerID              string             `protobuf:"bytes,11,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
-	Shell                          string             `protobuf:"bytes,12,opt,name=Shell,proto3" json:"Shell,omitempty"`
-	H2PING                         string             `protobuf:"bytes,20,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
-	H2PingUseTLS                   bool               `protobuf:"varint,21,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
-	GRPC                           string             `protobuf:"bytes,13,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
-	GRPCUseTLS                     bool               `protobuf:"varint,14,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
-	AliasNode                      string             `protobuf:"bytes,15,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
-	AliasService                   string             `protobuf:"bytes,16,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
+	DeregisterCriticalServiceAfter *durationpb.Duration `protobuf:"bytes,8,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
+	ScriptArgs                     []string             `protobuf:"bytes,10,rep,name=ScriptArgs,proto3" json:"ScriptArgs,omitempty"`
+	DockerContainerID              string               `protobuf:"bytes,11,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
+	Shell                          string               `protobuf:"bytes,12,opt,name=Shell,proto3" json:"Shell,omitempty"`
+	H2PING                         string               `protobuf:"bytes,20,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
+	H2PingUseTLS                   bool                 `protobuf:"varint,21,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
+	GRPC                           string               `protobuf:"bytes,13,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
+	GRPCUseTLS                     bool                 `protobuf:"varint,14,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
+	AliasNode                      string               `protobuf:"bytes,15,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
+	AliasService                   string               `protobuf:"bytes,16,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	TTL                  *duration.Duration `protobuf:"bytes,17,opt,name=TTL,proto3" json:"TTL,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
-	XXX_unrecognized     []byte             `json:"-"`
-	XXX_sizecache        int32              `json:"-"`
+	TTL *durationpb.Duration `protobuf:"bytes,17,opt,name=TTL,proto3" json:"TTL,omitempty"`
 }
 
-func (m *HealthCheckDefinition) Reset()         { *m = HealthCheckDefinition{} }
-func (m *HealthCheckDefinition) String() string { return proto.CompactTextString(m) }
-func (*HealthCheckDefinition) ProtoMessage()    {}
+func (x *HealthCheckDefinition) Reset() {
+	*x = HealthCheckDefinition{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *HealthCheckDefinition) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*HealthCheckDefinition) ProtoMessage() {}
+
+func (x *HealthCheckDefinition) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use HealthCheckDefinition.ProtoReflect.Descriptor instead.
 func (*HealthCheckDefinition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8a6f7448747c9fbe, []int{2}
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{2}
 }
 
-func (m *HealthCheckDefinition) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_HealthCheckDefinition.Unmarshal(m, b)
-}
-func (m *HealthCheckDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_HealthCheckDefinition.Marshal(b, m, deterministic)
-}
-func (m *HealthCheckDefinition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_HealthCheckDefinition.Merge(m, src)
-}
-func (m *HealthCheckDefinition) XXX_Size() int {
-	return xxx_messageInfo_HealthCheckDefinition.Size(m)
-}
-func (m *HealthCheckDefinition) XXX_DiscardUnknown() {
-	xxx_messageInfo_HealthCheckDefinition.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_HealthCheckDefinition proto.InternalMessageInfo
-
-func (m *HealthCheckDefinition) GetHTTP() string {
-	if m != nil {
-		return m.HTTP
+func (x *HealthCheckDefinition) GetHTTP() string {
+	if x != nil {
+		return x.HTTP
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetTLSServerName() string {
-	if m != nil {
-		return m.TLSServerName
+func (x *HealthCheckDefinition) GetTLSServerName() string {
+	if x != nil {
+		return x.TLSServerName
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetTLSSkipVerify() bool {
-	if m != nil {
-		return m.TLSSkipVerify
+func (x *HealthCheckDefinition) GetTLSSkipVerify() bool {
+	if x != nil {
+		return x.TLSSkipVerify
 	}
 	return false
 }
 
-func (m *HealthCheckDefinition) GetHeader() map[string]*HeaderValue {
-	if m != nil {
-		return m.Header
+func (x *HealthCheckDefinition) GetHeader() map[string]*HeaderValue {
+	if x != nil {
+		return x.Header
 	}
 	return nil
 }
 
-func (m *HealthCheckDefinition) GetMethod() string {
-	if m != nil {
-		return m.Method
+func (x *HealthCheckDefinition) GetMethod() string {
+	if x != nil {
+		return x.Method
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetBody() string {
-	if m != nil {
-		return m.Body
+func (x *HealthCheckDefinition) GetBody() string {
+	if x != nil {
+		return x.Body
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetTCP() string {
-	if m != nil {
-		return m.TCP
+func (x *HealthCheckDefinition) GetTCP() string {
+	if x != nil {
+		return x.TCP
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetInterval() *duration.Duration {
-	if m != nil {
-		return m.Interval
+func (x *HealthCheckDefinition) GetInterval() *durationpb.Duration {
+	if x != nil {
+		return x.Interval
 	}
 	return nil
 }
 
-func (m *HealthCheckDefinition) GetOutputMaxSize() uint32 {
-	if m != nil {
-		return m.OutputMaxSize
+func (x *HealthCheckDefinition) GetOutputMaxSize() uint32 {
+	if x != nil {
+		return x.OutputMaxSize
 	}
 	return 0
 }
 
-func (m *HealthCheckDefinition) GetTimeout() *duration.Duration {
-	if m != nil {
-		return m.Timeout
+func (x *HealthCheckDefinition) GetTimeout() *durationpb.Duration {
+	if x != nil {
+		return x.Timeout
 	}
 	return nil
 }
 
-func (m *HealthCheckDefinition) GetDeregisterCriticalServiceAfter() *duration.Duration {
-	if m != nil {
-		return m.DeregisterCriticalServiceAfter
+func (x *HealthCheckDefinition) GetDeregisterCriticalServiceAfter() *durationpb.Duration {
+	if x != nil {
+		return x.DeregisterCriticalServiceAfter
 	}
 	return nil
 }
 
-func (m *HealthCheckDefinition) GetScriptArgs() []string {
-	if m != nil {
-		return m.ScriptArgs
+func (x *HealthCheckDefinition) GetScriptArgs() []string {
+	if x != nil {
+		return x.ScriptArgs
 	}
 	return nil
 }
 
-func (m *HealthCheckDefinition) GetDockerContainerID() string {
-	if m != nil {
-		return m.DockerContainerID
+func (x *HealthCheckDefinition) GetDockerContainerID() string {
+	if x != nil {
+		return x.DockerContainerID
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetShell() string {
-	if m != nil {
-		return m.Shell
+func (x *HealthCheckDefinition) GetShell() string {
+	if x != nil {
+		return x.Shell
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetH2PING() string {
-	if m != nil {
-		return m.H2PING
+func (x *HealthCheckDefinition) GetH2PING() string {
+	if x != nil {
+		return x.H2PING
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetH2PingUseTLS() bool {
-	if m != nil {
-		return m.H2PingUseTLS
+func (x *HealthCheckDefinition) GetH2PingUseTLS() bool {
+	if x != nil {
+		return x.H2PingUseTLS
 	}
 	return false
 }
 
-func (m *HealthCheckDefinition) GetGRPC() string {
-	if m != nil {
-		return m.GRPC
+func (x *HealthCheckDefinition) GetGRPC() string {
+	if x != nil {
+		return x.GRPC
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetGRPCUseTLS() bool {
-	if m != nil {
-		return m.GRPCUseTLS
+func (x *HealthCheckDefinition) GetGRPCUseTLS() bool {
+	if x != nil {
+		return x.GRPCUseTLS
 	}
 	return false
 }
 
-func (m *HealthCheckDefinition) GetAliasNode() string {
-	if m != nil {
-		return m.AliasNode
+func (x *HealthCheckDefinition) GetAliasNode() string {
+	if x != nil {
+		return x.AliasNode
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetAliasService() string {
-	if m != nil {
-		return m.AliasService
+func (x *HealthCheckDefinition) GetAliasService() string {
+	if x != nil {
+		return x.AliasService
 	}
 	return ""
 }
 
-func (m *HealthCheckDefinition) GetTTL() *duration.Duration {
-	if m != nil {
-		return m.TTL
+func (x *HealthCheckDefinition) GetTTL() *durationpb.Duration {
+	if x != nil {
+		return x.TTL
 	}
 	return nil
 }
@@ -456,6 +485,10 @@ func (m *HealthCheckDefinition) GetTTL() *duration.Duration {
 // output=healthcheck.gen.go
 // name=Structs
 type CheckType struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// mog: func-to=CheckIDType func-from=string
 	CheckID    string   `protobuf:"bytes,1,opt,name=CheckID,proto3" json:"CheckID,omitempty"`
 	Name       string   `protobuf:"bytes,2,opt,name=Name,proto3" json:"Name,omitempty"`
@@ -469,21 +502,21 @@ type CheckType struct {
 	Body   string                  `protobuf:"bytes,26,opt,name=Body,proto3" json:"Body,omitempty"`
 	TCP    string                  `protobuf:"bytes,8,opt,name=TCP,proto3" json:"TCP,omitempty"`
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Interval          *duration.Duration `protobuf:"bytes,9,opt,name=Interval,proto3" json:"Interval,omitempty"`
-	AliasNode         string             `protobuf:"bytes,10,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
-	AliasService      string             `protobuf:"bytes,11,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
-	DockerContainerID string             `protobuf:"bytes,12,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
-	Shell             string             `protobuf:"bytes,13,opt,name=Shell,proto3" json:"Shell,omitempty"`
-	H2PING            string             `protobuf:"bytes,28,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
-	H2PingUseTLS      bool               `protobuf:"varint,30,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
-	GRPC              string             `protobuf:"bytes,14,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
-	GRPCUseTLS        bool               `protobuf:"varint,15,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
-	TLSServerName     string             `protobuf:"bytes,27,opt,name=TLSServerName,proto3" json:"TLSServerName,omitempty"`
-	TLSSkipVerify     bool               `protobuf:"varint,16,opt,name=TLSSkipVerify,proto3" json:"TLSSkipVerify,omitempty"`
+	Interval          *durationpb.Duration `protobuf:"bytes,9,opt,name=Interval,proto3" json:"Interval,omitempty"`
+	AliasNode         string               `protobuf:"bytes,10,opt,name=AliasNode,proto3" json:"AliasNode,omitempty"`
+	AliasService      string               `protobuf:"bytes,11,opt,name=AliasService,proto3" json:"AliasService,omitempty"`
+	DockerContainerID string               `protobuf:"bytes,12,opt,name=DockerContainerID,proto3" json:"DockerContainerID,omitempty"`
+	Shell             string               `protobuf:"bytes,13,opt,name=Shell,proto3" json:"Shell,omitempty"`
+	H2PING            string               `protobuf:"bytes,28,opt,name=H2PING,proto3" json:"H2PING,omitempty"`
+	H2PingUseTLS      bool                 `protobuf:"varint,30,opt,name=H2PingUseTLS,proto3" json:"H2PingUseTLS,omitempty"`
+	GRPC              string               `protobuf:"bytes,14,opt,name=GRPC,proto3" json:"GRPC,omitempty"`
+	GRPCUseTLS        bool                 `protobuf:"varint,15,opt,name=GRPCUseTLS,proto3" json:"GRPCUseTLS,omitempty"`
+	TLSServerName     string               `protobuf:"bytes,27,opt,name=TLSServerName,proto3" json:"TLSServerName,omitempty"`
+	TLSSkipVerify     bool                 `protobuf:"varint,16,opt,name=TLSSkipVerify,proto3" json:"TLSSkipVerify,omitempty"`
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	Timeout *duration.Duration `protobuf:"bytes,17,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
+	Timeout *durationpb.Duration `protobuf:"bytes,17,opt,name=Timeout,proto3" json:"Timeout,omitempty"`
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	TTL *duration.Duration `protobuf:"bytes,18,opt,name=TTL,proto3" json:"TTL,omitempty"`
+	TTL *durationpb.Duration `protobuf:"bytes,18,opt,name=TTL,proto3" json:"TTL,omitempty"`
 	// mog: func-to=int func-from=int32
 	SuccessBeforePassing int32 `protobuf:"varint,21,opt,name=SuccessBeforePassing,proto3" json:"SuccessBeforePassing,omitempty"`
 	// mog: func-to=int func-from=int32
@@ -497,325 +530,554 @@ type CheckType struct {
 	// service, if any, to be deregistered if this check is critical for
 	// longer than this duration.
 	// mog: func-to=structs.DurationFromProto func-from=structs.DurationToProto
-	DeregisterCriticalServiceAfter *duration.Duration `protobuf:"bytes,19,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
+	DeregisterCriticalServiceAfter *durationpb.Duration `protobuf:"bytes,19,opt,name=DeregisterCriticalServiceAfter,proto3" json:"DeregisterCriticalServiceAfter,omitempty"`
 	// mog: func-to=int func-from=int32
-	OutputMaxSize        int32    `protobuf:"varint,25,opt,name=OutputMaxSize,proto3" json:"OutputMaxSize,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	OutputMaxSize int32 `protobuf:"varint,25,opt,name=OutputMaxSize,proto3" json:"OutputMaxSize,omitempty"`
 }
 
-func (m *CheckType) Reset()         { *m = CheckType{} }
-func (m *CheckType) String() string { return proto.CompactTextString(m) }
-func (*CheckType) ProtoMessage()    {}
+func (x *CheckType) Reset() {
+	*x = CheckType{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_healthcheck_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CheckType) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CheckType) ProtoMessage() {}
+
+func (x *CheckType) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_healthcheck_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CheckType.ProtoReflect.Descriptor instead.
 func (*CheckType) Descriptor() ([]byte, []int) {
-	return fileDescriptor_8a6f7448747c9fbe, []int{3}
+	return file_proto_pbservice_healthcheck_proto_rawDescGZIP(), []int{3}
 }
 
-func (m *CheckType) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CheckType.Unmarshal(m, b)
-}
-func (m *CheckType) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CheckType.Marshal(b, m, deterministic)
-}
-func (m *CheckType) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckType.Merge(m, src)
-}
-func (m *CheckType) XXX_Size() int {
-	return xxx_messageInfo_CheckType.Size(m)
-}
-func (m *CheckType) XXX_DiscardUnknown() {
-	xxx_messageInfo_CheckType.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_CheckType proto.InternalMessageInfo
-
-func (m *CheckType) GetCheckID() string {
-	if m != nil {
-		return m.CheckID
+func (x *CheckType) GetCheckID() string {
+	if x != nil {
+		return x.CheckID
 	}
 	return ""
 }
 
-func (m *CheckType) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *CheckType) GetName() string {
+	if x != nil {
+		return x.Name
 	}
 	return ""
 }
 
-func (m *CheckType) GetStatus() string {
-	if m != nil {
-		return m.Status
+func (x *CheckType) GetStatus() string {
+	if x != nil {
+		return x.Status
 	}
 	return ""
 }
 
-func (m *CheckType) GetNotes() string {
-	if m != nil {
-		return m.Notes
+func (x *CheckType) GetNotes() string {
+	if x != nil {
+		return x.Notes
 	}
 	return ""
 }
 
-func (m *CheckType) GetScriptArgs() []string {
-	if m != nil {
-		return m.ScriptArgs
+func (x *CheckType) GetScriptArgs() []string {
+	if x != nil {
+		return x.ScriptArgs
 	}
 	return nil
 }
 
-func (m *CheckType) GetHTTP() string {
-	if m != nil {
-		return m.HTTP
+func (x *CheckType) GetHTTP() string {
+	if x != nil {
+		return x.HTTP
 	}
 	return ""
 }
 
-func (m *CheckType) GetHeader() map[string]*HeaderValue {
-	if m != nil {
-		return m.Header
+func (x *CheckType) GetHeader() map[string]*HeaderValue {
+	if x != nil {
+		return x.Header
 	}
 	return nil
 }
 
-func (m *CheckType) GetMethod() string {
-	if m != nil {
-		return m.Method
+func (x *CheckType) GetMethod() string {
+	if x != nil {
+		return x.Method
 	}
 	return ""
 }
 
-func (m *CheckType) GetBody() string {
-	if m != nil {
-		return m.Body
+func (x *CheckType) GetBody() string {
+	if x != nil {
+		return x.Body
 	}
 	return ""
 }
 
-func (m *CheckType) GetTCP() string {
-	if m != nil {
-		return m.TCP
+func (x *CheckType) GetTCP() string {
+	if x != nil {
+		return x.TCP
 	}
 	return ""
 }
 
-func (m *CheckType) GetInterval() *duration.Duration {
-	if m != nil {
-		return m.Interval
+func (x *CheckType) GetInterval() *durationpb.Duration {
+	if x != nil {
+		return x.Interval
 	}
 	return nil
 }
 
-func (m *CheckType) GetAliasNode() string {
-	if m != nil {
-		return m.AliasNode
+func (x *CheckType) GetAliasNode() string {
+	if x != nil {
+		return x.AliasNode
 	}
 	return ""
 }
 
-func (m *CheckType) GetAliasService() string {
-	if m != nil {
-		return m.AliasService
+func (x *CheckType) GetAliasService() string {
+	if x != nil {
+		return x.AliasService
 	}
 	return ""
 }
 
-func (m *CheckType) GetDockerContainerID() string {
-	if m != nil {
-		return m.DockerContainerID
+func (x *CheckType) GetDockerContainerID() string {
+	if x != nil {
+		return x.DockerContainerID
 	}
 	return ""
 }
 
-func (m *CheckType) GetShell() string {
-	if m != nil {
-		return m.Shell
+func (x *CheckType) GetShell() string {
+	if x != nil {
+		return x.Shell
 	}
 	return ""
 }
 
-func (m *CheckType) GetH2PING() string {
-	if m != nil {
-		return m.H2PING
+func (x *CheckType) GetH2PING() string {
+	if x != nil {
+		return x.H2PING
 	}
 	return ""
 }
 
-func (m *CheckType) GetH2PingUseTLS() bool {
-	if m != nil {
-		return m.H2PingUseTLS
+func (x *CheckType) GetH2PingUseTLS() bool {
+	if x != nil {
+		return x.H2PingUseTLS
 	}
 	return false
 }
 
-func (m *CheckType) GetGRPC() string {
-	if m != nil {
-		return m.GRPC
+func (x *CheckType) GetGRPC() string {
+	if x != nil {
+		return x.GRPC
 	}
 	return ""
 }
 
-func (m *CheckType) GetGRPCUseTLS() bool {
-	if m != nil {
-		return m.GRPCUseTLS
+func (x *CheckType) GetGRPCUseTLS() bool {
+	if x != nil {
+		return x.GRPCUseTLS
 	}
 	return false
 }
 
-func (m *CheckType) GetTLSServerName() string {
-	if m != nil {
-		return m.TLSServerName
+func (x *CheckType) GetTLSServerName() string {
+	if x != nil {
+		return x.TLSServerName
 	}
 	return ""
 }
 
-func (m *CheckType) GetTLSSkipVerify() bool {
-	if m != nil {
-		return m.TLSSkipVerify
+func (x *CheckType) GetTLSSkipVerify() bool {
+	if x != nil {
+		return x.TLSSkipVerify
 	}
 	return false
 }
 
-func (m *CheckType) GetTimeout() *duration.Duration {
-	if m != nil {
-		return m.Timeout
+func (x *CheckType) GetTimeout() *durationpb.Duration {
+	if x != nil {
+		return x.Timeout
 	}
 	return nil
 }
 
-func (m *CheckType) GetTTL() *duration.Duration {
-	if m != nil {
-		return m.TTL
+func (x *CheckType) GetTTL() *durationpb.Duration {
+	if x != nil {
+		return x.TTL
 	}
 	return nil
 }
 
-func (m *CheckType) GetSuccessBeforePassing() int32 {
-	if m != nil {
-		return m.SuccessBeforePassing
+func (x *CheckType) GetSuccessBeforePassing() int32 {
+	if x != nil {
+		return x.SuccessBeforePassing
 	}
 	return 0
 }
 
-func (m *CheckType) GetFailuresBeforeWarning() int32 {
-	if m != nil {
-		return m.FailuresBeforeWarning
+func (x *CheckType) GetFailuresBeforeWarning() int32 {
+	if x != nil {
+		return x.FailuresBeforeWarning
 	}
 	return 0
 }
 
-func (m *CheckType) GetFailuresBeforeCritical() int32 {
-	if m != nil {
-		return m.FailuresBeforeCritical
+func (x *CheckType) GetFailuresBeforeCritical() int32 {
+	if x != nil {
+		return x.FailuresBeforeCritical
 	}
 	return 0
 }
 
-func (m *CheckType) GetProxyHTTP() string {
-	if m != nil {
-		return m.ProxyHTTP
+func (x *CheckType) GetProxyHTTP() string {
+	if x != nil {
+		return x.ProxyHTTP
 	}
 	return ""
 }
 
-func (m *CheckType) GetProxyGRPC() string {
-	if m != nil {
-		return m.ProxyGRPC
+func (x *CheckType) GetProxyGRPC() string {
+	if x != nil {
+		return x.ProxyGRPC
 	}
 	return ""
 }
 
-func (m *CheckType) GetDeregisterCriticalServiceAfter() *duration.Duration {
-	if m != nil {
-		return m.DeregisterCriticalServiceAfter
+func (x *CheckType) GetDeregisterCriticalServiceAfter() *durationpb.Duration {
+	if x != nil {
+		return x.DeregisterCriticalServiceAfter
 	}
 	return nil
 }
 
-func (m *CheckType) GetOutputMaxSize() int32 {
-	if m != nil {
-		return m.OutputMaxSize
+func (x *CheckType) GetOutputMaxSize() int32 {
+	if x != nil {
+		return x.OutputMaxSize
 	}
 	return 0
 }
 
-func init() {
-	proto.RegisterType((*HealthCheck)(nil), "pbservice.HealthCheck")
-	proto.RegisterType((*HeaderValue)(nil), "pbservice.HeaderValue")
-	proto.RegisterType((*HealthCheckDefinition)(nil), "pbservice.HealthCheckDefinition")
-	proto.RegisterMapType((map[string]*HeaderValue)(nil), "pbservice.HealthCheckDefinition.HeaderEntry")
-	proto.RegisterType((*CheckType)(nil), "pbservice.CheckType")
-	proto.RegisterMapType((map[string]*HeaderValue)(nil), "pbservice.CheckType.HeaderEntry")
+var File_proto_pbservice_healthcheck_proto protoreflect.FileDescriptor
+
+var file_proto_pbservice_healthcheck_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63, 0x6b, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x09, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x1e,
+	0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f,
+	0x64, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63,
+	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x96, 0x04, 0x0a, 0x0b,
+	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x12, 0x0a, 0x04, 0x4e,
+	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12,
+	0x18, 0x0a, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d,
+	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a,
+	0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x53,
+	0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x18, 0x05,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x12, 0x16, 0x0a, 0x06, 0x4f,
+	0x75, 0x74, 0x70, 0x75, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x12, 0x1c, 0x0a, 0x09, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49,
+	0x44, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e,
+	0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x54, 0x61,
+	0x67, 0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x54, 0x61, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0c, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x04, 0x54, 0x79, 0x70, 0x65, 0x12, 0x40, 0x0a, 0x0a, 0x44, 0x65, 0x66,
+	0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
+	0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68,
+	0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52,
+	0x0a, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x09, 0x52,
+	0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11,
+	0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x52, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x3e, 0x0a, 0x0e,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x0d,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x20, 0x0a, 0x0b,
+	0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0b, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a,
+	0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x69,
+	0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x54, 0x69, 0x6d,
+	0x65, 0x6f, 0x75, 0x74, 0x22, 0x23, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61,
+	0x6c, 0x75, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x03,
+	0x28, 0x09, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x22, 0x86, 0x07, 0x0a, 0x15, 0x48, 0x65,
+	0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74,
+	0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x48, 0x54, 0x54, 0x50, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x65,
+	0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x13, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d,
+	0x54, 0x4c, 0x53, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a,
+	0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72,
+	0x69, 0x66, 0x79, 0x12, 0x44, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x03, 0x20,
+	0x03, 0x28, 0x0b, 0x32, 0x2c, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
+	0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x44, 0x65, 0x66, 0x69, 0x6e,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x4d, 0x65, 0x74,
+	0x68, 0x6f, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4d, 0x65, 0x74, 0x68, 0x6f,
+	0x64, 0x12, 0x12, 0x0a, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x43, 0x50, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x03, 0x54, 0x43, 0x50, 0x12, 0x35, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72,
+	0x76, 0x61, 0x6c, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12, 0x24,
+	0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61, 0x78,
+	0x53, 0x69, 0x7a, 0x65, 0x12, 0x33, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e,
+	0x52, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x61, 0x0a, 0x1e, 0x44, 0x65, 0x72,
+	0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f,
+	0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x1e, 0x44, 0x65,
+	0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66, 0x74, 0x65, 0x72, 0x12, 0x1e, 0x0a, 0x0a,
+	0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x18, 0x0a, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0a, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x2c, 0x0a, 0x11,
+	0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49,
+	0x44, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43,
+	0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x53, 0x68,
+	0x65, 0x6c, 0x6c, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x53, 0x68, 0x65, 0x6c, 0x6c,
+	0x12, 0x16, 0x0a, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x18, 0x14, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x12, 0x22, 0x0a, 0x0c, 0x48, 0x32, 0x50, 0x69,
+	0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x15, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c,
+	0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x12, 0x12, 0x0a, 0x04,
+	0x47, 0x52, 0x50, 0x43, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x47, 0x52, 0x50, 0x43,
+	0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x0e,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53,
+	0x12, 0x1c, 0x0a, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x0f, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x22,
+	0x0a, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x10,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x12, 0x2b, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75,
+	0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03, 0x54, 0x54, 0x4c, 0x1a,
+	0x51, 0x0a, 0x0b, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
+	0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79,
+	0x12, 0x2c, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x16, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64,
+	0x65, 0x72, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
+	0x38, 0x01, 0x22, 0xa8, 0x09, 0x0a, 0x09, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x18, 0x0a, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61,
+	0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x16,
+	0x0a, 0x06, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06,
+	0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x18,
+	0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x4e, 0x6f, 0x74, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a,
+	0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x0a, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x41, 0x72, 0x67, 0x73, 0x12, 0x12, 0x0a, 0x04,
+	0x48, 0x54, 0x54, 0x50, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x48, 0x54, 0x54, 0x50,
+	0x12, 0x38, 0x0a, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x18, 0x14, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x20, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74,
+	0x72, 0x79, 0x52, 0x06, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x4d, 0x65,
+	0x74, 0x68, 0x6f, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x4d, 0x65, 0x74, 0x68,
+	0x6f, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x04, 0x42, 0x6f, 0x64, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x54, 0x43, 0x50, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x03, 0x54, 0x43, 0x50, 0x12, 0x35, 0x0a, 0x08, 0x49, 0x6e, 0x74, 0x65,
+	0x72, 0x76, 0x61, 0x6c, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f,
+	0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x08, 0x49, 0x6e, 0x74, 0x65, 0x72, 0x76, 0x61, 0x6c, 0x12,
+	0x1c, 0x0a, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x22, 0x0a,
+	0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x0b, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x0c, 0x41, 0x6c, 0x69, 0x61, 0x73, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x12, 0x2c, 0x0a, 0x11, 0x44, 0x6f, 0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61,
+	0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x44, 0x6f,
+	0x63, 0x6b, 0x65, 0x72, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x69, 0x6e, 0x65, 0x72, 0x49, 0x44, 0x12,
+	0x14, 0x0a, 0x05, 0x53, 0x68, 0x65, 0x6c, 0x6c, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x53, 0x68, 0x65, 0x6c, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x18,
+	0x1c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x48, 0x32, 0x50, 0x49, 0x4e, 0x47, 0x12, 0x22, 0x0a,
+	0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c, 0x53, 0x18, 0x1e, 0x20,
+	0x01, 0x28, 0x08, 0x52, 0x0c, 0x48, 0x32, 0x50, 0x69, 0x6e, 0x67, 0x55, 0x73, 0x65, 0x54, 0x4c,
+	0x53, 0x12, 0x12, 0x0a, 0x04, 0x47, 0x52, 0x50, 0x43, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x04, 0x47, 0x52, 0x50, 0x43, 0x12, 0x1e, 0x0a, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55, 0x73, 0x65,
+	0x54, 0x4c, 0x53, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x47, 0x52, 0x50, 0x43, 0x55,
+	0x73, 0x65, 0x54, 0x4c, 0x53, 0x12, 0x24, 0x0a, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x65, 0x72, 0x76,
+	0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x1b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x54, 0x4c,
+	0x53, 0x53, 0x65, 0x72, 0x76, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x0a, 0x0d, 0x54,
+	0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66, 0x79, 0x18, 0x10, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0d, 0x54, 0x4c, 0x53, 0x53, 0x6b, 0x69, 0x70, 0x56, 0x65, 0x72, 0x69, 0x66,
+	0x79, 0x12, 0x33, 0x0a, 0x07, 0x54, 0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x18, 0x11, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74,
+	0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x07, 0x54,
+	0x69, 0x6d, 0x65, 0x6f, 0x75, 0x74, 0x12, 0x2b, 0x0a, 0x03, 0x54, 0x54, 0x4c, 0x18, 0x12, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x03,
+	0x54, 0x54, 0x4c, 0x12, 0x32, 0x0a, 0x14, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x65,
+	0x66, 0x6f, 0x72, 0x65, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18, 0x15, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x14, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65,
+	0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x12, 0x34, 0x0a, 0x15, 0x46, 0x61, 0x69, 0x6c, 0x75,
+	0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67,
+	0x18, 0x1d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73,
+	0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x12, 0x36, 0x0a,
+	0x16, 0x46, 0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x43,
+	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05, 0x52, 0x16, 0x46,
+	0x61, 0x69, 0x6c, 0x75, 0x72, 0x65, 0x73, 0x42, 0x65, 0x66, 0x6f, 0x72, 0x65, 0x43, 0x72, 0x69,
+	0x74, 0x69, 0x63, 0x61, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x48, 0x54,
+	0x54, 0x50, 0x18, 0x17, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x48,
+	0x54, 0x54, 0x50, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x47, 0x52, 0x50, 0x43,
+	0x18, 0x18, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x47, 0x52, 0x50,
+	0x43, 0x12, 0x61, 0x0a, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x43,
+	0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x66,
+	0x74, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x44, 0x75, 0x72, 0x61,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x1e, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72,
+	0x43, 0x72, 0x69, 0x74, 0x69, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41,
+	0x66, 0x74, 0x65, 0x72, 0x12, 0x24, 0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4d, 0x61,
+	0x78, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x19, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x4f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x4d, 0x61, 0x78, 0x53, 0x69, 0x7a, 0x65, 0x1a, 0x51, 0x0a, 0x0b, 0x48, 0x65,
+	0x61, 0x64, 0x65, 0x72, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2c, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x62, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48, 0x65, 0x61, 0x64, 0x65, 0x72, 0x56, 0x61, 0x6c,
+	0x75, 0x65, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x2d, 0x5a,
+	0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68,
+	0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f,
+	0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbservice/healthcheck.proto", fileDescriptor_8a6f7448747c9fbe)
+var (
+	file_proto_pbservice_healthcheck_proto_rawDescOnce sync.Once
+	file_proto_pbservice_healthcheck_proto_rawDescData = file_proto_pbservice_healthcheck_proto_rawDesc
+)
+
+func file_proto_pbservice_healthcheck_proto_rawDescGZIP() []byte {
+	file_proto_pbservice_healthcheck_proto_rawDescOnce.Do(func() {
+		file_proto_pbservice_healthcheck_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbservice_healthcheck_proto_rawDescData)
+	})
+	return file_proto_pbservice_healthcheck_proto_rawDescData
 }
 
-var fileDescriptor_8a6f7448747c9fbe = []byte{
-	// 994 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x56, 0xd1, 0x6e, 0x22, 0x37,
-	0x14, 0x15, 0x21, 0x40, 0xc6, 0x84, 0x6c, 0xe2, 0x4d, 0x52, 0x2f, 0xbb, 0x8d, 0x28, 0xdd, 0x07,
-	0xa4, 0x4d, 0x41, 0x62, 0xdb, 0x6a, 0xd5, 0x87, 0xaa, 0x09, 0xa4, 0x1b, 0xa4, 0x24, 0xa5, 0xc3,
-	0x74, 0x2b, 0xf5, 0xcd, 0x19, 0x0c, 0x58, 0x19, 0xc6, 0x23, 0x8f, 0x27, 0x0a, 0xfd, 0x80, 0x7e,
-	0x42, 0xbf, 0xa1, 0x9f, 0x59, 0xf9, 0x7a, 0x06, 0x66, 0x96, 0x49, 0x88, 0x54, 0xf5, 0x09, 0xdf,
-	0x7b, 0xae, 0x8d, 0x7d, 0xef, 0x39, 0x07, 0xd0, 0x57, 0x81, 0x14, 0x4a, 0x74, 0x82, 0xdb, 0x90,
-	0xc9, 0x7b, 0xee, 0xb2, 0xce, 0x8c, 0x51, 0x4f, 0xcd, 0xdc, 0x19, 0x73, 0xef, 0xda, 0x80, 0x61,
-	0x6b, 0x09, 0xd6, 0x4f, 0xa6, 0x42, 0x4c, 0x3d, 0xd6, 0x01, 0xe0, 0x36, 0x9a, 0x74, 0xc6, 0x91,
-	0xa4, 0x8a, 0x0b, 0xdf, 0x94, 0xd6, 0x5f, 0x27, 0xa7, 0xb9, 0x62, 0x3e, 0x17, 0x7e, 0xc7, 0x7c,
-	0x18, 0xb0, 0xf9, 0xf7, 0x36, 0xaa, 0x5e, 0xc2, 0xe9, 0x3d, 0x7d, 0x3a, 0xc6, 0x68, 0xfb, 0x46,
-	0x8c, 0x19, 0x29, 0x34, 0x0a, 0x2d, 0xcb, 0x86, 0x35, 0x26, 0xa8, 0x02, 0xe0, 0xa0, 0x4f, 0xb6,
-	0x20, 0x9d, 0x84, 0x50, 0x4d, 0xe7, 0x8c, 0x14, 0xe3, 0x6a, 0x3a, 0x67, 0xf8, 0x18, 0x95, 0x47,
-	0x8a, 0xaa, 0x28, 0x24, 0xdb, 0x90, 0x8d, 0x23, 0x7c, 0x88, 0x4a, 0x37, 0x42, 0xb1, 0x90, 0x94,
-	0x20, 0x6d, 0x02, 0x5d, 0xfd, 0x4b, 0xa4, 0x82, 0x48, 0x91, 0xb2, 0xa9, 0x36, 0x11, 0x7e, 0x83,
-	0xac, 0x91, 0x79, 0xdf, 0xa0, 0x4f, 0x2a, 0x00, 0xad, 0x12, 0xb8, 0x81, 0xaa, 0x71, 0x00, 0x5f,
-	0xbf, 0x03, 0x78, 0x3a, 0x95, 0xaa, 0x70, 0xe8, 0x34, 0x24, 0x56, 0xa3, 0x98, 0xaa, 0xd0, 0x29,
-	0x7d, 0x77, 0x67, 0x11, 0x30, 0xb2, 0x6b, 0xee, 0xae, 0xd7, 0xf8, 0x27, 0x84, 0xfa, 0x6c, 0xc2,
-	0x7d, 0xae, 0xdb, 0x47, 0x50, 0xa3, 0xd0, 0xaa, 0x76, 0x1b, 0xed, 0x65, 0xab, 0xdb, 0xa9, 0x4e,
-	0xad, 0xea, 0xec, 0xd4, 0x1e, 0xdc, 0x41, 0x96, 0x4d, 0x27, 0x6a, 0xe0, 0x8f, 0xd9, 0x03, 0xa9,
-	0xc2, 0x01, 0x07, 0xed, 0xb8, 0xe3, 0x4b, 0xc0, 0x5e, 0xd5, 0xe0, 0x1f, 0xd1, 0xde, 0x85, 0xaf,
-	0x98, 0x0c, 0x24, 0x0f, 0xd9, 0x35, 0x53, 0x94, 0xd4, 0x60, 0xd7, 0x71, 0xb2, 0x2b, 0x8b, 0xda,
-	0x9f, 0x55, 0xeb, 0x87, 0x5e, 0x3c, 0x04, 0x22, 0x64, 0xe3, 0xa1, 0x90, 0x8a, 0xec, 0x35, 0x0a,
-	0xad, 0x92, 0x9d, 0x4e, 0xe1, 0x3a, 0xda, 0x19, 0xe8, 0x3d, 0xf7, 0xd4, 0x23, 0x2f, 0xe0, 0xb1,
-	0xcb, 0x58, 0x8f, 0xd6, 0xe1, 0x73, 0x26, 0x22, 0x45, 0xf6, 0xcd, 0x68, 0xe3, 0xb0, 0xf9, 0x35,
-	0xf0, 0x62, 0xcc, 0xe4, 0x27, 0xea, 0x45, 0x4c, 0x4f, 0x0f, 0x16, 0xa4, 0x00, 0x9d, 0x34, 0x41,
-	0xf3, 0xaf, 0x0a, 0x3a, 0xca, 0xed, 0x89, 0xee, 0xee, 0xa5, 0xe3, 0x0c, 0x13, 0x1e, 0xe9, 0x35,
-	0x7e, 0x8b, 0x6a, 0xce, 0xd5, 0x48, 0xcf, 0x80, 0x49, 0x98, 0xdb, 0x4b, 0x00, 0xb3, 0xc9, 0xa4,
-	0xea, 0x8e, 0x07, 0x9f, 0x98, 0xe4, 0x93, 0x05, 0x70, 0x6e, 0xc7, 0xce, 0x26, 0x71, 0x1f, 0x95,
-	0xcd, 0xf5, 0x48, 0xb1, 0x51, 0x6c, 0x55, 0xbb, 0xa7, 0x9b, 0xa6, 0xd4, 0x36, 0xe5, 0x17, 0xbe,
-	0x92, 0x0b, 0x3b, 0xde, 0xab, 0xd9, 0x77, 0xcd, 0xd4, 0x4c, 0x8c, 0x13, 0xae, 0x9a, 0x48, 0xdf,
-	0xfe, 0x5c, 0x8c, 0x17, 0x04, 0x9b, 0xdb, 0xeb, 0x35, 0xde, 0x47, 0x45, 0xa7, 0x37, 0x8c, 0xd9,
-	0xab, 0x97, 0xf8, 0xbb, 0x54, 0x63, 0xcb, 0x30, 0xb4, 0x57, 0x6d, 0xa3, 0xc5, 0x76, 0xa2, 0xc5,
-	0x76, 0x3f, 0xd6, 0x62, 0xaa, 0xe7, 0x6f, 0x51, 0xcd, 0x90, 0xfc, 0x9a, 0x3e, 0x8c, 0xf8, 0x9f,
-	0x8c, 0x58, 0x8d, 0x42, 0xab, 0x66, 0x67, 0x93, 0xf8, 0xfd, 0x6a, 0x32, 0x95, 0x4d, 0x67, 0x27,
-	0x95, 0x98, 0xa2, 0x93, 0x3e, 0x93, 0x6c, 0xca, 0x43, 0xc5, 0x64, 0x4f, 0x72, 0xc5, 0x5d, 0xea,
-	0xc5, 0xa4, 0x3f, 0x9b, 0x28, 0x26, 0x41, 0x2a, 0x4f, 0x9e, 0xb5, 0xe1, 0x00, 0x7c, 0x82, 0xd0,
-	0xc8, 0x95, 0x3c, 0x50, 0x67, 0x72, 0x1a, 0x12, 0x04, 0x6c, 0x48, 0x65, 0xf0, 0x29, 0x3a, 0xe8,
-	0x0b, 0xf7, 0x8e, 0xc9, 0x9e, 0xf0, 0x15, 0xe5, 0x3e, 0x93, 0x83, 0x3e, 0x08, 0xc1, 0xb2, 0xd7,
-	0x01, 0x4d, 0xab, 0xd1, 0x8c, 0x79, 0x5e, 0xac, 0x42, 0x13, 0xe8, 0xb1, 0x5c, 0x76, 0x87, 0x83,
-	0x9b, 0x8f, 0xe4, 0xd0, 0x8c, 0xc5, 0x44, 0xb8, 0x89, 0x76, 0x2f, 0xbb, 0x43, 0xee, 0x4f, 0x7f,
-	0x0b, 0x99, 0x73, 0x35, 0x22, 0x47, 0xc0, 0x8c, 0x4c, 0x4e, 0x8f, 0xee, 0xa3, 0x3d, 0xec, 0x81,
-	0x8a, 0x2c, 0x1b, 0xd6, 0xfa, 0xce, 0xfa, 0x33, 0xde, 0xb5, 0x07, 0xbb, 0x52, 0x19, 0x6d, 0x36,
-	0x67, 0x1e, 0xa7, 0x21, 0x38, 0x9f, 0x91, 0xc8, 0x2a, 0xa1, 0xbf, 0x15, 0x82, 0xb8, 0x0d, 0xb1,
-	0x50, 0x32, 0x39, 0xfc, 0x0e, 0x15, 0x1d, 0xe7, 0x8a, 0x1c, 0x6c, 0xea, 0xae, 0xae, 0xaa, 0xff,
-	0x9a, 0x48, 0x0b, 0xc8, 0xa8, 0x89, 0x75, 0xc7, 0x16, 0xb1, 0x52, 0xf4, 0x12, 0x9f, 0xa2, 0xd2,
-	0x3d, 0x88, 0x6d, 0x2b, 0xb6, 0x82, 0x0c, 0xb7, 0x13, 0x4d, 0xda, 0xa6, 0xe8, 0x87, 0xad, 0x0f,
-	0x85, 0xe6, 0x3f, 0x16, 0xb2, 0x80, 0xf0, 0x60, 0x63, 0x29, 0xc3, 0x2e, 0xe4, 0x1b, 0xf6, 0x56,
-	0xae, 0x61, 0x17, 0xf3, 0x0d, 0x7b, 0x3b, 0x6d, 0xd8, 0xd9, 0xf9, 0x97, 0xd6, 0xe6, 0x9f, 0x08,
-	0xbf, 0x9c, 0x12, 0xfe, 0x87, 0xa5, 0x58, 0x0f, 0x41, 0xac, 0x69, 0x4b, 0x5d, 0xde, 0x7a, 0x83,
-	0x40, 0x2b, 0xb9, 0x02, 0xad, 0xaf, 0x0b, 0x74, 0x27, 0x5f, 0xa0, 0xd6, 0xf3, 0x05, 0x9a, 0xa1,
-	0x03, 0xda, 0x44, 0x87, 0x6a, 0x0e, 0x1d, 0x72, 0x45, 0xb0, 0xbb, 0x51, 0x04, 0xb5, 0x7c, 0x11,
-	0xbc, 0x79, 0x52, 0x04, 0x27, 0x4f, 0x88, 0x60, 0xef, 0x51, 0x11, 0xbc, 0x58, 0x13, 0xc1, 0x9a,
-	0x3b, 0xbf, 0x7e, 0x96, 0x3b, 0xef, 0xe7, 0xb9, 0x73, 0xca, 0xbc, 0x0e, 0x9e, 0x6d, 0x5e, 0xb1,
-	0x86, 0xf0, 0x73, 0x34, 0x84, 0xbb, 0xe8, 0x70, 0x14, 0xb9, 0x2e, 0x0b, 0xc3, 0x73, 0x36, 0x11,
-	0x92, 0x0d, 0x69, 0x18, 0x72, 0x7f, 0x0a, 0x96, 0x50, 0xb2, 0x73, 0x31, 0xfc, 0x2d, 0x3a, 0xfa,
-	0x99, 0x72, 0x2f, 0x92, 0x2c, 0x06, 0x7e, 0xa7, 0xd2, 0xd7, 0x9b, 0xbe, 0x84, 0x4d, 0xf9, 0x20,
-	0xfe, 0x1e, 0x1d, 0x67, 0x81, 0xc4, 0x16, 0xc9, 0x31, 0x6c, 0x7b, 0x04, 0xd5, 0x2c, 0x1a, 0x4a,
-	0xf1, 0xb0, 0x00, 0x35, 0x7c, 0x61, 0x58, 0xb4, 0x4c, 0x2c, 0x51, 0x18, 0x13, 0x49, 0xa1, 0x30,
-	0xab, 0xcd, 0x3e, 0xfe, 0xf2, 0xbf, 0xfa, 0xf8, 0xda, 0xaf, 0xd0, 0x2b, 0x78, 0x4d, 0x36, 0xf9,
-	0x3f, 0x58, 0xd5, 0xf9, 0x37, 0x7f, 0xbc, 0x9b, 0x72, 0x35, 0x8b, 0x6e, 0xf5, 0x1f, 0x9c, 0xce,
-	0x8c, 0x86, 0x33, 0xee, 0x0a, 0x19, 0x74, 0x5c, 0xe1, 0x87, 0x91, 0xd7, 0xf9, 0xec, 0xaf, 0xef,
-	0x6d, 0x19, 0x12, 0xef, 0xff, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x33, 0x6c, 0x46, 0x9d, 0x14, 0x0b,
-	0x00, 0x00,
+var file_proto_pbservice_healthcheck_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
+var file_proto_pbservice_healthcheck_proto_goTypes = []interface{}{
+	(*HealthCheck)(nil),             // 0: pbservice.HealthCheck
+	(*HeaderValue)(nil),             // 1: pbservice.HeaderValue
+	(*HealthCheckDefinition)(nil),   // 2: pbservice.HealthCheckDefinition
+	(*CheckType)(nil),               // 3: pbservice.CheckType
+	nil,                             // 4: pbservice.HealthCheckDefinition.HeaderEntry
+	nil,                             // 5: pbservice.CheckType.HeaderEntry
+	(*pbcommon.RaftIndex)(nil),      // 6: common.RaftIndex
+	(*pbcommon.EnterpriseMeta)(nil), // 7: common.EnterpriseMeta
+	(*durationpb.Duration)(nil),     // 8: google.protobuf.Duration
+}
+var file_proto_pbservice_healthcheck_proto_depIdxs = []int32{
+	2,  // 0: pbservice.HealthCheck.Definition:type_name -> pbservice.HealthCheckDefinition
+	6,  // 1: pbservice.HealthCheck.RaftIndex:type_name -> common.RaftIndex
+	7,  // 2: pbservice.HealthCheck.EnterpriseMeta:type_name -> common.EnterpriseMeta
+	4,  // 3: pbservice.HealthCheckDefinition.Header:type_name -> pbservice.HealthCheckDefinition.HeaderEntry
+	8,  // 4: pbservice.HealthCheckDefinition.Interval:type_name -> google.protobuf.Duration
+	8,  // 5: pbservice.HealthCheckDefinition.Timeout:type_name -> google.protobuf.Duration
+	8,  // 6: pbservice.HealthCheckDefinition.DeregisterCriticalServiceAfter:type_name -> google.protobuf.Duration
+	8,  // 7: pbservice.HealthCheckDefinition.TTL:type_name -> google.protobuf.Duration
+	5,  // 8: pbservice.CheckType.Header:type_name -> pbservice.CheckType.HeaderEntry
+	8,  // 9: pbservice.CheckType.Interval:type_name -> google.protobuf.Duration
+	8,  // 10: pbservice.CheckType.Timeout:type_name -> google.protobuf.Duration
+	8,  // 11: pbservice.CheckType.TTL:type_name -> google.protobuf.Duration
+	8,  // 12: pbservice.CheckType.DeregisterCriticalServiceAfter:type_name -> google.protobuf.Duration
+	1,  // 13: pbservice.HealthCheckDefinition.HeaderEntry.value:type_name -> pbservice.HeaderValue
+	1,  // 14: pbservice.CheckType.HeaderEntry.value:type_name -> pbservice.HeaderValue
+	15, // [15:15] is the sub-list for method output_type
+	15, // [15:15] is the sub-list for method input_type
+	15, // [15:15] is the sub-list for extension type_name
+	15, // [15:15] is the sub-list for extension extendee
+	0,  // [0:15] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbservice_healthcheck_proto_init() }
+func file_proto_pbservice_healthcheck_proto_init() {
+	if File_proto_pbservice_healthcheck_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbservice_healthcheck_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HealthCheck); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_healthcheck_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HeaderValue); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_healthcheck_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*HealthCheckDefinition); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_healthcheck_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CheckType); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbservice_healthcheck_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   6,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbservice_healthcheck_proto_goTypes,
+		DependencyIndexes: file_proto_pbservice_healthcheck_proto_depIdxs,
+		MessageInfos:      file_proto_pbservice_healthcheck_proto_msgTypes,
+	}.Build()
+	File_proto_pbservice_healthcheck_proto = out.File
+	file_proto_pbservice_healthcheck_proto_rawDesc = nil
+	file_proto_pbservice_healthcheck_proto_goTypes = nil
+	file_proto_pbservice_healthcheck_proto_depIdxs = nil
 }
diff --git a/proto/pbservice/ids_test.go b/proto/pbservice/ids_test.go
index 2d534e902..09d459aaf 100644
--- a/proto/pbservice/ids_test.go
+++ b/proto/pbservice/ids_test.go
@@ -11,17 +11,17 @@ import (
 func TestCheckServiceNode_UniqueID(t *testing.T) {
 	type testCase struct {
 		name     string
-		csn      CheckServiceNode
+		csn      *CheckServiceNode
 		expected string
 	}
-	fn := func(t *testing.T, tc testCase) {
+	fn := func(t *testing.T, tc *testCase) {
 		require.Equal(t, tc.expected, tc.csn.UniqueID())
 	}
 
 	var testCases = []testCase{
 		{
 			name: "full",
-			csn: CheckServiceNode{
+			csn: &CheckServiceNode{
 				Node: &Node{Node: "the-node-name"},
 				Service: &NodeService{
 					ID:             "the-service-id",
@@ -32,7 +32,7 @@ func TestCheckServiceNode_UniqueID(t *testing.T) {
 		},
 		{
 			name: "without node",
-			csn: CheckServiceNode{
+			csn: &CheckServiceNode{
 				Service: &NodeService{
 					ID:             "the-service-id",
 					EnterpriseMeta: &pbcommon.EnterpriseMeta{Namespace: "the-namespace"},
@@ -42,14 +42,14 @@ func TestCheckServiceNode_UniqueID(t *testing.T) {
 		},
 		{
 			name: "without service",
-			csn: CheckServiceNode{
+			csn: &CheckServiceNode{
 				Node: &Node{Node: "the-node-name"},
 			},
 			expected: "/the-node-name/",
 		},
 		{
 			name: "without namespace",
-			csn: CheckServiceNode{
+			csn: &CheckServiceNode{
 				Node: &Node{Node: "the-node-name"},
 				Service: &NodeService{
 					ID: "the-service-id",
@@ -60,7 +60,7 @@ func TestCheckServiceNode_UniqueID(t *testing.T) {
 	}
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			fn(t, tc)
+			fn(t, &tc)
 		})
 	}
 
diff --git a/proto/pbservice/node.pb.go b/proto/pbservice/node.pb.go
index 556f37d57..44340c9aa 100644
--- a/proto/pbservice/node.pb.go
+++ b/proto/pbservice/node.pb.go
@@ -1,79 +1,92 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbservice/node.proto
 
 package pbservice
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
 	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // CheckServiceNode is used to provide the node, its service
 // definition, as well as a HealthCheck that is associated.
 type CheckServiceNode struct {
-	Node                 *Node          `protobuf:"bytes,1,opt,name=Node,proto3" json:"Node,omitempty"`
-	Service              *NodeService   `protobuf:"bytes,2,opt,name=Service,proto3" json:"Service,omitempty"`
-	Checks               []*HealthCheck `protobuf:"bytes,3,rep,name=Checks,proto3" json:"Checks,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}       `json:"-"`
-	XXX_unrecognized     []byte         `json:"-"`
-	XXX_sizecache        int32          `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Node    *Node          `protobuf:"bytes,1,opt,name=Node,proto3" json:"Node,omitempty"`
+	Service *NodeService   `protobuf:"bytes,2,opt,name=Service,proto3" json:"Service,omitempty"`
+	Checks  []*HealthCheck `protobuf:"bytes,3,rep,name=Checks,proto3" json:"Checks,omitempty"`
 }
 
-func (m *CheckServiceNode) Reset()         { *m = CheckServiceNode{} }
-func (m *CheckServiceNode) String() string { return proto.CompactTextString(m) }
-func (*CheckServiceNode) ProtoMessage()    {}
+func (x *CheckServiceNode) Reset() {
+	*x = CheckServiceNode{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_node_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CheckServiceNode) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CheckServiceNode) ProtoMessage() {}
+
+func (x *CheckServiceNode) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_node_proto_msgTypes[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 CheckServiceNode.ProtoReflect.Descriptor instead.
 func (*CheckServiceNode) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bbc215b78fa95fe5, []int{0}
+	return file_proto_pbservice_node_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *CheckServiceNode) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_CheckServiceNode.Unmarshal(m, b)
-}
-func (m *CheckServiceNode) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_CheckServiceNode.Marshal(b, m, deterministic)
-}
-func (m *CheckServiceNode) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_CheckServiceNode.Merge(m, src)
-}
-func (m *CheckServiceNode) XXX_Size() int {
-	return xxx_messageInfo_CheckServiceNode.Size(m)
-}
-func (m *CheckServiceNode) XXX_DiscardUnknown() {
-	xxx_messageInfo_CheckServiceNode.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_CheckServiceNode proto.InternalMessageInfo
-
-func (m *CheckServiceNode) GetNode() *Node {
-	if m != nil {
-		return m.Node
+func (x *CheckServiceNode) GetNode() *Node {
+	if x != nil {
+		return x.Node
 	}
 	return nil
 }
 
-func (m *CheckServiceNode) GetService() *NodeService {
-	if m != nil {
-		return m.Service
+func (x *CheckServiceNode) GetService() *NodeService {
+	if x != nil {
+		return x.Service
 	}
 	return nil
 }
 
-func (m *CheckServiceNode) GetChecks() []*HealthCheck {
-	if m != nil {
-		return m.Checks
+func (x *CheckServiceNode) GetChecks() []*HealthCheck {
+	if x != nil {
+		return x.Checks
 	}
 	return nil
 }
@@ -86,6 +99,10 @@ func (m *CheckServiceNode) GetChecks() []*HealthCheck {
 // output=node.gen.go
 // name=Structs
 type Node struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// mog: func-to=NodeIDType func-from=string
 	ID              string            `protobuf:"bytes,1,opt,name=ID,proto3" json:"ID,omitempty"`
 	Node            string            `protobuf:"bytes,2,opt,name=Node,proto3" json:"Node,omitempty"`
@@ -95,89 +112,93 @@ type Node struct {
 	TaggedAddresses map[string]string `protobuf:"bytes,5,rep,name=TaggedAddresses,proto3" json:"TaggedAddresses,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	Meta            map[string]string `protobuf:"bytes,6,rep,name=Meta,proto3" json:"Meta,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
 	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
-	RaftIndex            *pbcommon.RaftIndex `protobuf:"bytes,7,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,7,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
 }
 
-func (m *Node) Reset()         { *m = Node{} }
-func (m *Node) String() string { return proto.CompactTextString(m) }
-func (*Node) ProtoMessage()    {}
+func (x *Node) Reset() {
+	*x = Node{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_node_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Node) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Node) ProtoMessage() {}
+
+func (x *Node) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_node_proto_msgTypes[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 Node.ProtoReflect.Descriptor instead.
 func (*Node) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bbc215b78fa95fe5, []int{1}
+	return file_proto_pbservice_node_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *Node) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Node.Unmarshal(m, b)
-}
-func (m *Node) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Node.Marshal(b, m, deterministic)
-}
-func (m *Node) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Node.Merge(m, src)
-}
-func (m *Node) XXX_Size() int {
-	return xxx_messageInfo_Node.Size(m)
-}
-func (m *Node) XXX_DiscardUnknown() {
-	xxx_messageInfo_Node.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Node proto.InternalMessageInfo
-
-func (m *Node) GetID() string {
-	if m != nil {
-		return m.ID
+func (x *Node) GetID() string {
+	if x != nil {
+		return x.ID
 	}
 	return ""
 }
 
-func (m *Node) GetNode() string {
-	if m != nil {
-		return m.Node
+func (x *Node) GetNode() string {
+	if x != nil {
+		return x.Node
 	}
 	return ""
 }
 
-func (m *Node) GetPartition() string {
-	if m != nil {
-		return m.Partition
+func (x *Node) GetPartition() string {
+	if x != nil {
+		return x.Partition
 	}
 	return ""
 }
 
-func (m *Node) GetAddress() string {
-	if m != nil {
-		return m.Address
+func (x *Node) GetAddress() string {
+	if x != nil {
+		return x.Address
 	}
 	return ""
 }
 
-func (m *Node) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *Node) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
 
-func (m *Node) GetTaggedAddresses() map[string]string {
-	if m != nil {
-		return m.TaggedAddresses
+func (x *Node) GetTaggedAddresses() map[string]string {
+	if x != nil {
+		return x.TaggedAddresses
 	}
 	return nil
 }
 
-func (m *Node) GetMeta() map[string]string {
-	if m != nil {
-		return m.Meta
+func (x *Node) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
 	}
 	return nil
 }
 
-func (m *Node) GetRaftIndex() *pbcommon.RaftIndex {
-	if m != nil {
-		return m.RaftIndex
+func (x *Node) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
 	}
 	return nil
 }
@@ -190,6 +211,10 @@ func (m *Node) GetRaftIndex() *pbcommon.RaftIndex {
 // output=node.gen.go
 // name=Structs
 type NodeService struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Kind is the kind of service this is. Different kinds of services may
 	// have differing validation, DNS behavior, etc. An empty kind will default
 	// to the Default kind. See ServiceKind for the full list of kinds.
@@ -243,204 +268,372 @@ type NodeService struct {
 	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
 	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,16,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
 	// mog: func-to=RaftIndexToStructs func-from=NewRaftIndexFromStructs
-	RaftIndex            *pbcommon.RaftIndex `protobuf:"bytes,14,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}            `json:"-"`
-	XXX_unrecognized     []byte              `json:"-"`
-	XXX_sizecache        int32               `json:"-"`
+	RaftIndex *pbcommon.RaftIndex `protobuf:"bytes,14,opt,name=RaftIndex,proto3" json:"RaftIndex,omitempty"`
 }
 
-func (m *NodeService) Reset()         { *m = NodeService{} }
-func (m *NodeService) String() string { return proto.CompactTextString(m) }
-func (*NodeService) ProtoMessage()    {}
+func (x *NodeService) Reset() {
+	*x = NodeService{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_node_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *NodeService) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NodeService) ProtoMessage() {}
+
+func (x *NodeService) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_node_proto_msgTypes[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 NodeService.ProtoReflect.Descriptor instead.
 func (*NodeService) Descriptor() ([]byte, []int) {
-	return fileDescriptor_bbc215b78fa95fe5, []int{2}
+	return file_proto_pbservice_node_proto_rawDescGZIP(), []int{2}
 }
 
-func (m *NodeService) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_NodeService.Unmarshal(m, b)
-}
-func (m *NodeService) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_NodeService.Marshal(b, m, deterministic)
-}
-func (m *NodeService) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_NodeService.Merge(m, src)
-}
-func (m *NodeService) XXX_Size() int {
-	return xxx_messageInfo_NodeService.Size(m)
-}
-func (m *NodeService) XXX_DiscardUnknown() {
-	xxx_messageInfo_NodeService.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_NodeService proto.InternalMessageInfo
-
-func (m *NodeService) GetKind() string {
-	if m != nil {
-		return m.Kind
+func (x *NodeService) GetKind() string {
+	if x != nil {
+		return x.Kind
 	}
 	return ""
 }
 
-func (m *NodeService) GetID() string {
-	if m != nil {
-		return m.ID
+func (x *NodeService) GetID() string {
+	if x != nil {
+		return x.ID
 	}
 	return ""
 }
 
-func (m *NodeService) GetService() string {
-	if m != nil {
-		return m.Service
+func (x *NodeService) GetService() string {
+	if x != nil {
+		return x.Service
 	}
 	return ""
 }
 
-func (m *NodeService) GetTags() []string {
-	if m != nil {
-		return m.Tags
+func (x *NodeService) GetTags() []string {
+	if x != nil {
+		return x.Tags
 	}
 	return nil
 }
 
-func (m *NodeService) GetAddress() string {
-	if m != nil {
-		return m.Address
+func (x *NodeService) GetAddress() string {
+	if x != nil {
+		return x.Address
 	}
 	return ""
 }
 
-func (m *NodeService) GetTaggedAddresses() map[string]*ServiceAddress {
-	if m != nil {
-		return m.TaggedAddresses
+func (x *NodeService) GetTaggedAddresses() map[string]*ServiceAddress {
+	if x != nil {
+		return x.TaggedAddresses
 	}
 	return nil
 }
 
-func (m *NodeService) GetMeta() map[string]string {
-	if m != nil {
-		return m.Meta
+func (x *NodeService) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
 	}
 	return nil
 }
 
-func (m *NodeService) GetPort() int32 {
-	if m != nil {
-		return m.Port
+func (x *NodeService) GetPort() int32 {
+	if x != nil {
+		return x.Port
 	}
 	return 0
 }
 
-func (m *NodeService) GetSocketPath() string {
-	if m != nil {
-		return m.SocketPath
+func (x *NodeService) GetSocketPath() string {
+	if x != nil {
+		return x.SocketPath
 	}
 	return ""
 }
 
-func (m *NodeService) GetWeights() *Weights {
-	if m != nil {
-		return m.Weights
+func (x *NodeService) GetWeights() *Weights {
+	if x != nil {
+		return x.Weights
 	}
 	return nil
 }
 
-func (m *NodeService) GetEnableTagOverride() bool {
-	if m != nil {
-		return m.EnableTagOverride
+func (x *NodeService) GetEnableTagOverride() bool {
+	if x != nil {
+		return x.EnableTagOverride
 	}
 	return false
 }
 
-func (m *NodeService) GetProxy() *ConnectProxyConfig {
-	if m != nil {
-		return m.Proxy
+func (x *NodeService) GetProxy() *ConnectProxyConfig {
+	if x != nil {
+		return x.Proxy
 	}
 	return nil
 }
 
-func (m *NodeService) GetConnect() *ServiceConnect {
-	if m != nil {
-		return m.Connect
+func (x *NodeService) GetConnect() *ServiceConnect {
+	if x != nil {
+		return x.Connect
 	}
 	return nil
 }
 
-func (m *NodeService) GetLocallyRegisteredAsSidecar() bool {
-	if m != nil {
-		return m.LocallyRegisteredAsSidecar
+func (x *NodeService) GetLocallyRegisteredAsSidecar() bool {
+	if x != nil {
+		return x.LocallyRegisteredAsSidecar
 	}
 	return false
 }
 
-func (m *NodeService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if m != nil {
-		return m.EnterpriseMeta
+func (x *NodeService) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
 	}
 	return nil
 }
 
-func (m *NodeService) GetRaftIndex() *pbcommon.RaftIndex {
-	if m != nil {
-		return m.RaftIndex
+func (x *NodeService) GetRaftIndex() *pbcommon.RaftIndex {
+	if x != nil {
+		return x.RaftIndex
 	}
 	return nil
 }
 
-func init() {
-	proto.RegisterType((*CheckServiceNode)(nil), "pbservice.CheckServiceNode")
-	proto.RegisterType((*Node)(nil), "pbservice.Node")
-	proto.RegisterMapType((map[string]string)(nil), "pbservice.Node.MetaEntry")
-	proto.RegisterMapType((map[string]string)(nil), "pbservice.Node.TaggedAddressesEntry")
-	proto.RegisterType((*NodeService)(nil), "pbservice.NodeService")
-	proto.RegisterMapType((map[string]string)(nil), "pbservice.NodeService.MetaEntry")
-	proto.RegisterMapType((map[string]*ServiceAddress)(nil), "pbservice.NodeService.TaggedAddressesEntry")
+var File_proto_pbservice_node_proto protoreflect.FileDescriptor
+
+var file_proto_pbservice_node_proto_rawDesc = []byte{
+	0x0a, 0x1a, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x70, 0x62,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70,
+	0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70,
+	0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65, 0x63,
+	0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70,
+	0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x99, 0x01, 0x0a, 0x10, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x23, 0x0a, 0x04, 0x4e,
+	0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x62, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65,
+	0x12, 0x30, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x16, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f,
+	0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x12, 0x2e, 0x0a, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x03, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x16, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x48,
+	0x65, 0x61, 0x6c, 0x74, 0x68, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x52, 0x06, 0x43, 0x68, 0x65, 0x63,
+	0x6b, 0x73, 0x22, 0xaf, 0x03, 0x0a, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x49,
+	0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e,
+	0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x6f, 0x64, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a,
+	0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07,
+	0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63,
+	0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74,
+	0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65,
+	0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x24, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64,
+	0x65, 0x2e, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x2d, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x2f, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e,
+	0x64, 0x65, 0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52, 0x61,
+	0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x1a, 0x42, 0x0a, 0x14, 0x54, 0x61, 0x67, 0x67, 0x65,
+	0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12,
+	0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65,
+	0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x4d,
+	0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
+	0x3a, 0x02, 0x38, 0x01, 0x22, 0xc9, 0x06, 0x0a, 0x0b, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x44, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09,
+	0x52, 0x04, 0x54, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x12, 0x55, 0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x65, 0x73, 0x18, 0x0f, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x70, 0x62, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+	0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x34, 0x0a, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x18,
+	0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d, 0x65,
+	0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x12, 0x0a,
+	0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72,
+	0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18,
+	0x11, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74,
+	0x68, 0x12, 0x2c, 0x0a, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x18, 0x08, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x57,
+	0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x52, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x12,
+	0x2c, 0x0a, 0x11, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72,
+	0x72, 0x69, 0x64, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x45, 0x6e, 0x61, 0x62,
+	0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x33, 0x0a,
+	0x05, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x70,
+	0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74,
+	0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x50, 0x72, 0x6f,
+	0x78, 0x79, 0x12, 0x33, 0x0a, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18, 0x0c, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x07,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x3e, 0x0a, 0x1a, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
+	0x6c, 0x79, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x41, 0x73, 0x53, 0x69,
+	0x64, 0x65, 0x63, 0x61, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x52, 0x1a, 0x4c, 0x6f, 0x63,
+	0x61, 0x6c, 0x6c, 0x79, 0x52, 0x65, 0x67, 0x69, 0x73, 0x74, 0x65, 0x72, 0x65, 0x64, 0x41, 0x73,
+	0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72, 0x12, 0x3e, 0x0a, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72,
+	0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x16, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
+	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72,
+	0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x2f, 0x0a, 0x09, 0x52, 0x61, 0x66, 0x74, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x63, 0x6f, 0x6d,
+	0x6d, 0x6f, 0x6e, 0x2e, 0x52, 0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x52, 0x09, 0x52,
+	0x61, 0x66, 0x74, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x1a, 0x5d, 0x0a, 0x14, 0x54, 0x61, 0x67, 0x67,
+	0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
+	0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b,
+	0x65, 0x79, 0x12, 0x2f, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x76, 0x61,
+	0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45,
+	0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68,
+	0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62,
+	0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbservice/node.proto", fileDescriptor_bbc215b78fa95fe5)
+var (
+	file_proto_pbservice_node_proto_rawDescOnce sync.Once
+	file_proto_pbservice_node_proto_rawDescData = file_proto_pbservice_node_proto_rawDesc
+)
+
+func file_proto_pbservice_node_proto_rawDescGZIP() []byte {
+	file_proto_pbservice_node_proto_rawDescOnce.Do(func() {
+		file_proto_pbservice_node_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbservice_node_proto_rawDescData)
+	})
+	return file_proto_pbservice_node_proto_rawDescData
 }
 
-var fileDescriptor_bbc215b78fa95fe5 = []byte{
-	// 646 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xdb, 0x6e, 0xd3, 0x40,
-	0x10, 0x55, 0xee, 0xcd, 0x04, 0x7a, 0x59, 0x55, 0x68, 0x09, 0x14, 0x85, 0xc2, 0x43, 0xa5, 0xb6,
-	0x31, 0x6a, 0x91, 0x40, 0x3c, 0x54, 0xea, 0x4d, 0xa2, 0x02, 0x4a, 0xb4, 0x2d, 0x42, 0x42, 0xe2,
-	0x61, 0x63, 0x4f, 0x6d, 0xab, 0xa9, 0x37, 0x5a, 0x6f, 0xab, 0xe6, 0x53, 0xf8, 0x0a, 0xbe, 0x83,
-	0xbf, 0x42, 0x3b, 0xde, 0x24, 0x8e, 0x5b, 0x50, 0x90, 0x78, 0xf2, 0x7a, 0xce, 0x39, 0xb3, 0xe3,
-	0x39, 0x33, 0x86, 0xf6, 0x50, 0x2b, 0xa3, 0xbc, 0x61, 0x3f, 0x45, 0x7d, 0x13, 0xfb, 0xe8, 0x25,
-	0x2a, 0xc0, 0x2e, 0x05, 0x59, 0x73, 0x12, 0x6d, 0x3f, 0x19, 0xd3, 0x7c, 0x75, 0x75, 0xa5, 0x12,
-	0x2f, 0x7b, 0x64, 0xbc, 0xf6, 0xf3, 0x62, 0x8e, 0x08, 0xe5, 0xc0, 0x44, 0x7e, 0x84, 0xfe, 0xa5,
-	0xa3, 0xac, 0x15, 0x29, 0xee, 0x99, 0xc1, 0xeb, 0x3f, 0x4a, 0xb0, 0x7c, 0x68, 0xe9, 0x67, 0x59,
-	0xf8, 0x54, 0x05, 0xc8, 0x5e, 0x40, 0xd5, 0x3e, 0x79, 0xa9, 0x53, 0xda, 0x68, 0xed, 0x2c, 0x75,
-	0x27, 0xe2, 0xae, 0x0d, 0x0b, 0x02, 0xd9, 0x2b, 0x68, 0x38, 0x0d, 0x2f, 0x13, 0xef, 0x51, 0x81,
-	0xe7, 0x50, 0x31, 0xa6, 0xb1, 0x2e, 0xd4, 0xe9, 0xaa, 0x94, 0x57, 0x3a, 0x95, 0x82, 0xe0, 0x3d,
-	0x15, 0x4e, 0xb0, 0x70, 0xac, 0xf5, 0x9f, 0x95, 0xac, 0x0e, 0xb6, 0x08, 0xe5, 0x93, 0x23, 0xaa,
-	0xa6, 0x29, 0xca, 0x27, 0x47, 0x8c, 0xb9, 0xfa, 0xca, 0x14, 0xc9, 0x38, 0x4f, 0xa1, 0xd9, 0x93,
-	0xda, 0xc4, 0x26, 0x56, 0x09, 0x5f, 0x20, 0x60, 0x1a, 0x60, 0x1c, 0x1a, 0xfb, 0x41, 0xa0, 0x31,
-	0xb5, 0x77, 0x5b, 0x6c, 0xfc, 0xca, 0x9e, 0x01, 0x1c, 0x49, 0x23, 0x7d, 0x4c, 0x0c, 0x6a, 0x5e,
-	0x25, 0x30, 0x17, 0x61, 0xa7, 0xb0, 0x74, 0x2e, 0xc3, 0x10, 0x03, 0x27, 0xc0, 0x94, 0xd7, 0xa8,
-	0xfa, 0x97, 0x85, 0xcf, 0xed, 0x16, 0x68, 0xc7, 0x89, 0xd1, 0x23, 0x51, 0x14, 0xb3, 0x6d, 0xa8,
-	0x7e, 0x42, 0x23, 0x79, 0x9d, 0x92, 0x3c, 0x2e, 0x26, 0xb1, 0x58, 0xa6, 0x24, 0x1a, 0xf3, 0xa0,
-	0x29, 0xe4, 0x85, 0x39, 0x49, 0x02, 0xbc, 0xe5, 0x0d, 0xea, 0xf3, 0x4a, 0xd7, 0xcd, 0xc0, 0x04,
-	0x10, 0x53, 0x4e, 0xfb, 0x00, 0x56, 0xef, 0x2b, 0x84, 0x2d, 0x43, 0xe5, 0x12, 0x47, 0xae, 0x89,
-	0xf6, 0xc8, 0x56, 0xa1, 0x76, 0x23, 0x07, 0xd7, 0xe3, 0x36, 0x66, 0x2f, 0xef, 0xca, 0x6f, 0x4b,
-	0xed, 0x37, 0xd0, 0x9c, 0xd4, 0xf1, 0x2f, 0xc2, 0xf5, 0x5f, 0x75, 0x68, 0xe5, 0xac, 0xb7, 0x46,
-	0x7d, 0x88, 0x93, 0xc0, 0x89, 0xe9, 0xec, 0xcc, 0x2c, 0x4f, 0xcc, 0xe4, 0xd3, 0x39, 0x72, 0xd6,
-	0xe4, 0xd4, 0xe7, 0x32, 0x4c, 0x79, 0xb5, 0x53, 0xb1, 0x6a, 0x7b, 0xce, 0x1b, 0x59, 0x9b, 0x35,
-	0xf2, 0xcb, 0x5d, 0xa3, 0x96, 0xa8, 0xc7, 0x9b, 0xf7, 0xcf, 0xe5, 0x9c, 0x7e, 0xbd, 0x9e, 0xf1,
-	0xab, 0xf3, 0x87, 0x5c, 0x45, 0xdb, 0x18, 0x54, 0x7b, 0x4a, 0x1b, 0x72, 0xac, 0x26, 0xe8, 0x6c,
-	0x27, 0xed, 0x4c, 0xf9, 0x97, 0x68, 0x7a, 0xd2, 0x44, 0x7c, 0x25, 0x9b, 0xb4, 0x69, 0x84, 0x6d,
-	0x41, 0xe3, 0x2b, 0xc6, 0x61, 0x64, 0x52, 0x9a, 0xdf, 0xd6, 0x0e, 0xcb, 0x5d, 0xe6, 0x10, 0x31,
-	0xa6, 0xb0, 0x2d, 0x58, 0x39, 0x4e, 0x64, 0x7f, 0x80, 0xe7, 0x32, 0xfc, 0x7c, 0x83, 0x5a, 0xc7,
-	0x01, 0xf2, 0x66, 0xa7, 0xb4, 0xb1, 0x20, 0xee, 0x02, 0x6c, 0x17, 0x6a, 0x3d, 0xad, 0x6e, 0x47,
-	0xbc, 0x45, 0x99, 0xd7, 0x72, 0x99, 0x0f, 0x55, 0x92, 0xa0, 0x6f, 0x08, 0x3e, 0x54, 0xc9, 0x45,
-	0x1c, 0x8a, 0x8c, 0xcb, 0x76, 0xa1, 0xe1, 0x40, 0xfe, 0x80, 0x64, 0xf9, 0x69, 0x75, 0x5f, 0xee,
-	0x08, 0x62, 0xcc, 0x64, 0x7b, 0xd0, 0xfe, 0xa8, 0x7c, 0x39, 0x18, 0x8c, 0x04, 0x86, 0x71, 0x6a,
-	0x50, 0x63, 0xb0, 0x9f, 0x9e, 0xc5, 0x01, 0xfa, 0x52, 0xf3, 0x87, 0x54, 0xe0, 0x5f, 0x18, 0x6c,
-	0x0f, 0x16, 0x8f, 0xed, 0xe2, 0x0d, 0x75, 0x9c, 0x22, 0x75, 0x7e, 0xd9, 0xfd, 0x5d, 0xdc, 0xd4,
-	0xcf, 0xa2, 0xa2, 0xc0, 0x9e, 0x5d, 0x98, 0xc5, 0x39, 0x16, 0xe6, 0xfb, 0xdc, 0x0b, 0xe3, 0xe5,
-	0xe7, 0xfe, 0xde, 0x6e, 0xb8, 0x14, 0xff, 0x63, 0x97, 0x0e, 0xb6, 0xbf, 0x6d, 0x86, 0xb1, 0x89,
-	0xae, 0xfb, 0xb6, 0x7a, 0x2f, 0x92, 0x69, 0x14, 0xfb, 0x4a, 0x0f, 0x3d, 0x5f, 0x25, 0xe9, 0xf5,
-	0xc0, 0x2b, 0xfc, 0xd6, 0xfb, 0x75, 0x0a, 0xec, 0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x69,
-	0xf0, 0xb9, 0x57, 0x06, 0x00, 0x00,
+var file_proto_pbservice_node_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_proto_pbservice_node_proto_goTypes = []interface{}{
+	(*CheckServiceNode)(nil),        // 0: pbservice.CheckServiceNode
+	(*Node)(nil),                    // 1: pbservice.Node
+	(*NodeService)(nil),             // 2: pbservice.NodeService
+	nil,                             // 3: pbservice.Node.TaggedAddressesEntry
+	nil,                             // 4: pbservice.Node.MetaEntry
+	nil,                             // 5: pbservice.NodeService.TaggedAddressesEntry
+	nil,                             // 6: pbservice.NodeService.MetaEntry
+	(*HealthCheck)(nil),             // 7: pbservice.HealthCheck
+	(*pbcommon.RaftIndex)(nil),      // 8: common.RaftIndex
+	(*Weights)(nil),                 // 9: pbservice.Weights
+	(*ConnectProxyConfig)(nil),      // 10: pbservice.ConnectProxyConfig
+	(*ServiceConnect)(nil),          // 11: pbservice.ServiceConnect
+	(*pbcommon.EnterpriseMeta)(nil), // 12: common.EnterpriseMeta
+	(*ServiceAddress)(nil),          // 13: pbservice.ServiceAddress
+}
+var file_proto_pbservice_node_proto_depIdxs = []int32{
+	1,  // 0: pbservice.CheckServiceNode.Node:type_name -> pbservice.Node
+	2,  // 1: pbservice.CheckServiceNode.Service:type_name -> pbservice.NodeService
+	7,  // 2: pbservice.CheckServiceNode.Checks:type_name -> pbservice.HealthCheck
+	3,  // 3: pbservice.Node.TaggedAddresses:type_name -> pbservice.Node.TaggedAddressesEntry
+	4,  // 4: pbservice.Node.Meta:type_name -> pbservice.Node.MetaEntry
+	8,  // 5: pbservice.Node.RaftIndex:type_name -> common.RaftIndex
+	5,  // 6: pbservice.NodeService.TaggedAddresses:type_name -> pbservice.NodeService.TaggedAddressesEntry
+	6,  // 7: pbservice.NodeService.Meta:type_name -> pbservice.NodeService.MetaEntry
+	9,  // 8: pbservice.NodeService.Weights:type_name -> pbservice.Weights
+	10, // 9: pbservice.NodeService.Proxy:type_name -> pbservice.ConnectProxyConfig
+	11, // 10: pbservice.NodeService.Connect:type_name -> pbservice.ServiceConnect
+	12, // 11: pbservice.NodeService.EnterpriseMeta:type_name -> common.EnterpriseMeta
+	8,  // 12: pbservice.NodeService.RaftIndex:type_name -> common.RaftIndex
+	13, // 13: pbservice.NodeService.TaggedAddressesEntry.value:type_name -> pbservice.ServiceAddress
+	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_proto_pbservice_node_proto_init() }
+func file_proto_pbservice_node_proto_init() {
+	if File_proto_pbservice_node_proto != nil {
+		return
+	}
+	file_proto_pbservice_healthcheck_proto_init()
+	file_proto_pbservice_service_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbservice_node_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CheckServiceNode); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_node_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Node); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_node_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NodeService); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbservice_node_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   7,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbservice_node_proto_goTypes,
+		DependencyIndexes: file_proto_pbservice_node_proto_depIdxs,
+		MessageInfos:      file_proto_pbservice_node_proto_msgTypes,
+	}.Build()
+	File_proto_pbservice_node_proto = out.File
+	file_proto_pbservice_node_proto_rawDesc = nil
+	file_proto_pbservice_node_proto_goTypes = nil
+	file_proto_pbservice_node_proto_depIdxs = nil
 }
diff --git a/proto/pbservice/service.pb.go b/proto/pbservice/service.pb.go
index b71a0a387..5749c3928 100644
--- a/proto/pbservice/service.pb.go
+++ b/proto/pbservice/service.pb.go
@@ -1,26 +1,31 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbservice/service.proto
 
 package pbservice
 
 import (
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
-	_struct "github.com/golang/protobuf/ptypes/struct"
 	pbcommon "github.com/hashicorp/consul/proto/pbcommon"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	structpb "google.golang.org/protobuf/types/known/structpb"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // ConnectProxyConfig describes the configuration needed for any proxy managed
 // or unmanaged. It describes a single logical service's listener and optionally
@@ -34,6 +39,10 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
 // output=service.gen.go
 // name=Structs
 type ConnectProxyConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// DestinationServiceName is required and is the name of the service to accept
 	// traffic for.
 	DestinationServiceName string `protobuf:"bytes,1,opt,name=DestinationServiceName,proto3" json:"DestinationServiceName,omitempty"`
@@ -58,7 +67,7 @@ type ConnectProxyConfig struct {
 	// Config is the arbitrary configuration data provided with the proxy
 	// registration.
 	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-	Config *_struct.Struct `protobuf:"bytes,5,opt,name=Config,proto3" json:"Config,omitempty"`
+	Config *structpb.Struct `protobuf:"bytes,5,opt,name=Config,proto3" json:"Config,omitempty"`
 	// Upstreams describes any upstream dependencies the proxy instance should
 	// setup.
 	// mog: func-to=UpstreamsToStructs func-from=NewUpstreamsFromStructs
@@ -74,110 +83,114 @@ type ConnectProxyConfig struct {
 	// transparent mode.
 	TransparentProxy *TransparentProxyConfig `protobuf:"bytes,10,opt,name=TransparentProxy,proto3" json:"TransparentProxy,omitempty"`
 	// LocalServiceSocketPath is the path to the unix domain socket for the local service instance
-	LocalServiceSocketPath string   `protobuf:"bytes,11,opt,name=LocalServiceSocketPath,proto3" json:"LocalServiceSocketPath,omitempty"`
-	XXX_NoUnkeyedLiteral   struct{} `json:"-"`
-	XXX_unrecognized       []byte   `json:"-"`
-	XXX_sizecache          int32    `json:"-"`
+	LocalServiceSocketPath string `protobuf:"bytes,11,opt,name=LocalServiceSocketPath,proto3" json:"LocalServiceSocketPath,omitempty"`
 }
 
-func (m *ConnectProxyConfig) Reset()         { *m = ConnectProxyConfig{} }
-func (m *ConnectProxyConfig) String() string { return proto.CompactTextString(m) }
-func (*ConnectProxyConfig) ProtoMessage()    {}
+func (x *ConnectProxyConfig) Reset() {
+	*x = ConnectProxyConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ConnectProxyConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ConnectProxyConfig) ProtoMessage() {}
+
+func (x *ConnectProxyConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ConnectProxyConfig.ProtoReflect.Descriptor instead.
 func (*ConnectProxyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{0}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *ConnectProxyConfig) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ConnectProxyConfig.Unmarshal(m, b)
-}
-func (m *ConnectProxyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ConnectProxyConfig.Marshal(b, m, deterministic)
-}
-func (m *ConnectProxyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ConnectProxyConfig.Merge(m, src)
-}
-func (m *ConnectProxyConfig) XXX_Size() int {
-	return xxx_messageInfo_ConnectProxyConfig.Size(m)
-}
-func (m *ConnectProxyConfig) XXX_DiscardUnknown() {
-	xxx_messageInfo_ConnectProxyConfig.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ConnectProxyConfig proto.InternalMessageInfo
-
-func (m *ConnectProxyConfig) GetDestinationServiceName() string {
-	if m != nil {
-		return m.DestinationServiceName
+func (x *ConnectProxyConfig) GetDestinationServiceName() string {
+	if x != nil {
+		return x.DestinationServiceName
 	}
 	return ""
 }
 
-func (m *ConnectProxyConfig) GetDestinationServiceID() string {
-	if m != nil {
-		return m.DestinationServiceID
+func (x *ConnectProxyConfig) GetDestinationServiceID() string {
+	if x != nil {
+		return x.DestinationServiceID
 	}
 	return ""
 }
 
-func (m *ConnectProxyConfig) GetLocalServiceAddress() string {
-	if m != nil {
-		return m.LocalServiceAddress
+func (x *ConnectProxyConfig) GetLocalServiceAddress() string {
+	if x != nil {
+		return x.LocalServiceAddress
 	}
 	return ""
 }
 
-func (m *ConnectProxyConfig) GetLocalServicePort() int32 {
-	if m != nil {
-		return m.LocalServicePort
+func (x *ConnectProxyConfig) GetLocalServicePort() int32 {
+	if x != nil {
+		return x.LocalServicePort
 	}
 	return 0
 }
 
-func (m *ConnectProxyConfig) GetConfig() *_struct.Struct {
-	if m != nil {
-		return m.Config
+func (x *ConnectProxyConfig) GetConfig() *structpb.Struct {
+	if x != nil {
+		return x.Config
 	}
 	return nil
 }
 
-func (m *ConnectProxyConfig) GetUpstreams() []*Upstream {
-	if m != nil {
-		return m.Upstreams
+func (x *ConnectProxyConfig) GetUpstreams() []*Upstream {
+	if x != nil {
+		return x.Upstreams
 	}
 	return nil
 }
 
-func (m *ConnectProxyConfig) GetMeshGateway() *MeshGatewayConfig {
-	if m != nil {
-		return m.MeshGateway
+func (x *ConnectProxyConfig) GetMeshGateway() *MeshGatewayConfig {
+	if x != nil {
+		return x.MeshGateway
 	}
 	return nil
 }
 
-func (m *ConnectProxyConfig) GetExpose() *ExposeConfig {
-	if m != nil {
-		return m.Expose
+func (x *ConnectProxyConfig) GetExpose() *ExposeConfig {
+	if x != nil {
+		return x.Expose
 	}
 	return nil
 }
 
-func (m *ConnectProxyConfig) GetMode() string {
-	if m != nil {
-		return m.Mode
+func (x *ConnectProxyConfig) GetMode() string {
+	if x != nil {
+		return x.Mode
 	}
 	return ""
 }
 
-func (m *ConnectProxyConfig) GetTransparentProxy() *TransparentProxyConfig {
-	if m != nil {
-		return m.TransparentProxy
+func (x *ConnectProxyConfig) GetTransparentProxy() *TransparentProxyConfig {
+	if x != nil {
+		return x.TransparentProxy
 	}
 	return nil
 }
 
-func (m *ConnectProxyConfig) GetLocalServiceSocketPath() string {
-	if m != nil {
-		return m.LocalServiceSocketPath
+func (x *ConnectProxyConfig) GetLocalServiceSocketPath() string {
+	if x != nil {
+		return x.LocalServiceSocketPath
 	}
 	return ""
 }
@@ -194,6 +207,10 @@ func (m *ConnectProxyConfig) GetLocalServiceSocketPath() string {
 // name=Structs
 // ignore-fields=IngressHosts
 type Upstream struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Destination fields are the required ones for determining what this upstream
 	// points to. Depending on DestinationType some other fields below might
 	// further restrict the set of instances allowable.
@@ -219,126 +236,130 @@ type Upstream struct {
 	// It can be used to pass arbitrary configuration for this specific upstream
 	// to the proxy.
 	// mog: func-to=ProtobufTypesStructToMapStringInterface func-from=MapStringInterfaceToProtobufTypesStruct
-	Config *_struct.Struct `protobuf:"bytes,7,opt,name=Config,proto3" json:"Config,omitempty"`
+	Config *structpb.Struct `protobuf:"bytes,7,opt,name=Config,proto3" json:"Config,omitempty"`
 	// MeshGateway is the configuration for mesh gateway usage of this upstream
 	MeshGateway *MeshGatewayConfig `protobuf:"bytes,8,opt,name=MeshGateway,proto3" json:"MeshGateway,omitempty"`
 	// CentrallyConfigured indicates whether the upstream was defined in a proxy
 	// instance registration or whether it was generated from a config entry.
 	CentrallyConfigured bool `protobuf:"varint,9,opt,name=CentrallyConfigured,proto3" json:"CentrallyConfigured,omitempty"`
 	// LocalBindSocketPath is the socket to create to connect to the upstream service
-	LocalBindSocketPath  string   `protobuf:"bytes,10,opt,name=LocalBindSocketPath,proto3" json:"LocalBindSocketPath,omitempty"`
-	LocalBindSocketMode  string   `protobuf:"bytes,11,opt,name=LocalBindSocketMode,proto3" json:"LocalBindSocketMode,omitempty"`
-	DestinationPartition string   `protobuf:"bytes,12,opt,name=DestinationPartition,proto3" json:"DestinationPartition,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	LocalBindSocketPath  string `protobuf:"bytes,10,opt,name=LocalBindSocketPath,proto3" json:"LocalBindSocketPath,omitempty"`
+	LocalBindSocketMode  string `protobuf:"bytes,11,opt,name=LocalBindSocketMode,proto3" json:"LocalBindSocketMode,omitempty"`
+	DestinationPartition string `protobuf:"bytes,12,opt,name=DestinationPartition,proto3" json:"DestinationPartition,omitempty"`
 }
 
-func (m *Upstream) Reset()         { *m = Upstream{} }
-func (m *Upstream) String() string { return proto.CompactTextString(m) }
-func (*Upstream) ProtoMessage()    {}
+func (x *Upstream) Reset() {
+	*x = Upstream{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Upstream) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Upstream) ProtoMessage() {}
+
+func (x *Upstream) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Upstream.ProtoReflect.Descriptor instead.
 func (*Upstream) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{1}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *Upstream) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Upstream.Unmarshal(m, b)
-}
-func (m *Upstream) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Upstream.Marshal(b, m, deterministic)
-}
-func (m *Upstream) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Upstream.Merge(m, src)
-}
-func (m *Upstream) XXX_Size() int {
-	return xxx_messageInfo_Upstream.Size(m)
-}
-func (m *Upstream) XXX_DiscardUnknown() {
-	xxx_messageInfo_Upstream.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Upstream proto.InternalMessageInfo
-
-func (m *Upstream) GetDestinationType() string {
-	if m != nil {
-		return m.DestinationType
+func (x *Upstream) GetDestinationType() string {
+	if x != nil {
+		return x.DestinationType
 	}
 	return ""
 }
 
-func (m *Upstream) GetDestinationNamespace() string {
-	if m != nil {
-		return m.DestinationNamespace
+func (x *Upstream) GetDestinationNamespace() string {
+	if x != nil {
+		return x.DestinationNamespace
 	}
 	return ""
 }
 
-func (m *Upstream) GetDestinationName() string {
-	if m != nil {
-		return m.DestinationName
+func (x *Upstream) GetDestinationName() string {
+	if x != nil {
+		return x.DestinationName
 	}
 	return ""
 }
 
-func (m *Upstream) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *Upstream) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
 
-func (m *Upstream) GetLocalBindAddress() string {
-	if m != nil {
-		return m.LocalBindAddress
+func (x *Upstream) GetLocalBindAddress() string {
+	if x != nil {
+		return x.LocalBindAddress
 	}
 	return ""
 }
 
-func (m *Upstream) GetLocalBindPort() int32 {
-	if m != nil {
-		return m.LocalBindPort
+func (x *Upstream) GetLocalBindPort() int32 {
+	if x != nil {
+		return x.LocalBindPort
 	}
 	return 0
 }
 
-func (m *Upstream) GetConfig() *_struct.Struct {
-	if m != nil {
-		return m.Config
+func (x *Upstream) GetConfig() *structpb.Struct {
+	if x != nil {
+		return x.Config
 	}
 	return nil
 }
 
-func (m *Upstream) GetMeshGateway() *MeshGatewayConfig {
-	if m != nil {
-		return m.MeshGateway
+func (x *Upstream) GetMeshGateway() *MeshGatewayConfig {
+	if x != nil {
+		return x.MeshGateway
 	}
 	return nil
 }
 
-func (m *Upstream) GetCentrallyConfigured() bool {
-	if m != nil {
-		return m.CentrallyConfigured
+func (x *Upstream) GetCentrallyConfigured() bool {
+	if x != nil {
+		return x.CentrallyConfigured
 	}
 	return false
 }
 
-func (m *Upstream) GetLocalBindSocketPath() string {
-	if m != nil {
-		return m.LocalBindSocketPath
+func (x *Upstream) GetLocalBindSocketPath() string {
+	if x != nil {
+		return x.LocalBindSocketPath
 	}
 	return ""
 }
 
-func (m *Upstream) GetLocalBindSocketMode() string {
-	if m != nil {
-		return m.LocalBindSocketMode
+func (x *Upstream) GetLocalBindSocketMode() string {
+	if x != nil {
+		return x.LocalBindSocketMode
 	}
 	return ""
 }
 
-func (m *Upstream) GetDestinationPartition() string {
-	if m != nil {
-		return m.DestinationPartition
+func (x *Upstream) GetDestinationPartition() string {
+	if x != nil {
+		return x.DestinationPartition
 	}
 	return ""
 }
@@ -351,6 +372,10 @@ func (m *Upstream) GetDestinationPartition() string {
 // output=service.gen.go
 // name=Structs
 type ServiceConnect struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Native is true when this service can natively understand Connect.
 	Native bool `protobuf:"varint,1,opt,name=Native,proto3" json:"Native,omitempty"`
 	// SidecarService is a nested Service Definition to register at the same time.
@@ -361,47 +386,51 @@ type ServiceConnect struct {
 	// result is identical to just making a second service registration via any
 	// other means.
 	// mog: func-to=ServiceDefinitionPtrToStructs func-from=NewServiceDefinitionPtrFromStructs
-	SidecarService       *ServiceDefinition `protobuf:"bytes,3,opt,name=SidecarService,proto3" json:"SidecarService,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}           `json:"-"`
-	XXX_unrecognized     []byte             `json:"-"`
-	XXX_sizecache        int32              `json:"-"`
+	SidecarService *ServiceDefinition `protobuf:"bytes,3,opt,name=SidecarService,proto3" json:"SidecarService,omitempty"`
 }
 
-func (m *ServiceConnect) Reset()         { *m = ServiceConnect{} }
-func (m *ServiceConnect) String() string { return proto.CompactTextString(m) }
-func (*ServiceConnect) ProtoMessage()    {}
+func (x *ServiceConnect) Reset() {
+	*x = ServiceConnect{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceConnect) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceConnect) ProtoMessage() {}
+
+func (x *ServiceConnect) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceConnect.ProtoReflect.Descriptor instead.
 func (*ServiceConnect) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{2}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{2}
 }
 
-func (m *ServiceConnect) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ServiceConnect.Unmarshal(m, b)
-}
-func (m *ServiceConnect) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ServiceConnect.Marshal(b, m, deterministic)
-}
-func (m *ServiceConnect) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceConnect.Merge(m, src)
-}
-func (m *ServiceConnect) XXX_Size() int {
-	return xxx_messageInfo_ServiceConnect.Size(m)
-}
-func (m *ServiceConnect) XXX_DiscardUnknown() {
-	xxx_messageInfo_ServiceConnect.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ServiceConnect proto.InternalMessageInfo
-
-func (m *ServiceConnect) GetNative() bool {
-	if m != nil {
-		return m.Native
+func (x *ServiceConnect) GetNative() bool {
+	if x != nil {
+		return x.Native
 	}
 	return false
 }
 
-func (m *ServiceConnect) GetSidecarService() *ServiceDefinition {
-	if m != nil {
-		return m.SidecarService
+func (x *ServiceConnect) GetSidecarService() *ServiceDefinition {
+	if x != nil {
+		return x.SidecarService
 	}
 	return nil
 }
@@ -415,52 +444,60 @@ func (m *ServiceConnect) GetSidecarService() *ServiceDefinition {
 // output=service.gen.go
 // name=Structs
 type ExposeConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Checks defines whether paths associated with Consul checks will be exposed.
 	// This flag triggers exposing all HTTP and GRPC check paths registered for the service.
 	Checks bool `protobuf:"varint,1,opt,name=Checks,proto3" json:"Checks,omitempty"`
 	// Paths is the list of paths exposed through the proxy.
 	// mog: func-to=ExposePathSliceToStructs func-from=NewExposePathSliceFromStructs
-	Paths                []*ExposePath `protobuf:"bytes,2,rep,name=Paths,proto3" json:"Paths,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}      `json:"-"`
-	XXX_unrecognized     []byte        `json:"-"`
-	XXX_sizecache        int32         `json:"-"`
+	Paths []*ExposePath `protobuf:"bytes,2,rep,name=Paths,proto3" json:"Paths,omitempty"`
 }
 
-func (m *ExposeConfig) Reset()         { *m = ExposeConfig{} }
-func (m *ExposeConfig) String() string { return proto.CompactTextString(m) }
-func (*ExposeConfig) ProtoMessage()    {}
+func (x *ExposeConfig) Reset() {
+	*x = ExposeConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExposeConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExposeConfig) ProtoMessage() {}
+
+func (x *ExposeConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExposeConfig.ProtoReflect.Descriptor instead.
 func (*ExposeConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{3}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{3}
 }
 
-func (m *ExposeConfig) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ExposeConfig.Unmarshal(m, b)
-}
-func (m *ExposeConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ExposeConfig.Marshal(b, m, deterministic)
-}
-func (m *ExposeConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExposeConfig.Merge(m, src)
-}
-func (m *ExposeConfig) XXX_Size() int {
-	return xxx_messageInfo_ExposeConfig.Size(m)
-}
-func (m *ExposeConfig) XXX_DiscardUnknown() {
-	xxx_messageInfo_ExposeConfig.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ExposeConfig proto.InternalMessageInfo
-
-func (m *ExposeConfig) GetChecks() bool {
-	if m != nil {
-		return m.Checks
+func (x *ExposeConfig) GetChecks() bool {
+	if x != nil {
+		return x.Checks
 	}
 	return false
 }
 
-func (m *ExposeConfig) GetPaths() []*ExposePath {
-	if m != nil {
-		return m.Paths
+func (x *ExposeConfig) GetPaths() []*ExposePath {
+	if x != nil {
+		return x.Paths
 	}
 	return nil
 }
@@ -471,6 +508,10 @@ func (m *ExposeConfig) GetPaths() []*ExposePath {
 // output=service.gen.go
 // name=Structs
 type ExposePath struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// ListenerPort defines the port of the proxy's listener for exposed paths.
 	// mog: func-to=int func-from=int32
 	ListenerPort int32 `protobuf:"varint,1,opt,name=ListenerPort,proto3" json:"ListenerPort,omitempty"`
@@ -483,68 +524,72 @@ type ExposePath struct {
 	// Valid values are "http" and "http2", defaults to "http"
 	Protocol string `protobuf:"bytes,4,opt,name=Protocol,proto3" json:"Protocol,omitempty"`
 	// ParsedFromCheck is set if this path was parsed from a registered check
-	ParsedFromCheck      bool     `protobuf:"varint,5,opt,name=ParsedFromCheck,proto3" json:"ParsedFromCheck,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	ParsedFromCheck bool `protobuf:"varint,5,opt,name=ParsedFromCheck,proto3" json:"ParsedFromCheck,omitempty"`
 }
 
-func (m *ExposePath) Reset()         { *m = ExposePath{} }
-func (m *ExposePath) String() string { return proto.CompactTextString(m) }
-func (*ExposePath) ProtoMessage()    {}
+func (x *ExposePath) Reset() {
+	*x = ExposePath{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[4]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ExposePath) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ExposePath) ProtoMessage() {}
+
+func (x *ExposePath) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[4]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ExposePath.ProtoReflect.Descriptor instead.
 func (*ExposePath) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{4}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{4}
 }
 
-func (m *ExposePath) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ExposePath.Unmarshal(m, b)
-}
-func (m *ExposePath) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ExposePath.Marshal(b, m, deterministic)
-}
-func (m *ExposePath) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ExposePath.Merge(m, src)
-}
-func (m *ExposePath) XXX_Size() int {
-	return xxx_messageInfo_ExposePath.Size(m)
-}
-func (m *ExposePath) XXX_DiscardUnknown() {
-	xxx_messageInfo_ExposePath.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ExposePath proto.InternalMessageInfo
-
-func (m *ExposePath) GetListenerPort() int32 {
-	if m != nil {
-		return m.ListenerPort
+func (x *ExposePath) GetListenerPort() int32 {
+	if x != nil {
+		return x.ListenerPort
 	}
 	return 0
 }
 
-func (m *ExposePath) GetPath() string {
-	if m != nil {
-		return m.Path
+func (x *ExposePath) GetPath() string {
+	if x != nil {
+		return x.Path
 	}
 	return ""
 }
 
-func (m *ExposePath) GetLocalPathPort() int32 {
-	if m != nil {
-		return m.LocalPathPort
+func (x *ExposePath) GetLocalPathPort() int32 {
+	if x != nil {
+		return x.LocalPathPort
 	}
 	return 0
 }
 
-func (m *ExposePath) GetProtocol() string {
-	if m != nil {
-		return m.Protocol
+func (x *ExposePath) GetProtocol() string {
+	if x != nil {
+		return x.Protocol
 	}
 	return ""
 }
 
-func (m *ExposePath) GetParsedFromCheck() bool {
-	if m != nil {
-		return m.ParsedFromCheck
+func (x *ExposePath) GetParsedFromCheck() bool {
+	if x != nil {
+		return x.ParsedFromCheck
 	}
 	return false
 }
@@ -555,41 +600,49 @@ func (m *ExposePath) GetParsedFromCheck() bool {
 // output=service.gen.go
 // name=Structs
 type MeshGatewayConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// mog: func-to=structs.MeshGatewayMode func-from=string
-	Mode                 string   `protobuf:"bytes,1,opt,name=Mode,proto3" json:"Mode,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Mode string `protobuf:"bytes,1,opt,name=Mode,proto3" json:"Mode,omitempty"`
 }
 
-func (m *MeshGatewayConfig) Reset()         { *m = MeshGatewayConfig{} }
-func (m *MeshGatewayConfig) String() string { return proto.CompactTextString(m) }
-func (*MeshGatewayConfig) ProtoMessage()    {}
+func (x *MeshGatewayConfig) Reset() {
+	*x = MeshGatewayConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[5]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *MeshGatewayConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*MeshGatewayConfig) ProtoMessage() {}
+
+func (x *MeshGatewayConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[5]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use MeshGatewayConfig.ProtoReflect.Descriptor instead.
 func (*MeshGatewayConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{5}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{5}
 }
 
-func (m *MeshGatewayConfig) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_MeshGatewayConfig.Unmarshal(m, b)
-}
-func (m *MeshGatewayConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_MeshGatewayConfig.Marshal(b, m, deterministic)
-}
-func (m *MeshGatewayConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_MeshGatewayConfig.Merge(m, src)
-}
-func (m *MeshGatewayConfig) XXX_Size() int {
-	return xxx_messageInfo_MeshGatewayConfig.Size(m)
-}
-func (m *MeshGatewayConfig) XXX_DiscardUnknown() {
-	xxx_messageInfo_MeshGatewayConfig.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_MeshGatewayConfig proto.InternalMessageInfo
-
-func (m *MeshGatewayConfig) GetMode() string {
-	if m != nil {
-		return m.Mode
+func (x *MeshGatewayConfig) GetMode() string {
+	if x != nil {
+		return x.Mode
 	}
 	return ""
 }
@@ -600,52 +653,60 @@ func (m *MeshGatewayConfig) GetMode() string {
 // output=service.gen.go
 // name=Structs
 type TransparentProxyConfig struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// mog: func-to=int func-from=int32
 	OutboundListenerPort int32 `protobuf:"varint,1,opt,name=OutboundListenerPort,proto3" json:"OutboundListenerPort,omitempty"`
 	// DialedDirectly indicates whether transparent proxies can dial this proxy instance directly.
 	// The discovery chain is not considered when dialing a service instance directly.
 	// This setting is useful when addressing stateful services, such as a database cluster with a leader node.
-	DialedDirectly       bool     `protobuf:"varint,2,opt,name=DialedDirectly,proto3" json:"DialedDirectly,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	DialedDirectly bool `protobuf:"varint,2,opt,name=DialedDirectly,proto3" json:"DialedDirectly,omitempty"`
 }
 
-func (m *TransparentProxyConfig) Reset()         { *m = TransparentProxyConfig{} }
-func (m *TransparentProxyConfig) String() string { return proto.CompactTextString(m) }
-func (*TransparentProxyConfig) ProtoMessage()    {}
+func (x *TransparentProxyConfig) Reset() {
+	*x = TransparentProxyConfig{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[6]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TransparentProxyConfig) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TransparentProxyConfig) ProtoMessage() {}
+
+func (x *TransparentProxyConfig) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[6]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TransparentProxyConfig.ProtoReflect.Descriptor instead.
 func (*TransparentProxyConfig) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{6}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{6}
 }
 
-func (m *TransparentProxyConfig) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_TransparentProxyConfig.Unmarshal(m, b)
-}
-func (m *TransparentProxyConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_TransparentProxyConfig.Marshal(b, m, deterministic)
-}
-func (m *TransparentProxyConfig) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_TransparentProxyConfig.Merge(m, src)
-}
-func (m *TransparentProxyConfig) XXX_Size() int {
-	return xxx_messageInfo_TransparentProxyConfig.Size(m)
-}
-func (m *TransparentProxyConfig) XXX_DiscardUnknown() {
-	xxx_messageInfo_TransparentProxyConfig.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_TransparentProxyConfig proto.InternalMessageInfo
-
-func (m *TransparentProxyConfig) GetOutboundListenerPort() int32 {
-	if m != nil {
-		return m.OutboundListenerPort
+func (x *TransparentProxyConfig) GetOutboundListenerPort() int32 {
+	if x != nil {
+		return x.OutboundListenerPort
 	}
 	return 0
 }
 
-func (m *TransparentProxyConfig) GetDialedDirectly() bool {
-	if m != nil {
-		return m.DialedDirectly
+func (x *TransparentProxyConfig) GetDialedDirectly() bool {
+	if x != nil {
+		return x.DialedDirectly
 	}
 	return false
 }
@@ -659,6 +720,10 @@ func (m *TransparentProxyConfig) GetDialedDirectly() bool {
 // output=service.gen.go
 // name=Structs
 type ServiceDefinition struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// mog: func-to=structs.ServiceKind func-from=string
 	Kind    string   `protobuf:"bytes,1,opt,name=Kind,proto3" json:"Kind,omitempty"`
 	ID      string   `protobuf:"bytes,2,opt,name=ID,proto3" json:"ID,omitempty"`
@@ -694,342 +759,660 @@ type ServiceDefinition struct {
 	// mog: func-to=EnterpriseMetaToStructs func-from=NewEnterpriseMetaFromStructs
 	EnterpriseMeta *pbcommon.EnterpriseMeta `protobuf:"bytes,17,opt,name=EnterpriseMeta,proto3" json:"EnterpriseMeta,omitempty"`
 	// mog: func-to=ServiceConnectPtrToStructs func-from=NewServiceConnectPtrFromStructs
-	Connect              *ServiceConnect `protobuf:"bytes,15,opt,name=Connect,proto3" json:"Connect,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
-	XXX_unrecognized     []byte          `json:"-"`
-	XXX_sizecache        int32           `json:"-"`
+	Connect *ServiceConnect `protobuf:"bytes,15,opt,name=Connect,proto3" json:"Connect,omitempty"`
 }
 
-func (m *ServiceDefinition) Reset()         { *m = ServiceDefinition{} }
-func (m *ServiceDefinition) String() string { return proto.CompactTextString(m) }
-func (*ServiceDefinition) ProtoMessage()    {}
+func (x *ServiceDefinition) Reset() {
+	*x = ServiceDefinition{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceDefinition) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceDefinition) ProtoMessage() {}
+
+func (x *ServiceDefinition) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceDefinition.ProtoReflect.Descriptor instead.
 func (*ServiceDefinition) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{7}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{7}
 }
 
-func (m *ServiceDefinition) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ServiceDefinition.Unmarshal(m, b)
-}
-func (m *ServiceDefinition) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ServiceDefinition.Marshal(b, m, deterministic)
-}
-func (m *ServiceDefinition) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceDefinition.Merge(m, src)
-}
-func (m *ServiceDefinition) XXX_Size() int {
-	return xxx_messageInfo_ServiceDefinition.Size(m)
-}
-func (m *ServiceDefinition) XXX_DiscardUnknown() {
-	xxx_messageInfo_ServiceDefinition.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ServiceDefinition proto.InternalMessageInfo
-
-func (m *ServiceDefinition) GetKind() string {
-	if m != nil {
-		return m.Kind
+func (x *ServiceDefinition) GetKind() string {
+	if x != nil {
+		return x.Kind
 	}
 	return ""
 }
 
-func (m *ServiceDefinition) GetID() string {
-	if m != nil {
-		return m.ID
+func (x *ServiceDefinition) GetID() string {
+	if x != nil {
+		return x.ID
 	}
 	return ""
 }
 
-func (m *ServiceDefinition) GetName() string {
-	if m != nil {
-		return m.Name
+func (x *ServiceDefinition) GetName() string {
+	if x != nil {
+		return x.Name
 	}
 	return ""
 }
 
-func (m *ServiceDefinition) GetTags() []string {
-	if m != nil {
-		return m.Tags
+func (x *ServiceDefinition) GetTags() []string {
+	if x != nil {
+		return x.Tags
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetAddress() string {
-	if m != nil {
-		return m.Address
+func (x *ServiceDefinition) GetAddress() string {
+	if x != nil {
+		return x.Address
 	}
 	return ""
 }
 
-func (m *ServiceDefinition) GetTaggedAddresses() map[string]*ServiceAddress {
-	if m != nil {
-		return m.TaggedAddresses
+func (x *ServiceDefinition) GetTaggedAddresses() map[string]*ServiceAddress {
+	if x != nil {
+		return x.TaggedAddresses
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetMeta() map[string]string {
-	if m != nil {
-		return m.Meta
+func (x *ServiceDefinition) GetMeta() map[string]string {
+	if x != nil {
+		return x.Meta
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetPort() int32 {
-	if m != nil {
-		return m.Port
+func (x *ServiceDefinition) GetPort() int32 {
+	if x != nil {
+		return x.Port
 	}
 	return 0
 }
 
-func (m *ServiceDefinition) GetSocketPath() string {
-	if m != nil {
-		return m.SocketPath
+func (x *ServiceDefinition) GetSocketPath() string {
+	if x != nil {
+		return x.SocketPath
 	}
 	return ""
 }
 
-func (m *ServiceDefinition) GetCheck() *CheckType {
-	if m != nil {
-		return m.Check
+func (x *ServiceDefinition) GetCheck() *CheckType {
+	if x != nil {
+		return x.Check
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetChecks() []*CheckType {
-	if m != nil {
-		return m.Checks
+func (x *ServiceDefinition) GetChecks() []*CheckType {
+	if x != nil {
+		return x.Checks
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetWeights() *Weights {
-	if m != nil {
-		return m.Weights
+func (x *ServiceDefinition) GetWeights() *Weights {
+	if x != nil {
+		return x.Weights
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetToken() string {
-	if m != nil {
-		return m.Token
+func (x *ServiceDefinition) GetToken() string {
+	if x != nil {
+		return x.Token
 	}
 	return ""
 }
 
-func (m *ServiceDefinition) GetEnableTagOverride() bool {
-	if m != nil {
-		return m.EnableTagOverride
+func (x *ServiceDefinition) GetEnableTagOverride() bool {
+	if x != nil {
+		return x.EnableTagOverride
 	}
 	return false
 }
 
-func (m *ServiceDefinition) GetProxy() *ConnectProxyConfig {
-	if m != nil {
-		return m.Proxy
+func (x *ServiceDefinition) GetProxy() *ConnectProxyConfig {
+	if x != nil {
+		return x.Proxy
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
-	if m != nil {
-		return m.EnterpriseMeta
+func (x *ServiceDefinition) GetEnterpriseMeta() *pbcommon.EnterpriseMeta {
+	if x != nil {
+		return x.EnterpriseMeta
 	}
 	return nil
 }
 
-func (m *ServiceDefinition) GetConnect() *ServiceConnect {
-	if m != nil {
-		return m.Connect
+func (x *ServiceDefinition) GetConnect() *ServiceConnect {
+	if x != nil {
+		return x.Connect
 	}
 	return nil
 }
 
 // Type to hold an address and port of a service
 type ServiceAddress struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	Address string `protobuf:"bytes,1,opt,name=Address,proto3" json:"Address,omitempty"`
 	// mog: func-to=int func-from=int32
-	Port                 int32    `protobuf:"varint,2,opt,name=Port,proto3" json:"Port,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Port int32 `protobuf:"varint,2,opt,name=Port,proto3" json:"Port,omitempty"`
 }
 
-func (m *ServiceAddress) Reset()         { *m = ServiceAddress{} }
-func (m *ServiceAddress) String() string { return proto.CompactTextString(m) }
-func (*ServiceAddress) ProtoMessage()    {}
+func (x *ServiceAddress) Reset() {
+	*x = ServiceAddress{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[8]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceAddress) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceAddress) ProtoMessage() {}
+
+func (x *ServiceAddress) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[8]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceAddress.ProtoReflect.Descriptor instead.
 func (*ServiceAddress) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{8}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{8}
 }
 
-func (m *ServiceAddress) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ServiceAddress.Unmarshal(m, b)
-}
-func (m *ServiceAddress) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ServiceAddress.Marshal(b, m, deterministic)
-}
-func (m *ServiceAddress) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceAddress.Merge(m, src)
-}
-func (m *ServiceAddress) XXX_Size() int {
-	return xxx_messageInfo_ServiceAddress.Size(m)
-}
-func (m *ServiceAddress) XXX_DiscardUnknown() {
-	xxx_messageInfo_ServiceAddress.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ServiceAddress proto.InternalMessageInfo
-
-func (m *ServiceAddress) GetAddress() string {
-	if m != nil {
-		return m.Address
+func (x *ServiceAddress) GetAddress() string {
+	if x != nil {
+		return x.Address
 	}
 	return ""
 }
 
-func (m *ServiceAddress) GetPort() int32 {
-	if m != nil {
-		return m.Port
+func (x *ServiceAddress) GetPort() int32 {
+	if x != nil {
+		return x.Port
 	}
 	return 0
 }
 
 // Weights represent the weight used by DNS for a given status
 type Weights struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// mog: func-to=int func-from=int32
 	Passing int32 `protobuf:"varint,1,opt,name=Passing,proto3" json:"Passing,omitempty"`
 	// mog: func-to=int func-from=int32
-	Warning              int32    `protobuf:"varint,2,opt,name=Warning,proto3" json:"Warning,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Warning int32 `protobuf:"varint,2,opt,name=Warning,proto3" json:"Warning,omitempty"`
 }
 
-func (m *Weights) Reset()         { *m = Weights{} }
-func (m *Weights) String() string { return proto.CompactTextString(m) }
-func (*Weights) ProtoMessage()    {}
+func (x *Weights) Reset() {
+	*x = Weights{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbservice_service_proto_msgTypes[9]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Weights) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Weights) ProtoMessage() {}
+
+func (x *Weights) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbservice_service_proto_msgTypes[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 Weights.ProtoReflect.Descriptor instead.
 func (*Weights) Descriptor() ([]byte, []int) {
-	return fileDescriptor_cbb99233b75fb80b, []int{9}
+	return file_proto_pbservice_service_proto_rawDescGZIP(), []int{9}
 }
 
-func (m *Weights) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Weights.Unmarshal(m, b)
-}
-func (m *Weights) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Weights.Marshal(b, m, deterministic)
-}
-func (m *Weights) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Weights.Merge(m, src)
-}
-func (m *Weights) XXX_Size() int {
-	return xxx_messageInfo_Weights.Size(m)
-}
-func (m *Weights) XXX_DiscardUnknown() {
-	xxx_messageInfo_Weights.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Weights proto.InternalMessageInfo
-
-func (m *Weights) GetPassing() int32 {
-	if m != nil {
-		return m.Passing
+func (x *Weights) GetPassing() int32 {
+	if x != nil {
+		return x.Passing
 	}
 	return 0
 }
 
-func (m *Weights) GetWarning() int32 {
-	if m != nil {
-		return m.Warning
+func (x *Weights) GetWarning() int32 {
+	if x != nil {
+		return x.Warning
 	}
 	return 0
 }
 
-func init() {
-	proto.RegisterType((*ConnectProxyConfig)(nil), "pbservice.ConnectProxyConfig")
-	proto.RegisterType((*Upstream)(nil), "pbservice.Upstream")
-	proto.RegisterType((*ServiceConnect)(nil), "pbservice.ServiceConnect")
-	proto.RegisterType((*ExposeConfig)(nil), "pbservice.ExposeConfig")
-	proto.RegisterType((*ExposePath)(nil), "pbservice.ExposePath")
-	proto.RegisterType((*MeshGatewayConfig)(nil), "pbservice.MeshGatewayConfig")
-	proto.RegisterType((*TransparentProxyConfig)(nil), "pbservice.TransparentProxyConfig")
-	proto.RegisterType((*ServiceDefinition)(nil), "pbservice.ServiceDefinition")
-	proto.RegisterMapType((map[string]string)(nil), "pbservice.ServiceDefinition.MetaEntry")
-	proto.RegisterMapType((map[string]*ServiceAddress)(nil), "pbservice.ServiceDefinition.TaggedAddressesEntry")
-	proto.RegisterType((*ServiceAddress)(nil), "pbservice.ServiceAddress")
-	proto.RegisterType((*Weights)(nil), "pbservice.Weights")
+var File_proto_pbservice_service_proto protoreflect.FileDescriptor
+
+var file_proto_pbservice_service_proto_rawDesc = []byte{
+	0x0a, 0x1d, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12,
+	0x09, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x1a, 0x1c, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2f, 0x73, 0x74, 0x72, 0x75,
+	0x63, 0x74, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x1b, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f,
+	0x70, 0x62, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f, 0x68, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x63, 0x68, 0x65,
+	0x63, 0x6b, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xce, 0x04, 0x0a, 0x12, 0x43, 0x6f, 0x6e,
+	0x6e, 0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12,
+	0x36, 0x0a, 0x16, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x16, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x18,
+	0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x44, 0x12, 0x30, 0x0a, 0x13, 0x4c,
+	0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x2a, 0x0a,
+	0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72,
+	0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x2f, 0x0a, 0x06, 0x43, 0x6f, 0x6e,
+	0x66, 0x69, 0x67, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67,
+	0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75,
+	0x63, 0x74, 0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x31, 0x0a, 0x09, 0x55, 0x70,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x13, 0x2e,
+	0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65,
+	0x61, 0x6d, 0x52, 0x09, 0x55, 0x70, 0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x73, 0x12, 0x3e, 0x0a,
+	0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x18, 0x07, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x4d,
+	0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67,
+	0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x12, 0x2f, 0x0a,
+	0x06, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e,
+	0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x06, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x12, 0x12,
+	0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4d, 0x6f,
+	0x64, 0x65, 0x12, 0x4d, 0x0a, 0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e,
+	0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x70,
+	0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61,
+	0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52,
+	0x10, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78,
+	0x79, 0x12, 0x36, 0x0a, 0x16, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x16, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x53,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x22, 0xbf, 0x04, 0x0a, 0x08, 0x55, 0x70,
+	0x73, 0x74, 0x72, 0x65, 0x61, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e,
+	0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65,
+	0x12, 0x32, 0x0a, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e,
+	0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14,
+	0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x73,
+	0x70, 0x61, 0x63, 0x65, 0x12, 0x28, 0x0a, 0x0f, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74,
+	0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f, 0x44,
+	0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x1e,
+	0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x18, 0x04, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x2a,
+	0x0a, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42,
+	0x69, 0x6e, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x4c, 0x6f,
+	0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x50, 0x6f, 0x72, 0x74,
+	0x12, 0x2f, 0x0a, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x17, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62,
+	0x75, 0x66, 0x2e, 0x53, 0x74, 0x72, 0x75, 0x63, 0x74, 0x52, 0x06, 0x43, 0x6f, 0x6e, 0x66, 0x69,
+	0x67, 0x12, 0x3e, 0x0a, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x52, 0x0b, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61,
+	0x79, 0x12, 0x30, 0x0a, 0x13, 0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x6c, 0x79, 0x43, 0x6f,
+	0x6e, 0x66, 0x69, 0x67, 0x75, 0x72, 0x65, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x13,
+	0x43, 0x65, 0x6e, 0x74, 0x72, 0x61, 0x6c, 0x6c, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x75,
+	0x72, 0x65, 0x64, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64,
+	0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65,
+	0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x30, 0x0a, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69,
+	0x6e, 0x64, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x0b, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x13, 0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x42, 0x69, 0x6e, 0x64, 0x53, 0x6f, 0x63,
+	0x6b, 0x65, 0x74, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69,
+	0x6e, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18,
+	0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x14, 0x44, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x61, 0x74, 0x69,
+	0x6f, 0x6e, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0x6e, 0x0a, 0x0e, 0x53,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x12, 0x16, 0x0a,
+	0x06, 0x4e, 0x61, 0x74, 0x69, 0x76, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x4e,
+	0x61, 0x74, 0x69, 0x76, 0x65, 0x12, 0x44, 0x0a, 0x0e, 0x53, 0x69, 0x64, 0x65, 0x63, 0x61, 0x72,
+	0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x44, 0x65, 0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x0e, 0x53, 0x69, 0x64,
+	0x65, 0x63, 0x61, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x53, 0x0a, 0x0c, 0x45,
+	0x78, 0x70, 0x6f, 0x73, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x16, 0x0a, 0x06, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x06, 0x43, 0x68, 0x65,
+	0x63, 0x6b, 0x73, 0x12, 0x2b, 0x0a, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73, 0x18, 0x02, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x15, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x45,
+	0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x52, 0x05, 0x50, 0x61, 0x74, 0x68, 0x73,
+	0x22, 0xb0, 0x01, 0x0a, 0x0a, 0x45, 0x78, 0x70, 0x6f, 0x73, 0x65, 0x50, 0x61, 0x74, 0x68, 0x12,
+	0x22, 0x0a, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50,
+	0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x61, 0x74, 0x68, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x50, 0x61, 0x74, 0x68, 0x12, 0x24, 0x0a, 0x0d, 0x4c, 0x6f, 0x63, 0x61, 0x6c,
+	0x50, 0x61, 0x74, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d,
+	0x4c, 0x6f, 0x63, 0x61, 0x6c, 0x50, 0x61, 0x74, 0x68, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1a, 0x0a,
+	0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x08, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x61, 0x72,
+	0x73, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0f, 0x50, 0x61, 0x72, 0x73, 0x65, 0x64, 0x46, 0x72, 0x6f, 0x6d, 0x43, 0x68,
+	0x65, 0x63, 0x6b, 0x22, 0x27, 0x0a, 0x11, 0x4d, 0x65, 0x73, 0x68, 0x47, 0x61, 0x74, 0x65, 0x77,
+	0x61, 0x79, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x12, 0x0a, 0x04, 0x4d, 0x6f, 0x64, 0x65,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4d, 0x6f, 0x64, 0x65, 0x22, 0x74, 0x0a, 0x16,
+	0x54, 0x72, 0x61, 0x6e, 0x73, 0x70, 0x61, 0x72, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79,
+	0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x32, 0x0a, 0x14, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75,
+	0x6e, 0x64, 0x4c, 0x69, 0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x01,
+	0x20, 0x01, 0x28, 0x05, 0x52, 0x14, 0x4f, 0x75, 0x74, 0x62, 0x6f, 0x75, 0x6e, 0x64, 0x4c, 0x69,
+	0x73, 0x74, 0x65, 0x6e, 0x65, 0x72, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x44, 0x69,
+	0x61, 0x6c, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6c, 0x79, 0x18, 0x02, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0e, 0x44, 0x69, 0x61, 0x6c, 0x65, 0x64, 0x44, 0x69, 0x72, 0x65, 0x63, 0x74,
+	0x6c, 0x79, 0x22, 0xd4, 0x06, 0x0a, 0x11, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65,
+	0x66, 0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x4b, 0x69, 0x6e, 0x64,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02,
+	0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04,
+	0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65,
+	0x12, 0x12, 0x0a, 0x04, 0x54, 0x61, 0x67, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x52, 0x04,
+	0x54, 0x61, 0x67, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18,
+	0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x5b,
+	0x0a, 0x0f, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65,
+	0x73, 0x18, 0x10, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x31, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66, 0x69, 0x6e,
+	0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0f, 0x54, 0x61, 0x67, 0x67,
+	0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x65, 0x73, 0x12, 0x3a, 0x0a, 0x04, 0x4d,
+	0x65, 0x74, 0x61, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x70, 0x62, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x44, 0x65, 0x66,
+	0x69, 0x6e, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x2e, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72,
+	0x79, 0x52, 0x04, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18,
+	0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53,
+	0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x18, 0x12, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0a, 0x53, 0x6f, 0x63, 0x6b, 0x65, 0x74, 0x50, 0x61, 0x74, 0x68, 0x12, 0x2a, 0x0a, 0x05, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65,
+	0x52, 0x05, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x12, 0x2c, 0x0a, 0x06, 0x43, 0x68, 0x65, 0x63, 0x6b,
+	0x73, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76,
+	0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x52, 0x06, 0x43,
+	0x68, 0x65, 0x63, 0x6b, 0x73, 0x12, 0x2c, 0x0a, 0x07, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73,
+	0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x73, 0x52, 0x07, 0x57, 0x65, 0x69, 0x67,
+	0x68, 0x74, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x18, 0x0b, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x2c, 0x0a, 0x11, 0x45, 0x6e, 0x61,
+	0x62, 0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f, 0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x18, 0x0c,
+	0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x45, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x54, 0x61, 0x67, 0x4f,
+	0x76, 0x65, 0x72, 0x72, 0x69, 0x64, 0x65, 0x12, 0x33, 0x0a, 0x05, 0x50, 0x72, 0x6f, 0x78, 0x79,
+	0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x2e, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x43,
+	0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x05, 0x50, 0x72, 0x6f, 0x78, 0x79, 0x12, 0x3e, 0x0a, 0x0e,
+	0x45, 0x6e, 0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x18, 0x11,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x52, 0x0e, 0x45, 0x6e,
+	0x74, 0x65, 0x72, 0x70, 0x72, 0x69, 0x73, 0x65, 0x4d, 0x65, 0x74, 0x61, 0x12, 0x33, 0x0a, 0x07,
+	0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e,
+	0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x52, 0x07, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63,
+	0x74, 0x1a, 0x5d, 0x0a, 0x14, 0x54, 0x61, 0x67, 0x67, 0x65, 0x64, 0x41, 0x64, 0x64, 0x72, 0x65,
+	0x73, 0x73, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x2f, 0x0a, 0x05, 0x76,
+	0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x70, 0x62, 0x73,
+	0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
+	0x1a, 0x37, 0x0a, 0x09, 0x4d, 0x65, 0x74, 0x61, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a,
+	0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12,
+	0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05,
+	0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3e, 0x0a, 0x0e, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x41,
+	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x41, 0x64,
+	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x05, 0x52, 0x04, 0x50, 0x6f, 0x72, 0x74, 0x22, 0x3d, 0x0a, 0x07, 0x57, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x50, 0x61, 0x73, 0x73, 0x69, 0x6e, 0x67, 0x12, 0x18,
+	0x0a, 0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
+	0x07, 0x57, 0x61, 0x72, 0x6e, 0x69, 0x6e, 0x67, 0x42, 0x2d, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68,
+	0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70,
+	0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62,
+	0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbservice/service.proto", fileDescriptor_cbb99233b75fb80b)
+var (
+	file_proto_pbservice_service_proto_rawDescOnce sync.Once
+	file_proto_pbservice_service_proto_rawDescData = file_proto_pbservice_service_proto_rawDesc
+)
+
+func file_proto_pbservice_service_proto_rawDescGZIP() []byte {
+	file_proto_pbservice_service_proto_rawDescOnce.Do(func() {
+		file_proto_pbservice_service_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbservice_service_proto_rawDescData)
+	})
+	return file_proto_pbservice_service_proto_rawDescData
 }
 
-var fileDescriptor_cbb99233b75fb80b = []byte{
-	// 1086 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x56, 0xef, 0x6e, 0x1b, 0x45,
-	0x10, 0x97, 0xff, 0xdb, 0x93, 0xe0, 0x24, 0x9b, 0x10, 0x8e, 0xd0, 0xa2, 0xf4, 0x84, 0x4a, 0xd4,
-	0x06, 0xbb, 0x4d, 0x24, 0x40, 0x95, 0x88, 0x44, 0xe3, 0x80, 0x2a, 0x9a, 0xd6, 0xba, 0x18, 0x55,
-	0x02, 0xf1, 0x61, 0x7d, 0xb7, 0xb1, 0x4f, 0xb9, 0xec, 0x59, 0xbb, 0xeb, 0x50, 0xbf, 0x15, 0x6f,
-	0xc0, 0x1b, 0xf0, 0x89, 0x07, 0x42, 0x3b, 0xbb, 0x77, 0x59, 0xdf, 0x1d, 0x15, 0x7c, 0xf2, 0xee,
-	0xfc, 0xe6, 0x37, 0xbb, 0x9e, 0xf9, 0xcd, 0xec, 0xc1, 0xc3, 0x85, 0x48, 0x55, 0x3a, 0x5c, 0x4c,
-	0x25, 0x13, 0x77, 0x71, 0xc8, 0x86, 0xf6, 0x77, 0x80, 0x76, 0xd2, 0xcb, 0x81, 0x83, 0x07, 0xb3,
-	0x34, 0x9d, 0x25, 0x6c, 0x88, 0xc0, 0x74, 0x79, 0x3d, 0x94, 0x4a, 0x2c, 0x43, 0x65, 0x1c, 0x0f,
-	0x3e, 0xcb, 0xe2, 0x84, 0xe9, 0xed, 0x6d, 0xca, 0x87, 0xe6, 0xc7, 0x82, 0x8f, 0x8a, 0x87, 0xcc,
-	0x19, 0x4d, 0xd4, 0x3c, 0x9c, 0xb3, 0xf0, 0xc6, 0xb8, 0xf8, 0x7f, 0x35, 0x81, 0x9c, 0xa7, 0x9c,
-	0xb3, 0x50, 0x8d, 0x45, 0xfa, 0x7e, 0x75, 0x9e, 0xf2, 0xeb, 0x78, 0x46, 0xbe, 0x86, 0xfd, 0x11,
-	0x93, 0x2a, 0xe6, 0x54, 0xc5, 0x29, 0xbf, 0x32, 0xf4, 0x37, 0xf4, 0x96, 0x79, 0xb5, 0xc3, 0xda,
-	0x51, 0x2f, 0xf8, 0x17, 0x94, 0x9c, 0xc0, 0x5e, 0x19, 0x79, 0x35, 0xf2, 0xea, 0xc8, 0xaa, 0xc4,
-	0xc8, 0x33, 0xd8, 0x7d, 0x9d, 0x86, 0x34, 0xb1, 0x96, 0xef, 0xa3, 0x48, 0x30, 0x29, 0xbd, 0x06,
-	0x52, 0xaa, 0x20, 0xf2, 0x04, 0xb6, 0x5d, 0xf3, 0x38, 0x15, 0xca, 0x6b, 0x1e, 0xd6, 0x8e, 0x5a,
-	0x41, 0xc9, 0x4e, 0x86, 0xd0, 0x36, 0xff, 0xc9, 0x6b, 0x1d, 0xd6, 0x8e, 0x36, 0x4e, 0x3e, 0x19,
-	0x98, 0x7c, 0x0e, 0xb2, 0x7c, 0x0e, 0xae, 0x30, 0x9f, 0x81, 0x75, 0x23, 0xcf, 0xa1, 0xf7, 0xf3,
-	0x42, 0x2a, 0xc1, 0xe8, 0xad, 0xf4, 0xda, 0x87, 0x8d, 0xa3, 0x8d, 0x93, 0xdd, 0x41, 0x9e, 0xc2,
-	0x41, 0x86, 0x05, 0xf7, 0x5e, 0xe4, 0x0c, 0x36, 0x2e, 0x99, 0x9c, 0xff, 0x48, 0x15, 0xfb, 0x9d,
-	0xae, 0xbc, 0x0e, 0x1e, 0xf4, 0xc0, 0x21, 0x39, 0xa8, 0x39, 0x25, 0x70, 0x09, 0xfa, 0x8e, 0x17,
-	0xef, 0x17, 0xa9, 0x64, 0x5e, 0xd7, 0xde, 0xf1, 0x9e, 0x6a, 0x00, 0xcb, 0xb2, 0x6e, 0x84, 0x40,
-	0xf3, 0x32, 0x8d, 0x98, 0xd7, 0xc3, 0x1c, 0xe1, 0x9a, 0x5c, 0xc2, 0xf6, 0x44, 0x50, 0x2e, 0x17,
-	0x54, 0x30, 0x6e, 0x8a, 0xe9, 0x01, 0x86, 0x7b, 0xe4, 0x84, 0x2b, 0xba, 0xd8, 0xc0, 0x25, 0xaa,
-	0x56, 0x80, 0x9b, 0xcb, 0xab, 0x34, 0xbc, 0x61, 0x6a, 0x4c, 0xd5, 0xdc, 0xdb, 0x30, 0x0a, 0xa8,
-	0x46, 0xfd, 0x3f, 0x9b, 0xd0, 0xcd, 0x32, 0x43, 0x8e, 0x60, 0xcb, 0x29, 0xf9, 0x64, 0xb5, 0xc8,
-	0xf4, 0x53, 0x34, 0x17, 0x84, 0xa3, 0xb5, 0x24, 0x17, 0x34, 0x64, 0x15, 0xc2, 0xc9, 0xb1, 0x42,
-	0x74, 0x54, 0x67, 0xa3, 0x14, 0x1d, 0x65, 0xf9, 0x39, 0xc0, 0x88, 0x2a, 0x1a, 0x32, 0xae, 0x98,
-	0x40, 0xa9, 0xf4, 0x02, 0xc7, 0x92, 0x0b, 0xea, 0x65, 0xcc, 0xa3, 0x4c, 0x7f, 0x2d, 0xf4, 0x2a,
-	0xd9, 0xc9, 0x17, 0xf0, 0x51, 0x6e, 0x43, 0xe5, 0xb5, 0x51, 0x79, 0xeb, 0x46, 0x47, 0x76, 0x9d,
-	0xff, 0x26, 0xbb, 0x82, 0x86, 0xba, 0xff, 0x57, 0x43, 0xcf, 0x60, 0xf7, 0x9c, 0x71, 0x25, 0x68,
-	0x92, 0x58, 0x7c, 0x29, 0x58, 0x84, 0x0a, 0xe9, 0x06, 0x55, 0x50, 0xde, 0x77, 0xfa, 0xce, 0x4e,
-	0x79, 0xc1, 0xe9, 0xbb, 0x75, 0xa8, 0x82, 0x81, 0x2a, 0xdc, 0xa8, 0x64, 0xa0, 0x28, 0xd7, 0xcb,
-	0x3a, 0xa6, 0x42, 0xc5, 0x7a, 0xe1, 0x6d, 0x96, 0xca, 0x9a, 0x63, 0x3e, 0x87, 0xbe, 0x95, 0x95,
-	0x1d, 0x4c, 0x64, 0x1f, 0xda, 0x6f, 0xa8, 0x8a, 0xef, 0x8c, 0x7a, 0xba, 0x81, 0xdd, 0x91, 0x11,
-	0xf4, 0xaf, 0xe2, 0x88, 0x85, 0x54, 0x58, 0x02, 0xd6, 0x7f, 0x3d, 0x6d, 0x16, 0x19, 0xb1, 0xeb,
-	0x98, 0x63, 0xfc, 0xa0, 0xc0, 0xf1, 0xaf, 0x60, 0xd3, 0x6d, 0x32, 0x7d, 0xda, 0xb9, 0x9e, 0x90,
-	0x32, 0x3b, 0xcd, 0xec, 0xc8, 0x53, 0x68, 0xe9, 0x2c, 0x48, 0xaf, 0x8e, 0x43, 0xe1, 0xe3, 0x52,
-	0x93, 0x6a, 0x34, 0x30, 0x3e, 0xfe, 0x1f, 0x35, 0x80, 0x7b, 0x2b, 0xf1, 0x61, 0xf3, 0x75, 0x2c,
-	0x15, 0xe3, 0x4c, 0xa0, 0x66, 0x6a, 0xa8, 0x99, 0x35, 0x9b, 0x6e, 0x6a, 0x2c, 0x80, 0x91, 0x3c,
-	0xae, 0x73, 0xb1, 0xe9, 0x0d, 0x12, 0x1b, 0x8e, 0xd8, 0x32, 0x23, 0x39, 0x80, 0xee, 0x58, 0xcb,
-	0x2a, 0x4c, 0x13, 0x2b, 0xee, 0x7c, 0xaf, 0x9b, 0x64, 0x4c, 0x85, 0x64, 0xd1, 0x0f, 0x22, 0xbd,
-	0xc5, 0x7f, 0x82, 0xca, 0xee, 0x06, 0x45, 0xb3, 0xff, 0x25, 0xec, 0x94, 0x34, 0x96, 0x4f, 0x9a,
-	0xda, 0xfd, 0xa4, 0xf1, 0x15, 0xec, 0x57, 0x8f, 0x11, 0x5d, 0xee, 0xb7, 0x4b, 0x35, 0x4d, 0x97,
-	0x3c, 0xaa, 0xf8, 0xbb, 0x95, 0x18, 0x79, 0x0c, 0xfd, 0x51, 0x4c, 0x13, 0x16, 0x8d, 0x62, 0xc1,
-	0x42, 0x95, 0xac, 0x30, 0x01, 0xdd, 0xa0, 0x60, 0xf5, 0xff, 0x6e, 0xc3, 0x4e, 0xa9, 0x98, 0xfa,
-	0x7e, 0x3f, 0xc5, 0x3c, 0xca, 0xee, 0xa7, 0xd7, 0xa4, 0x0f, 0xf5, 0xfc, 0xc9, 0xa9, 0xbf, 0x1a,
-	0x69, 0x1f, 0x67, 0x38, 0xe0, 0x5a, 0xdb, 0x26, 0x74, 0x26, 0xbd, 0xe6, 0x61, 0x43, 0xdb, 0xf4,
-	0x9a, 0x78, 0xd0, 0x59, 0x6f, 0xfe, 0x6c, 0x4b, 0x7e, 0x85, 0xad, 0x09, 0x9d, 0xcd, 0x58, 0x36,
-	0x04, 0x98, 0xf4, 0xb6, 0x51, 0x04, 0xcf, 0x3f, 0xa4, 0xb4, 0x41, 0x81, 0x73, 0xc1, 0x95, 0x58,
-	0x05, 0xc5, 0x48, 0xe4, 0x05, 0x34, 0x2f, 0x99, 0xa2, 0xf6, 0xad, 0x79, 0xfc, 0xc1, 0x88, 0xda,
-	0xd1, 0x84, 0x41, 0x0e, 0x6a, 0x46, 0x27, 0xb8, 0x83, 0x09, 0xc6, 0xb5, 0x1e, 0x76, 0x4e, 0x3b,
-	0x13, 0x33, 0xec, 0x9c, 0x2e, 0x7e, 0x02, 0x2d, 0xa3, 0x03, 0x33, 0x63, 0xf6, 0x9c, 0x03, 0xd1,
-	0xae, 0xe7, 0x71, 0x60, 0x5c, 0xc8, 0x71, 0xde, 0x0b, 0x3d, 0xbc, 0x5d, 0xb5, 0x73, 0xd6, 0x21,
-	0xc7, 0xd0, 0x79, 0xc7, 0xe2, 0xd9, 0x5c, 0x49, 0xfb, 0xf2, 0x10, 0xc7, 0xdd, 0x22, 0x41, 0xe6,
-	0x42, 0xf6, 0xa0, 0x35, 0x49, 0x6f, 0x18, 0xb7, 0xf3, 0xc3, 0x6c, 0xc8, 0x31, 0xec, 0x5c, 0x70,
-	0x3a, 0x4d, 0xd8, 0x84, 0xce, 0xde, 0xde, 0x31, 0x21, 0xe2, 0x88, 0xe1, 0xb8, 0xe8, 0x06, 0x65,
-	0x80, 0x9c, 0x42, 0xcb, 0xbc, 0x74, 0x7d, 0x3c, 0xef, 0xa1, 0x7b, 0xbd, 0xd2, 0x57, 0x4d, 0x60,
-	0x7c, 0xc9, 0x19, 0xf4, 0x2f, 0xf4, 0xd8, 0x5f, 0x88, 0x58, 0x32, 0x4c, 0xfd, 0x0e, 0xb2, 0xf7,
-	0x07, 0xf6, 0xeb, 0x69, 0x1d, 0x0d, 0x0a, 0xde, 0xe4, 0x14, 0x3a, 0x36, 0xb8, 0xb7, 0x85, 0xc4,
-	0x4f, 0xcb, 0x35, 0xb3, 0x0e, 0x41, 0xe6, 0x79, 0xf0, 0x1b, 0xec, 0x55, 0xc9, 0x81, 0x6c, 0x43,
-	0xe3, 0x86, 0xad, 0xac, 0x7e, 0xf5, 0x92, 0x0c, 0xa1, 0x75, 0x47, 0x93, 0xa5, 0x79, 0xfb, 0x2a,
-	0x83, 0xdb, 0x10, 0x81, 0xf1, 0x7b, 0x51, 0xff, 0xb6, 0x76, 0xf0, 0x0d, 0xf4, 0x72, 0x6d, 0x54,
-	0xc4, 0xdc, 0x73, 0x63, 0xf6, 0x1c, 0xa2, 0x7f, 0x96, 0x4f, 0xdb, 0x4c, 0xec, 0x4e, 0x1b, 0xd4,
-	0xd6, 0xdb, 0x20, 0x53, 0x5b, 0xfd, 0x5e, 0x6d, 0xfe, 0x77, 0x79, 0xcd, 0x35, 0x71, 0x4c, 0xa5,
-	0x8c, 0xf9, 0xcc, 0x36, 0x7c, 0xb6, 0xd5, 0xc8, 0x3b, 0x2a, 0xb8, 0x46, 0x0c, 0x37, 0xdb, 0xbe,
-	0xfc, 0xea, 0x97, 0xa7, 0xb3, 0x58, 0xcd, 0x97, 0x53, 0x9d, 0xfb, 0xe1, 0x9c, 0xca, 0x79, 0x1c,
-	0xa6, 0x62, 0x31, 0x0c, 0x53, 0x2e, 0x97, 0xc9, 0xb0, 0xf0, 0x01, 0x3b, 0x6d, 0xa3, 0xe1, 0xf4,
-	0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xba, 0x23, 0xd7, 0x20, 0x3f, 0x0b, 0x00, 0x00,
+var file_proto_pbservice_service_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_proto_pbservice_service_proto_goTypes = []interface{}{
+	(*ConnectProxyConfig)(nil),      // 0: pbservice.ConnectProxyConfig
+	(*Upstream)(nil),                // 1: pbservice.Upstream
+	(*ServiceConnect)(nil),          // 2: pbservice.ServiceConnect
+	(*ExposeConfig)(nil),            // 3: pbservice.ExposeConfig
+	(*ExposePath)(nil),              // 4: pbservice.ExposePath
+	(*MeshGatewayConfig)(nil),       // 5: pbservice.MeshGatewayConfig
+	(*TransparentProxyConfig)(nil),  // 6: pbservice.TransparentProxyConfig
+	(*ServiceDefinition)(nil),       // 7: pbservice.ServiceDefinition
+	(*ServiceAddress)(nil),          // 8: pbservice.ServiceAddress
+	(*Weights)(nil),                 // 9: pbservice.Weights
+	nil,                             // 10: pbservice.ServiceDefinition.TaggedAddressesEntry
+	nil,                             // 11: pbservice.ServiceDefinition.MetaEntry
+	(*structpb.Struct)(nil),         // 12: google.protobuf.Struct
+	(*CheckType)(nil),               // 13: pbservice.CheckType
+	(*pbcommon.EnterpriseMeta)(nil), // 14: common.EnterpriseMeta
+}
+var file_proto_pbservice_service_proto_depIdxs = []int32{
+	12, // 0: pbservice.ConnectProxyConfig.Config:type_name -> google.protobuf.Struct
+	1,  // 1: pbservice.ConnectProxyConfig.Upstreams:type_name -> pbservice.Upstream
+	5,  // 2: pbservice.ConnectProxyConfig.MeshGateway:type_name -> pbservice.MeshGatewayConfig
+	3,  // 3: pbservice.ConnectProxyConfig.Expose:type_name -> pbservice.ExposeConfig
+	6,  // 4: pbservice.ConnectProxyConfig.TransparentProxy:type_name -> pbservice.TransparentProxyConfig
+	12, // 5: pbservice.Upstream.Config:type_name -> google.protobuf.Struct
+	5,  // 6: pbservice.Upstream.MeshGateway:type_name -> pbservice.MeshGatewayConfig
+	7,  // 7: pbservice.ServiceConnect.SidecarService:type_name -> pbservice.ServiceDefinition
+	4,  // 8: pbservice.ExposeConfig.Paths:type_name -> pbservice.ExposePath
+	10, // 9: pbservice.ServiceDefinition.TaggedAddresses:type_name -> pbservice.ServiceDefinition.TaggedAddressesEntry
+	11, // 10: pbservice.ServiceDefinition.Meta:type_name -> pbservice.ServiceDefinition.MetaEntry
+	13, // 11: pbservice.ServiceDefinition.Check:type_name -> pbservice.CheckType
+	13, // 12: pbservice.ServiceDefinition.Checks:type_name -> pbservice.CheckType
+	9,  // 13: pbservice.ServiceDefinition.Weights:type_name -> pbservice.Weights
+	0,  // 14: pbservice.ServiceDefinition.Proxy:type_name -> pbservice.ConnectProxyConfig
+	14, // 15: pbservice.ServiceDefinition.EnterpriseMeta:type_name -> common.EnterpriseMeta
+	2,  // 16: pbservice.ServiceDefinition.Connect:type_name -> pbservice.ServiceConnect
+	8,  // 17: pbservice.ServiceDefinition.TaggedAddressesEntry.value:type_name -> pbservice.ServiceAddress
+	18, // [18:18] is the sub-list for method output_type
+	18, // [18:18] is the sub-list for method input_type
+	18, // [18:18] is the sub-list for extension type_name
+	18, // [18:18] is the sub-list for extension extendee
+	0,  // [0:18] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbservice_service_proto_init() }
+func file_proto_pbservice_service_proto_init() {
+	if File_proto_pbservice_service_proto != nil {
+		return
+	}
+	file_proto_pbservice_healthcheck_proto_init()
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbservice_service_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ConnectProxyConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Upstream); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceConnect); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExposeConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ExposePath); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*MeshGatewayConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TransparentProxyConfig); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceDefinition); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceAddress); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbservice_service_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Weights); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbservice_service_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   12,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_proto_pbservice_service_proto_goTypes,
+		DependencyIndexes: file_proto_pbservice_service_proto_depIdxs,
+		MessageInfos:      file_proto_pbservice_service_proto_msgTypes,
+	}.Build()
+	File_proto_pbservice_service_proto = out.File
+	file_proto_pbservice_service_proto_rawDesc = nil
+	file_proto_pbservice_service_proto_goTypes = nil
+	file_proto_pbservice_service_proto_depIdxs = nil
 }
diff --git a/proto/pbsubscribe/subscribe.pb.go b/proto/pbsubscribe/subscribe.pb.go
index 9df5bba25..851991ed0 100644
--- a/proto/pbsubscribe/subscribe.pb.go
+++ b/proto/pbsubscribe/subscribe.pb.go
@@ -1,29 +1,37 @@
+//
+//Package event provides a service for subscribing to state change events.
+
 // Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.23.0
+// 	protoc        v3.15.8
 // source: proto/pbsubscribe/subscribe.proto
 
 package pbsubscribe
 
 import (
 	context "context"
-	fmt "fmt"
 	proto "github.com/golang/protobuf/proto"
 	pbservice "github.com/hashicorp/consul/proto/pbservice"
 	grpc "google.golang.org/grpc"
 	codes "google.golang.org/grpc/codes"
 	status "google.golang.org/grpc/status"
-	math "math"
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
 )
 
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
+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 compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
+// This is a compile-time assertion that a sufficiently up-to-date version
+// of the legacy proto package is being used.
+const _ = proto.ProtoPackageIsVersion4
 
 // Topic enumerates the supported event topics.
 type Topic int32
@@ -37,24 +45,45 @@ const (
 	Topic_ServiceHealthConnect Topic = 2
 )
 
-var Topic_name = map[int32]string{
-	0: "Unknown",
-	1: "ServiceHealth",
-	2: "ServiceHealthConnect",
-}
+// Enum value maps for Topic.
+var (
+	Topic_name = map[int32]string{
+		0: "Unknown",
+		1: "ServiceHealth",
+		2: "ServiceHealthConnect",
+	}
+	Topic_value = map[string]int32{
+		"Unknown":              0,
+		"ServiceHealth":        1,
+		"ServiceHealthConnect": 2,
+	}
+)
 
-var Topic_value = map[string]int32{
-	"Unknown":              0,
-	"ServiceHealth":        1,
-	"ServiceHealthConnect": 2,
+func (x Topic) Enum() *Topic {
+	p := new(Topic)
+	*p = x
+	return p
 }
 
 func (x Topic) String() string {
-	return proto.EnumName(Topic_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
+func (Topic) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbsubscribe_subscribe_proto_enumTypes[0].Descriptor()
+}
+
+func (Topic) Type() protoreflect.EnumType {
+	return &file_proto_pbsubscribe_subscribe_proto_enumTypes[0]
+}
+
+func (x Topic) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use Topic.Descriptor instead.
 func (Topic) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ab3eb8c810e315fb, []int{0}
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{0}
 }
 
 type CatalogOp int32
@@ -64,26 +93,51 @@ const (
 	CatalogOp_Deregister CatalogOp = 1
 )
 
-var CatalogOp_name = map[int32]string{
-	0: "Register",
-	1: "Deregister",
-}
+// Enum value maps for CatalogOp.
+var (
+	CatalogOp_name = map[int32]string{
+		0: "Register",
+		1: "Deregister",
+	}
+	CatalogOp_value = map[string]int32{
+		"Register":   0,
+		"Deregister": 1,
+	}
+)
 
-var CatalogOp_value = map[string]int32{
-	"Register":   0,
-	"Deregister": 1,
+func (x CatalogOp) Enum() *CatalogOp {
+	p := new(CatalogOp)
+	*p = x
+	return p
 }
 
 func (x CatalogOp) String() string {
-	return proto.EnumName(CatalogOp_name, int32(x))
+	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
+func (CatalogOp) Descriptor() protoreflect.EnumDescriptor {
+	return file_proto_pbsubscribe_subscribe_proto_enumTypes[1].Descriptor()
+}
+
+func (CatalogOp) Type() protoreflect.EnumType {
+	return &file_proto_pbsubscribe_subscribe_proto_enumTypes[1]
+}
+
+func (x CatalogOp) Number() protoreflect.EnumNumber {
+	return protoreflect.EnumNumber(x)
+}
+
+// Deprecated: Use CatalogOp.Descriptor instead.
 func (CatalogOp) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor_ab3eb8c810e315fb, []int{1}
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{1}
 }
 
 // SubscribeRequest used to subscribe to a topic.
 type SubscribeRequest struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Topic identifies the set of events the subscriber is interested in.
 	Topic Topic `protobuf:"varint,1,opt,name=Topic,proto3,enum=subscribe.Topic" json:"Topic,omitempty"`
 	// Key is a topic-specific identifier that restricts the scope of the
@@ -115,82 +169,86 @@ type SubscribeRequest struct {
 	// default partition will be used.
 	//
 	// Partition is an enterprise-only feature.
-	Partition            string   `protobuf:"bytes,7,opt,name=Partition,proto3" json:"Partition,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	Partition string `protobuf:"bytes,7,opt,name=Partition,proto3" json:"Partition,omitempty"`
 }
 
-func (m *SubscribeRequest) Reset()         { *m = SubscribeRequest{} }
-func (m *SubscribeRequest) String() string { return proto.CompactTextString(m) }
-func (*SubscribeRequest) ProtoMessage()    {}
+func (x *SubscribeRequest) Reset() {
+	*x = SubscribeRequest{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *SubscribeRequest) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*SubscribeRequest) ProtoMessage() {}
+
+func (x *SubscribeRequest) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[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 SubscribeRequest.ProtoReflect.Descriptor instead.
 func (*SubscribeRequest) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab3eb8c810e315fb, []int{0}
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{0}
 }
 
-func (m *SubscribeRequest) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_SubscribeRequest.Unmarshal(m, b)
-}
-func (m *SubscribeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_SubscribeRequest.Marshal(b, m, deterministic)
-}
-func (m *SubscribeRequest) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_SubscribeRequest.Merge(m, src)
-}
-func (m *SubscribeRequest) XXX_Size() int {
-	return xxx_messageInfo_SubscribeRequest.Size(m)
-}
-func (m *SubscribeRequest) XXX_DiscardUnknown() {
-	xxx_messageInfo_SubscribeRequest.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_SubscribeRequest proto.InternalMessageInfo
-
-func (m *SubscribeRequest) GetTopic() Topic {
-	if m != nil {
-		return m.Topic
+func (x *SubscribeRequest) GetTopic() Topic {
+	if x != nil {
+		return x.Topic
 	}
 	return Topic_Unknown
 }
 
-func (m *SubscribeRequest) GetKey() string {
-	if m != nil {
-		return m.Key
+func (x *SubscribeRequest) GetKey() string {
+	if x != nil {
+		return x.Key
 	}
 	return ""
 }
 
-func (m *SubscribeRequest) GetToken() string {
-	if m != nil {
-		return m.Token
+func (x *SubscribeRequest) GetToken() string {
+	if x != nil {
+		return x.Token
 	}
 	return ""
 }
 
-func (m *SubscribeRequest) GetIndex() uint64 {
-	if m != nil {
-		return m.Index
+func (x *SubscribeRequest) GetIndex() uint64 {
+	if x != nil {
+		return x.Index
 	}
 	return 0
 }
 
-func (m *SubscribeRequest) GetDatacenter() string {
-	if m != nil {
-		return m.Datacenter
+func (x *SubscribeRequest) GetDatacenter() string {
+	if x != nil {
+		return x.Datacenter
 	}
 	return ""
 }
 
-func (m *SubscribeRequest) GetNamespace() string {
-	if m != nil {
-		return m.Namespace
+func (x *SubscribeRequest) GetNamespace() string {
+	if x != nil {
+		return x.Namespace
 	}
 	return ""
 }
 
-func (m *SubscribeRequest) GetPartition() string {
-	if m != nil {
-		return m.Partition
+func (x *SubscribeRequest) GetPartition() string {
+	if x != nil {
+		return x.Partition
 	}
 	return ""
 }
@@ -199,6 +257,10 @@ func (m *SubscribeRequest) GetPartition() string {
 // describe the current "snapshot" of the result as well as ongoing mutations to
 // that snapshot.
 type Event struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
 	// Index is the raft index at which the mutation took place. At the top
 	// level of a subscription there will always be at most one Event per index.
 	// If multiple events are published to the same topic in a single raft
@@ -207,66 +269,118 @@ type Event struct {
 	Index uint64 `protobuf:"varint,1,opt,name=Index,proto3" json:"Index,omitempty"`
 	// Payload is the actual event content.
 	//
-	// Types that are valid to be assigned to Payload:
+	// Types that are assignable to Payload:
 	//	*Event_EndOfSnapshot
 	//	*Event_NewSnapshotToFollow
 	//	*Event_EventBatch
 	//	*Event_ServiceHealth
-	Payload              isEvent_Payload `protobuf_oneof:"Payload"`
-	XXX_NoUnkeyedLiteral struct{}        `json:"-"`
-	XXX_unrecognized     []byte          `json:"-"`
-	XXX_sizecache        int32           `json:"-"`
+	Payload isEvent_Payload `protobuf_oneof:"Payload"`
 }
 
-func (m *Event) Reset()         { *m = Event{} }
-func (m *Event) String() string { return proto.CompactTextString(m) }
-func (*Event) ProtoMessage()    {}
+func (x *Event) Reset() {
+	*x = Event{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Event) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Event) ProtoMessage() {}
+
+func (x *Event) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[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 Event.ProtoReflect.Descriptor instead.
 func (*Event) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab3eb8c810e315fb, []int{1}
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{1}
 }
 
-func (m *Event) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_Event.Unmarshal(m, b)
-}
-func (m *Event) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_Event.Marshal(b, m, deterministic)
-}
-func (m *Event) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_Event.Merge(m, src)
-}
-func (m *Event) XXX_Size() int {
-	return xxx_messageInfo_Event.Size(m)
-}
-func (m *Event) XXX_DiscardUnknown() {
-	xxx_messageInfo_Event.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_Event proto.InternalMessageInfo
-
-func (m *Event) GetIndex() uint64 {
-	if m != nil {
-		return m.Index
+func (x *Event) GetIndex() uint64 {
+	if x != nil {
+		return x.Index
 	}
 	return 0
 }
 
+func (m *Event) GetPayload() isEvent_Payload {
+	if m != nil {
+		return m.Payload
+	}
+	return nil
+}
+
+func (x *Event) GetEndOfSnapshot() bool {
+	if x, ok := x.GetPayload().(*Event_EndOfSnapshot); ok {
+		return x.EndOfSnapshot
+	}
+	return false
+}
+
+func (x *Event) GetNewSnapshotToFollow() bool {
+	if x, ok := x.GetPayload().(*Event_NewSnapshotToFollow); ok {
+		return x.NewSnapshotToFollow
+	}
+	return false
+}
+
+func (x *Event) GetEventBatch() *EventBatch {
+	if x, ok := x.GetPayload().(*Event_EventBatch); ok {
+		return x.EventBatch
+	}
+	return nil
+}
+
+func (x *Event) GetServiceHealth() *ServiceHealthUpdate {
+	if x, ok := x.GetPayload().(*Event_ServiceHealth); ok {
+		return x.ServiceHealth
+	}
+	return nil
+}
+
 type isEvent_Payload interface {
 	isEvent_Payload()
 }
 
 type Event_EndOfSnapshot struct {
+	// EndOfSnapshot indicates the event stream for the initial snapshot has
+	// ended. Subsequent Events delivered will be mutations to that result.
 	EndOfSnapshot bool `protobuf:"varint,2,opt,name=EndOfSnapshot,proto3,oneof"`
 }
 
 type Event_NewSnapshotToFollow struct {
+	// NewSnapshotToFollow indicates that the client view is stale. The client
+	// must reset its view before handing any more events. Subsequent events
+	// in the stream will be for a new snapshot until an EndOfSnapshot event
+	// is received.
 	NewSnapshotToFollow bool `protobuf:"varint,3,opt,name=NewSnapshotToFollow,proto3,oneof"`
 }
 
 type Event_EventBatch struct {
+	// EventBatch is a set of events. This is typically used as the payload
+	// type where multiple events are emitted in a single topic and raft
+	// index (e.g. transactional updates). In this case the Topic and Index
+	// values of all events will match and the whole set should be delivered
+	// and consumed atomically.
 	EventBatch *EventBatch `protobuf:"bytes,4,opt,name=EventBatch,proto3,oneof"`
 }
 
 type Event_ServiceHealth struct {
+	// ServiceHealth is used for ServiceHealth and ServiceHealthConnect
+	// topics.
 	ServiceHealth *ServiceHealthUpdate `protobuf:"bytes,10,opt,name=ServiceHealth,proto3,oneof"`
 }
 
@@ -278,185 +392,295 @@ func (*Event_EventBatch) isEvent_Payload() {}
 
 func (*Event_ServiceHealth) isEvent_Payload() {}
 
-func (m *Event) GetPayload() isEvent_Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (m *Event) GetEndOfSnapshot() bool {
-	if x, ok := m.GetPayload().(*Event_EndOfSnapshot); ok {
-		return x.EndOfSnapshot
-	}
-	return false
-}
-
-func (m *Event) GetNewSnapshotToFollow() bool {
-	if x, ok := m.GetPayload().(*Event_NewSnapshotToFollow); ok {
-		return x.NewSnapshotToFollow
-	}
-	return false
-}
-
-func (m *Event) GetEventBatch() *EventBatch {
-	if x, ok := m.GetPayload().(*Event_EventBatch); ok {
-		return x.EventBatch
-	}
-	return nil
-}
-
-func (m *Event) GetServiceHealth() *ServiceHealthUpdate {
-	if x, ok := m.GetPayload().(*Event_ServiceHealth); ok {
-		return x.ServiceHealth
-	}
-	return nil
-}
-
-// XXX_OneofWrappers is for the internal use of the proto package.
-func (*Event) XXX_OneofWrappers() []interface{} {
-	return []interface{}{
-		(*Event_EndOfSnapshot)(nil),
-		(*Event_NewSnapshotToFollow)(nil),
-		(*Event_EventBatch)(nil),
-		(*Event_ServiceHealth)(nil),
-	}
-}
-
 type EventBatch struct {
-	Events               []*Event `protobuf:"bytes,1,rep,name=Events,proto3" json:"Events,omitempty"`
-	XXX_NoUnkeyedLiteral struct{} `json:"-"`
-	XXX_unrecognized     []byte   `json:"-"`
-	XXX_sizecache        int32    `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Events []*Event `protobuf:"bytes,1,rep,name=Events,proto3" json:"Events,omitempty"`
 }
 
-func (m *EventBatch) Reset()         { *m = EventBatch{} }
-func (m *EventBatch) String() string { return proto.CompactTextString(m) }
-func (*EventBatch) ProtoMessage()    {}
+func (x *EventBatch) Reset() {
+	*x = EventBatch{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *EventBatch) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*EventBatch) ProtoMessage() {}
+
+func (x *EventBatch) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[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 EventBatch.ProtoReflect.Descriptor instead.
 func (*EventBatch) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab3eb8c810e315fb, []int{2}
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{2}
 }
 
-func (m *EventBatch) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_EventBatch.Unmarshal(m, b)
-}
-func (m *EventBatch) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_EventBatch.Marshal(b, m, deterministic)
-}
-func (m *EventBatch) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_EventBatch.Merge(m, src)
-}
-func (m *EventBatch) XXX_Size() int {
-	return xxx_messageInfo_EventBatch.Size(m)
-}
-func (m *EventBatch) XXX_DiscardUnknown() {
-	xxx_messageInfo_EventBatch.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_EventBatch proto.InternalMessageInfo
-
-func (m *EventBatch) GetEvents() []*Event {
-	if m != nil {
-		return m.Events
+func (x *EventBatch) GetEvents() []*Event {
+	if x != nil {
+		return x.Events
 	}
 	return nil
 }
 
 type ServiceHealthUpdate struct {
-	Op                   CatalogOp                   `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.CatalogOp" json:"Op,omitempty"`
-	CheckServiceNode     *pbservice.CheckServiceNode `protobuf:"bytes,2,opt,name=CheckServiceNode,proto3" json:"CheckServiceNode,omitempty"`
-	XXX_NoUnkeyedLiteral struct{}                    `json:"-"`
-	XXX_unrecognized     []byte                      `json:"-"`
-	XXX_sizecache        int32                       `json:"-"`
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Op               CatalogOp                   `protobuf:"varint,1,opt,name=Op,proto3,enum=subscribe.CatalogOp" json:"Op,omitempty"`
+	CheckServiceNode *pbservice.CheckServiceNode `protobuf:"bytes,2,opt,name=CheckServiceNode,proto3" json:"CheckServiceNode,omitempty"`
 }
 
-func (m *ServiceHealthUpdate) Reset()         { *m = ServiceHealthUpdate{} }
-func (m *ServiceHealthUpdate) String() string { return proto.CompactTextString(m) }
-func (*ServiceHealthUpdate) ProtoMessage()    {}
+func (x *ServiceHealthUpdate) Reset() {
+	*x = ServiceHealthUpdate{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *ServiceHealthUpdate) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*ServiceHealthUpdate) ProtoMessage() {}
+
+func (x *ServiceHealthUpdate) ProtoReflect() protoreflect.Message {
+	mi := &file_proto_pbsubscribe_subscribe_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use ServiceHealthUpdate.ProtoReflect.Descriptor instead.
 func (*ServiceHealthUpdate) Descriptor() ([]byte, []int) {
-	return fileDescriptor_ab3eb8c810e315fb, []int{3}
+	return file_proto_pbsubscribe_subscribe_proto_rawDescGZIP(), []int{3}
 }
 
-func (m *ServiceHealthUpdate) XXX_Unmarshal(b []byte) error {
-	return xxx_messageInfo_ServiceHealthUpdate.Unmarshal(m, b)
-}
-func (m *ServiceHealthUpdate) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
-	return xxx_messageInfo_ServiceHealthUpdate.Marshal(b, m, deterministic)
-}
-func (m *ServiceHealthUpdate) XXX_Merge(src proto.Message) {
-	xxx_messageInfo_ServiceHealthUpdate.Merge(m, src)
-}
-func (m *ServiceHealthUpdate) XXX_Size() int {
-	return xxx_messageInfo_ServiceHealthUpdate.Size(m)
-}
-func (m *ServiceHealthUpdate) XXX_DiscardUnknown() {
-	xxx_messageInfo_ServiceHealthUpdate.DiscardUnknown(m)
-}
-
-var xxx_messageInfo_ServiceHealthUpdate proto.InternalMessageInfo
-
-func (m *ServiceHealthUpdate) GetOp() CatalogOp {
-	if m != nil {
-		return m.Op
+func (x *ServiceHealthUpdate) GetOp() CatalogOp {
+	if x != nil {
+		return x.Op
 	}
 	return CatalogOp_Register
 }
 
-func (m *ServiceHealthUpdate) GetCheckServiceNode() *pbservice.CheckServiceNode {
-	if m != nil {
-		return m.CheckServiceNode
+func (x *ServiceHealthUpdate) GetCheckServiceNode() *pbservice.CheckServiceNode {
+	if x != nil {
+		return x.CheckServiceNode
 	}
 	return nil
 }
 
-func init() {
-	proto.RegisterEnum("subscribe.Topic", Topic_name, Topic_value)
-	proto.RegisterEnum("subscribe.CatalogOp", CatalogOp_name, CatalogOp_value)
-	proto.RegisterType((*SubscribeRequest)(nil), "subscribe.SubscribeRequest")
-	proto.RegisterType((*Event)(nil), "subscribe.Event")
-	proto.RegisterType((*EventBatch)(nil), "subscribe.EventBatch")
-	proto.RegisterType((*ServiceHealthUpdate)(nil), "subscribe.ServiceHealthUpdate")
+var File_proto_pbsubscribe_subscribe_proto protoreflect.FileDescriptor
+
+var file_proto_pbsubscribe_subscribe_proto_rawDesc = []byte{
+	0x0a, 0x21, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72,
+	0x69, 0x62, 0x65, 0x2f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x70, 0x72,
+	0x6f, 0x74, 0x6f, 0x12, 0x09, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x1a, 0x1a,
+	0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x2f,
+	0x6e, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xd4, 0x01, 0x0a, 0x10, 0x53,
+	0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12,
+	0x26, 0x0a, 0x05, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x10,
+	0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x54, 0x6f, 0x70, 0x69, 0x63,
+	0x52, 0x05, 0x54, 0x6f, 0x70, 0x69, 0x63, 0x12, 0x10, 0x0a, 0x03, 0x4b, 0x65, 0x79, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x4b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12,
+	0x14, 0x0a, 0x05, 0x49, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05,
+	0x49, 0x6e, 0x64, 0x65, 0x78, 0x12, 0x1e, 0x0a, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63, 0x65, 0x6e,
+	0x74, 0x65, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x44, 0x61, 0x74, 0x61, 0x63,
+	0x65, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x1c, 0x0a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61,
+	0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70,
+	0x61, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f, 0x6e,
+	0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x74, 0x69, 0x74, 0x69, 0x6f,
+	0x6e, 0x22, 0x85, 0x02, 0x0a, 0x05, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x49,
+	0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, 0x49, 0x6e, 0x64, 0x65,
+	0x78, 0x12, 0x26, 0x0a, 0x0d, 0x45, 0x6e, 0x64, 0x4f, 0x66, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68,
+	0x6f, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x0d, 0x45, 0x6e, 0x64, 0x4f,
+	0x66, 0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x12, 0x32, 0x0a, 0x13, 0x4e, 0x65, 0x77,
+	0x53, 0x6e, 0x61, 0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x6f, 0x46, 0x6f, 0x6c, 0x6c, 0x6f, 0x77,
+	0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x48, 0x00, 0x52, 0x13, 0x4e, 0x65, 0x77, 0x53, 0x6e, 0x61,
+	0x70, 0x73, 0x68, 0x6f, 0x74, 0x54, 0x6f, 0x46, 0x6f, 0x6c, 0x6c, 0x6f, 0x77, 0x12, 0x37, 0x0a,
+	0x0a, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x18, 0x04, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x15, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x45, 0x76,
+	0x65, 0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x48, 0x00, 0x52, 0x0a, 0x45, 0x76, 0x65, 0x6e,
+	0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x46, 0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1e, 0x2e,
+	0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63,
+	0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52,
+	0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x42, 0x09,
+	0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x36, 0x0a, 0x0a, 0x45, 0x76, 0x65,
+	0x6e, 0x74, 0x42, 0x61, 0x74, 0x63, 0x68, 0x12, 0x28, 0x0a, 0x06, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72,
+	0x69, 0x62, 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x45, 0x76, 0x65, 0x6e, 0x74,
+	0x73, 0x22, 0x84, 0x01, 0x0a, 0x13, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61,
+	0x6c, 0x74, 0x68, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x12, 0x24, 0x0a, 0x02, 0x4f, 0x70, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x14, 0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62,
+	0x65, 0x2e, 0x43, 0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70, 0x52, 0x02, 0x4f, 0x70, 0x12,
+	0x47, 0x0a, 0x10, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x4e,
+	0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x70, 0x62, 0x73, 0x65,
+	0x72, 0x76, 0x69, 0x63, 0x65, 0x2e, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72, 0x76, 0x69,
+	0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x52, 0x10, 0x43, 0x68, 0x65, 0x63, 0x6b, 0x53, 0x65, 0x72,
+	0x76, 0x69, 0x63, 0x65, 0x4e, 0x6f, 0x64, 0x65, 0x2a, 0x41, 0x0a, 0x05, 0x54, 0x6f, 0x70, 0x69,
+	0x63, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x00, 0x12, 0x11,
+	0x0a, 0x0d, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c, 0x74, 0x68, 0x10,
+	0x01, 0x12, 0x18, 0x0a, 0x14, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x48, 0x65, 0x61, 0x6c,
+	0x74, 0x68, 0x43, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x10, 0x02, 0x2a, 0x29, 0x0a, 0x09, 0x43,
+	0x61, 0x74, 0x61, 0x6c, 0x6f, 0x67, 0x4f, 0x70, 0x12, 0x0c, 0x0a, 0x08, 0x52, 0x65, 0x67, 0x69,
+	0x73, 0x74, 0x65, 0x72, 0x10, 0x00, 0x12, 0x0e, 0x0a, 0x0a, 0x44, 0x65, 0x72, 0x65, 0x67, 0x69,
+	0x73, 0x74, 0x65, 0x72, 0x10, 0x01, 0x32, 0x59, 0x0a, 0x17, 0x53, 0x74, 0x61, 0x74, 0x65, 0x43,
+	0x68, 0x61, 0x6e, 0x67, 0x65, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f,
+	0x6e, 0x12, 0x3e, 0x0a, 0x09, 0x53, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x12, 0x1b,
+	0x2e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x53, 0x75, 0x62, 0x73, 0x63,
+	0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x10, 0x2e, 0x73, 0x75,
+	0x62, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65, 0x2e, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x22, 0x00, 0x30,
+	0x01, 0x42, 0x2f, 0x5a, 0x2d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f,
+	0x68, 0x61, 0x73, 0x68, 0x69, 0x63, 0x6f, 0x72, 0x70, 0x2f, 0x63, 0x6f, 0x6e, 0x73, 0x75, 0x6c,
+	0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x70, 0x62, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69,
+	0x62, 0x65, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
-func init() {
-	proto.RegisterFile("proto/pbsubscribe/subscribe.proto", fileDescriptor_ab3eb8c810e315fb)
+var (
+	file_proto_pbsubscribe_subscribe_proto_rawDescOnce sync.Once
+	file_proto_pbsubscribe_subscribe_proto_rawDescData = file_proto_pbsubscribe_subscribe_proto_rawDesc
+)
+
+func file_proto_pbsubscribe_subscribe_proto_rawDescGZIP() []byte {
+	file_proto_pbsubscribe_subscribe_proto_rawDescOnce.Do(func() {
+		file_proto_pbsubscribe_subscribe_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_pbsubscribe_subscribe_proto_rawDescData)
+	})
+	return file_proto_pbsubscribe_subscribe_proto_rawDescData
 }
 
-var fileDescriptor_ab3eb8c810e315fb = []byte{
-	// 527 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x53, 0x5d, 0x6f, 0xda, 0x3c,
-	0x14, 0xc6, 0xb4, 0x85, 0xe6, 0xf0, 0xb6, 0xca, 0xeb, 0x32, 0x2d, 0xa2, 0x53, 0xc5, 0xd0, 0x54,
-	0xb1, 0x4a, 0x23, 0x13, 0x93, 0xb6, 0xbb, 0x49, 0x83, 0xb6, 0x63, 0x9a, 0x04, 0x55, 0x68, 0x2f,
-	0xb6, 0x3b, 0xe3, 0x9c, 0x91, 0x88, 0xd4, 0xf6, 0x12, 0x53, 0xd6, 0xfb, 0xed, 0x1f, 0xee, 0x07,
-	0x4d, 0x31, 0x21, 0x04, 0xe8, 0x9d, 0xcf, 0xf3, 0xe1, 0x63, 0x9f, 0x0f, 0x78, 0xa9, 0x62, 0xa9,
-	0xa5, 0xab, 0x26, 0xc9, 0x7c, 0x92, 0xf0, 0x38, 0x9c, 0xa0, 0x9b, 0x9f, 0x3a, 0x86, 0xa3, 0x56,
-	0x0e, 0x34, 0x1a, 0xb9, 0x1a, 0xe3, 0x87, 0x90, 0xa3, 0x2b, 0xa4, 0x9f, 0xc9, 0x5a, 0x7f, 0x09,
-	0xd8, 0xe3, 0x95, 0xd2, 0xc3, 0x9f, 0x73, 0x4c, 0x34, 0x3d, 0x87, 0x83, 0x5b, 0xa9, 0x42, 0xee,
-	0x90, 0x26, 0x69, 0x1f, 0x77, 0xed, 0xce, 0xfa, 0x72, 0x83, 0x7b, 0x4b, 0x9a, 0xda, 0xb0, 0xf7,
-	0x15, 0x1f, 0x9d, 0x72, 0x93, 0xb4, 0x2d, 0x2f, 0x3d, 0xd2, 0x7a, 0xea, 0x9c, 0xa1, 0x70, 0xf6,
-	0x0c, 0xb6, 0x0c, 0x52, 0xf4, 0x8b, 0xf0, 0xf1, 0x97, 0xb3, 0xdf, 0x24, 0xed, 0x7d, 0x6f, 0x19,
-	0xd0, 0x33, 0x80, 0x4b, 0xa6, 0x19, 0x47, 0xa1, 0x31, 0x76, 0x0e, 0x8c, 0xa1, 0x80, 0xd0, 0x17,
-	0x60, 0x0d, 0xd9, 0x3d, 0x26, 0x8a, 0x71, 0x74, 0x2a, 0x86, 0x5e, 0x03, 0x29, 0x7b, 0xc3, 0x62,
-	0x1d, 0xea, 0x50, 0x0a, 0xa7, 0xba, 0x64, 0x73, 0xa0, 0xf5, 0xa7, 0x0c, 0x07, 0x57, 0x0f, 0x28,
-	0xf4, 0x3a, 0x37, 0x29, 0xe6, 0x3e, 0x87, 0xa3, 0x2b, 0xe1, 0x8f, 0x7e, 0x8c, 0x05, 0x53, 0x49,
-	0x20, 0xb5, 0xf9, 0xc3, 0xe1, 0xa0, 0xe4, 0x6d, 0xc2, 0xb4, 0x0b, 0x27, 0x43, 0x5c, 0xac, 0xc2,
-	0x5b, 0x79, 0x2d, 0xa3, 0x48, 0x2e, 0xcc, 0xef, 0x52, 0xf5, 0x53, 0x24, 0xfd, 0x00, 0x60, 0x52,
-	0xf7, 0x98, 0xe6, 0x81, 0xf9, 0x72, 0xad, 0xfb, 0xac, 0x50, 0xc2, 0x35, 0x39, 0x28, 0x79, 0x05,
-	0x29, 0xbd, 0x86, 0xa3, 0xf1, 0xb2, 0x43, 0x03, 0x64, 0x91, 0x0e, 0x1c, 0x30, 0xde, 0xb3, 0x82,
-	0x77, 0x83, 0xbf, 0x53, 0x3e, 0xd3, 0x98, 0x3e, 0x7a, 0x03, 0xee, 0x59, 0x50, 0xbd, 0x61, 0x8f,
-	0x91, 0x64, 0x7e, 0xeb, 0x7d, 0xf1, 0x2d, 0xb4, 0x0d, 0x15, 0x13, 0x25, 0x0e, 0x69, 0xee, 0xb5,
-	0x6b, 0x1b, 0x8d, 0x35, 0x84, 0x97, 0xf1, 0xad, 0xdf, 0x04, 0x4e, 0x9e, 0xc8, 0x45, 0x5f, 0x41,
-	0x79, 0xa4, 0xb2, 0xb1, 0xa8, 0x17, 0xdc, 0x7d, 0xa6, 0x59, 0x24, 0xa7, 0x23, 0xe5, 0x95, 0x47,
-	0x8a, 0x7e, 0x06, 0xbb, 0x1f, 0x20, 0x9f, 0x65, 0x37, 0x0c, 0xa5, 0x8f, 0xa6, 0xc0, 0xb5, 0xee,
-	0x69, 0x27, 0x9f, 0xc2, 0xce, 0xb6, 0xc4, 0xdb, 0x31, 0x5d, 0x7c, 0xca, 0x06, 0x91, 0xd6, 0xa0,
-	0x7a, 0x27, 0x66, 0x42, 0x2e, 0x84, 0x5d, 0xa2, 0xff, 0x6f, 0xd5, 0xc9, 0x26, 0xd4, 0x81, 0xfa,
-	0x06, 0xd4, 0x97, 0x42, 0x20, 0xd7, 0x76, 0xf9, 0xe2, 0x35, 0x58, 0xf9, 0xe3, 0xe8, 0x7f, 0x70,
-	0xe8, 0xe1, 0x34, 0x4c, 0x34, 0xc6, 0x76, 0x89, 0x1e, 0x03, 0x5c, 0x62, 0xbc, 0x8a, 0x49, 0xf7,
-	0x1b, 0x3c, 0x1f, 0x6b, 0xa6, 0xb1, 0x1f, 0x30, 0x31, 0xc5, 0x6c, 0x2b, 0x54, 0x3a, 0x4f, 0xf4,
-	0x23, 0x58, 0xf9, 0x96, 0xd0, 0xd3, 0x62, 0x43, 0xb6, 0x76, 0xa7, 0xb1, 0x53, 0xd3, 0x56, 0xe9,
-	0x2d, 0xe9, 0xb9, 0xdf, 0xdf, 0x4c, 0x43, 0x1d, 0xcc, 0x27, 0x1d, 0x2e, 0xef, 0xdd, 0x80, 0x25,
-	0x41, 0xc8, 0x65, 0xac, 0x5c, 0x2e, 0x45, 0x32, 0x8f, 0xdc, 0x9d, 0x75, 0x9e, 0x54, 0x0c, 0xf4,
-	0xee, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xb3, 0x69, 0x51, 0xea, 0x03, 0x00, 0x00,
+var file_proto_pbsubscribe_subscribe_proto_enumTypes = make([]protoimpl.EnumInfo, 2)
+var file_proto_pbsubscribe_subscribe_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_proto_pbsubscribe_subscribe_proto_goTypes = []interface{}{
+	(Topic)(0),                         // 0: subscribe.Topic
+	(CatalogOp)(0),                     // 1: subscribe.CatalogOp
+	(*SubscribeRequest)(nil),           // 2: subscribe.SubscribeRequest
+	(*Event)(nil),                      // 3: subscribe.Event
+	(*EventBatch)(nil),                 // 4: subscribe.EventBatch
+	(*ServiceHealthUpdate)(nil),        // 5: subscribe.ServiceHealthUpdate
+	(*pbservice.CheckServiceNode)(nil), // 6: pbservice.CheckServiceNode
+}
+var file_proto_pbsubscribe_subscribe_proto_depIdxs = []int32{
+	0, // 0: subscribe.SubscribeRequest.Topic:type_name -> subscribe.Topic
+	4, // 1: subscribe.Event.EventBatch:type_name -> subscribe.EventBatch
+	5, // 2: subscribe.Event.ServiceHealth:type_name -> subscribe.ServiceHealthUpdate
+	3, // 3: subscribe.EventBatch.Events:type_name -> subscribe.Event
+	1, // 4: subscribe.ServiceHealthUpdate.Op:type_name -> subscribe.CatalogOp
+	6, // 5: subscribe.ServiceHealthUpdate.CheckServiceNode:type_name -> pbservice.CheckServiceNode
+	2, // 6: subscribe.StateChangeSubscription.Subscribe:input_type -> subscribe.SubscribeRequest
+	3, // 7: subscribe.StateChangeSubscription.Subscribe:output_type -> subscribe.Event
+	7, // [7:8] is the sub-list for method output_type
+	6, // [6:7] is the sub-list for method input_type
+	6, // [6:6] is the sub-list for extension type_name
+	6, // [6:6] is the sub-list for extension extendee
+	0, // [0:6] is the sub-list for field type_name
+}
+
+func init() { file_proto_pbsubscribe_subscribe_proto_init() }
+func file_proto_pbsubscribe_subscribe_proto_init() {
+	if File_proto_pbsubscribe_subscribe_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*SubscribeRequest); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Event); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*EventBatch); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_proto_pbsubscribe_subscribe_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*ServiceHealthUpdate); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	file_proto_pbsubscribe_subscribe_proto_msgTypes[1].OneofWrappers = []interface{}{
+		(*Event_EndOfSnapshot)(nil),
+		(*Event_NewSnapshotToFollow)(nil),
+		(*Event_EventBatch)(nil),
+		(*Event_ServiceHealth)(nil),
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_proto_pbsubscribe_subscribe_proto_rawDesc,
+			NumEnums:      2,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   1,
+		},
+		GoTypes:           file_proto_pbsubscribe_subscribe_proto_goTypes,
+		DependencyIndexes: file_proto_pbsubscribe_subscribe_proto_depIdxs,
+		EnumInfos:         file_proto_pbsubscribe_subscribe_proto_enumTypes,
+		MessageInfos:      file_proto_pbsubscribe_subscribe_proto_msgTypes,
+	}.Build()
+	File_proto_pbsubscribe_subscribe_proto = out.File
+	file_proto_pbsubscribe_subscribe_proto_rawDesc = nil
+	file_proto_pbsubscribe_subscribe_proto_goTypes = nil
+	file_proto_pbsubscribe_subscribe_proto_depIdxs = nil
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
@@ -561,7 +785,7 @@ type StateChangeSubscriptionServer interface {
 type UnimplementedStateChangeSubscriptionServer struct {
 }
 
-func (*UnimplementedStateChangeSubscriptionServer) Subscribe(req *SubscribeRequest, srv StateChangeSubscription_SubscribeServer) error {
+func (*UnimplementedStateChangeSubscriptionServer) Subscribe(*SubscribeRequest, StateChangeSubscription_SubscribeServer) error {
 	return status.Errorf(codes.Unimplemented, "method Subscribe not implemented")
 }