functional-tester/rpcpb: add TLS flags

Signed-off-by: Gyuho Lee <gyuhox@gmail.com>

tools/functional-tester/rpcpb/etcd_config.go

@@ -30,8 +30,19 @@ var etcdFields = []string{
 
 	"ListenClientURLs",
 	"AdvertiseClientURLs",
+	"ClientAutoTLS",
+	"ClientCertAuth",
+	"ClientCertFile",
+	"ClientKeyFile",
+	"ClientTrustedCAFile",
+
 	"ListenPeerURLs",
 	"InitialAdvertisePeerURLs",
+	"PeerAutoTLS",
+	"PeerClientCertAuth",
+	"PeerCertFile",
+	"PeerKeyFile",
+	"PeerTrustedCAFile",
 
 	"InitialCluster",
 	"InitialClusterState",
@@ -72,12 +83,17 @@ func (cfg *Etcd) Flags() (fs []string) {
 		default:
 			panic(fmt.Errorf("field %q (%v) cannot be parsed", name, fv.Type().Kind()))
 		}
+
 		fname := field.Tag.Get("yaml")
+
 		// TODO: remove this
 		if fname == "initial-corrupt-check" {
 			fname = "experimental-" + fname
 		}
-		fs = append(fs, fmt.Sprintf("--%s=%s", fname, sv))
+
+		if sv != "" {
+			fs = append(fs, fmt.Sprintf("--%s=%s", fname, sv))
+		}
 	}
 	return fs
 }

tools/functional-tester/rpcpb/etcd_config_test.go

@@ -21,23 +21,40 @@ import (
 
 func TestEtcdFlags(t *testing.T) {
 	cfg := &Etcd{
-		Name:                     "s1",
-		DataDir:                  "/tmp/etcd-agent-data-1/etcd.data",
-		WALDir:                   "/tmp/etcd-agent-data-1/etcd.data/member/wal",
-		HeartbeatIntervalMs:      100,
-		ElectionTimeoutMs:        1000,
-		ListenClientURLs:         []string{"127.0.0.1:1379"},
-		AdvertiseClientURLs:      []string{"127.0.0.1:13790"},
+		Name:    "s1",
+		DataDir: "/tmp/etcd-agent-data-1/etcd.data",
+		WALDir:  "/tmp/etcd-agent-data-1/etcd.data/member/wal",
+
+		HeartbeatIntervalMs: 100,
+		ElectionTimeoutMs:   1000,
+
+		ListenClientURLs:    []string{"127.0.0.1:1379"},
+		AdvertiseClientURLs: []string{"127.0.0.1:13790"},
+		ClientAutoTLS:       true,
+		ClientCertAuth:      false,
+		ClientCertFile:      "",
+		ClientKeyFile:       "",
+		ClientTrustedCAFile: "",
+
 		ListenPeerURLs:           []string{"127.0.0.1:1380"},
 		InitialAdvertisePeerURLs: []string{"127.0.0.1:13800"},
-		InitialCluster:           "s1=127.0.0.1:13800,s2=127.0.0.1:23800,s3=127.0.0.1:33800",
-		InitialClusterState:      "new",
-		InitialClusterToken:      "tkn",
-		SnapshotCount:            10000,
-		QuotaBackendBytes:        10740000000,
-		PreVote:                  true,
-		InitialCorruptCheck:      true,
+		PeerAutoTLS:              true,
+		PeerClientCertAuth:       false,
+		PeerCertFile:             "",
+		PeerKeyFile:              "",
+		PeerTrustedCAFile:        "",
+
+		InitialCluster:      "s1=127.0.0.1:13800,s2=127.0.0.1:23800,s3=127.0.0.1:33800",
+		InitialClusterState: "new",
+		InitialClusterToken: "tkn",
+
+		SnapshotCount:     10000,
+		QuotaBackendBytes: 10740000000,
+
+		PreVote:             true,
+		InitialCorruptCheck: true,
 	}
+
 	exp := []string{
 		"--name=s1",
 		"--data-dir=/tmp/etcd-agent-data-1/etcd.data",
@@ -46,8 +63,12 @@ func TestEtcdFlags(t *testing.T) {
 		"--election-timeout=1000",
 		"--listen-client-urls=127.0.0.1:1379",
 		"--advertise-client-urls=127.0.0.1:13790",
+		"--auto-tls=true",
+		"--client-cert-auth=false",
 		"--listen-peer-urls=127.0.0.1:1380",
 		"--initial-advertise-peer-urls=127.0.0.1:13800",
+		"--peer-auto-tls=true",
+		"--peer-client-cert-auth=false",
 		"--initial-cluster=s1=127.0.0.1:13800,s2=127.0.0.1:23800,s3=127.0.0.1:33800",
 		"--initial-cluster-state=new",
 		"--initial-cluster-token=tkn",

tools/functional-tester/rpcpb/rpc.pb.go

@@ -237,15 +237,25 @@ type Etcd struct {
 	ElectionTimeoutMs        int64    `protobuf:"varint,12,opt,name=ElectionTimeoutMs,proto3" json:"ElectionTimeoutMs,omitempty" yaml:"election-timeout"`
 	ListenClientURLs         []string `protobuf:"bytes,21,rep,name=ListenClientURLs" json:"ListenClientURLs,omitempty" yaml:"listen-client-urls"`
 	AdvertiseClientURLs      []string `protobuf:"bytes,22,rep,name=AdvertiseClientURLs" json:"AdvertiseClientURLs,omitempty" yaml:"advertise-client-urls"`
-	ListenPeerURLs           []string `protobuf:"bytes,23,rep,name=ListenPeerURLs" json:"ListenPeerURLs,omitempty" yaml:"listen-peer-urls"`
-	InitialAdvertisePeerURLs []string `protobuf:"bytes,24,rep,name=InitialAdvertisePeerURLs" json:"InitialAdvertisePeerURLs,omitempty" yaml:"initial-advertise-peer-urls"`
-	InitialCluster           string   `protobuf:"bytes,31,opt,name=InitialCluster,proto3" json:"InitialCluster,omitempty" yaml:"initial-cluster"`
-	InitialClusterState      string   `protobuf:"bytes,32,opt,name=InitialClusterState,proto3" json:"InitialClusterState,omitempty" yaml:"initial-cluster-state"`
-	InitialClusterToken      string   `protobuf:"bytes,33,opt,name=InitialClusterToken,proto3" json:"InitialClusterToken,omitempty" yaml:"initial-cluster-token"`
-	SnapshotCount            int64    `protobuf:"varint,41,opt,name=SnapshotCount,proto3" json:"SnapshotCount,omitempty" yaml:"snapshot-count"`
-	QuotaBackendBytes        int64    `protobuf:"varint,42,opt,name=QuotaBackendBytes,proto3" json:"QuotaBackendBytes,omitempty" yaml:"quota-backend-bytes"`
-	PreVote                  bool     `protobuf:"varint,43,opt,name=PreVote,proto3" json:"PreVote,omitempty" yaml:"pre-vote"`
-	InitialCorruptCheck      bool     `protobuf:"varint,44,opt,name=InitialCorruptCheck,proto3" json:"InitialCorruptCheck,omitempty" yaml:"initial-corrupt-check"`
+	ClientAutoTLS            bool     `protobuf:"varint,23,opt,name=ClientAutoTLS,proto3" json:"ClientAutoTLS,omitempty" yaml:"auto-tls"`
+	ClientCertAuth           bool     `protobuf:"varint,24,opt,name=ClientCertAuth,proto3" json:"ClientCertAuth,omitempty" yaml:"client-cert-auth"`
+	ClientCertFile           string   `protobuf:"bytes,25,opt,name=ClientCertFile,proto3" json:"ClientCertFile,omitempty" yaml:"cert-file"`
+	ClientKeyFile            string   `protobuf:"bytes,26,opt,name=ClientKeyFile,proto3" json:"ClientKeyFile,omitempty" yaml:"key-file"`
+	ClientTrustedCAFile      string   `protobuf:"bytes,27,opt,name=ClientTrustedCAFile,proto3" json:"ClientTrustedCAFile,omitempty" yaml:"trusted-ca-file"`
+	ListenPeerURLs           []string `protobuf:"bytes,31,rep,name=ListenPeerURLs" json:"ListenPeerURLs,omitempty" yaml:"listen-peer-urls"`
+	InitialAdvertisePeerURLs []string `protobuf:"bytes,32,rep,name=InitialAdvertisePeerURLs" json:"InitialAdvertisePeerURLs,omitempty" yaml:"initial-advertise-peer-urls"`
+	PeerAutoTLS              bool     `protobuf:"varint,33,opt,name=PeerAutoTLS,proto3" json:"PeerAutoTLS,omitempty" yaml:"peer-auto-tls"`
+	PeerClientCertAuth       bool     `protobuf:"varint,34,opt,name=PeerClientCertAuth,proto3" json:"PeerClientCertAuth,omitempty" yaml:"peer-client-cert-auth"`
+	PeerCertFile             string   `protobuf:"bytes,35,opt,name=PeerCertFile,proto3" json:"PeerCertFile,omitempty" yaml:"peer-cert-file"`
+	PeerKeyFile              string   `protobuf:"bytes,36,opt,name=PeerKeyFile,proto3" json:"PeerKeyFile,omitempty" yaml:"peer-key-file"`
+	PeerTrustedCAFile        string   `protobuf:"bytes,37,opt,name=PeerTrustedCAFile,proto3" json:"PeerTrustedCAFile,omitempty" yaml:"peer-trusted-ca-file"`
+	InitialCluster           string   `protobuf:"bytes,41,opt,name=InitialCluster,proto3" json:"InitialCluster,omitempty" yaml:"initial-cluster"`
+	InitialClusterState      string   `protobuf:"bytes,42,opt,name=InitialClusterState,proto3" json:"InitialClusterState,omitempty" yaml:"initial-cluster-state"`
+	InitialClusterToken      string   `protobuf:"bytes,43,opt,name=InitialClusterToken,proto3" json:"InitialClusterToken,omitempty" yaml:"initial-cluster-token"`
+	SnapshotCount            int64    `protobuf:"varint,51,opt,name=SnapshotCount,proto3" json:"SnapshotCount,omitempty" yaml:"snapshot-count"`
+	QuotaBackendBytes        int64    `protobuf:"varint,52,opt,name=QuotaBackendBytes,proto3" json:"QuotaBackendBytes,omitempty" yaml:"quota-backend-bytes"`
+	PreVote                  bool     `protobuf:"varint,63,opt,name=PreVote,proto3" json:"PreVote,omitempty" yaml:"pre-vote"`
+	InitialCorruptCheck      bool     `protobuf:"varint,64,opt,name=InitialCorruptCheck,proto3" json:"InitialCorruptCheck,omitempty" yaml:"initial-corrupt-check"`
 }
 
 func (m *Etcd) Reset()                    { *m = Etcd{} }
@@ -557,9 +567,57 @@ func (m *Etcd) MarshalTo(dAtA []byte) (int, error) {
 			i += copy(dAtA[i:], s)
 		}
 	}
+	if m.ClientAutoTLS {
+		dAtA[i] = 0xb8
+		i++
+		dAtA[i] = 0x1
+		i++
+		if m.ClientAutoTLS {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i++
+	}
+	if m.ClientCertAuth {
+		dAtA[i] = 0xc0
+		i++
+		dAtA[i] = 0x1
+		i++
+		if m.ClientCertAuth {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i++
+	}
+	if len(m.ClientCertFile) > 0 {
+		dAtA[i] = 0xca
+		i++
+		dAtA[i] = 0x1
+		i++
+		i = encodeVarintRpc(dAtA, i, uint64(len(m.ClientCertFile)))
+		i += copy(dAtA[i:], m.ClientCertFile)
+	}
+	if len(m.ClientKeyFile) > 0 {
+		dAtA[i] = 0xd2
+		i++
+		dAtA[i] = 0x1
+		i++
+		i = encodeVarintRpc(dAtA, i, uint64(len(m.ClientKeyFile)))
+		i += copy(dAtA[i:], m.ClientKeyFile)
+	}
+	if len(m.ClientTrustedCAFile) > 0 {
+		dAtA[i] = 0xda
+		i++
+		dAtA[i] = 0x1
+		i++
+		i = encodeVarintRpc(dAtA, i, uint64(len(m.ClientTrustedCAFile)))
+		i += copy(dAtA[i:], m.ClientTrustedCAFile)
+	}
 	if len(m.ListenPeerURLs) > 0 {
 		for _, s := range m.ListenPeerURLs {
-			dAtA[i] = 0xba
+			dAtA[i] = 0xfa
 			i++
 			dAtA[i] = 0x1
 			i++
@@ -576,9 +634,9 @@ func (m *Etcd) MarshalTo(dAtA []byte) (int, error) {
 	}
 	if len(m.InitialAdvertisePeerURLs) > 0 {
 		for _, s := range m.InitialAdvertisePeerURLs {
-			dAtA[i] = 0xc2
+			dAtA[i] = 0x82
 			i++
-			dAtA[i] = 0x1
+			dAtA[i] = 0x2
 			i++
 			l = len(s)
 			for l >= 1<<7 {
@@ -591,16 +649,64 @@ func (m *Etcd) MarshalTo(dAtA []byte) (int, error) {
 			i += copy(dAtA[i:], s)
 		}
 	}
+	if m.PeerAutoTLS {
+		dAtA[i] = 0x88
+		i++
+		dAtA[i] = 0x2
+		i++
+		if m.PeerAutoTLS {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i++
+	}
+	if m.PeerClientCertAuth {
+		dAtA[i] = 0x90
+		i++
+		dAtA[i] = 0x2
+		i++
+		if m.PeerClientCertAuth {
+			dAtA[i] = 1
+		} else {
+			dAtA[i] = 0
+		}
+		i++
+	}
+	if len(m.PeerCertFile) > 0 {
+		dAtA[i] = 0x9a
+		i++
+		dAtA[i] = 0x2
+		i++
+		i = encodeVarintRpc(dAtA, i, uint64(len(m.PeerCertFile)))
+		i += copy(dAtA[i:], m.PeerCertFile)
+	}
+	if len(m.PeerKeyFile) > 0 {
+		dAtA[i] = 0xa2
+		i++
+		dAtA[i] = 0x2
+		i++
+		i = encodeVarintRpc(dAtA, i, uint64(len(m.PeerKeyFile)))
+		i += copy(dAtA[i:], m.PeerKeyFile)
+	}
+	if len(m.PeerTrustedCAFile) > 0 {
+		dAtA[i] = 0xaa
+		i++
+		dAtA[i] = 0x2
+		i++
+		i = encodeVarintRpc(dAtA, i, uint64(len(m.PeerTrustedCAFile)))
+		i += copy(dAtA[i:], m.PeerTrustedCAFile)
+	}
 	if len(m.InitialCluster) > 0 {
-		dAtA[i] = 0xfa
+		dAtA[i] = 0xca
 		i++
-		dAtA[i] = 0x1
+		dAtA[i] = 0x2
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(len(m.InitialCluster)))
 		i += copy(dAtA[i:], m.InitialCluster)
 	}
 	if len(m.InitialClusterState) > 0 {
-		dAtA[i] = 0x82
+		dAtA[i] = 0xd2
 		i++
 		dAtA[i] = 0x2
 		i++
@@ -608,7 +714,7 @@ func (m *Etcd) MarshalTo(dAtA []byte) (int, error) {
 		i += copy(dAtA[i:], m.InitialClusterState)
 	}
 	if len(m.InitialClusterToken) > 0 {
-		dAtA[i] = 0x8a
+		dAtA[i] = 0xda
 		i++
 		dAtA[i] = 0x2
 		i++
@@ -616,23 +722,23 @@ func (m *Etcd) MarshalTo(dAtA []byte) (int, error) {
 		i += copy(dAtA[i:], m.InitialClusterToken)
 	}
 	if m.SnapshotCount != 0 {
-		dAtA[i] = 0xc8
+		dAtA[i] = 0x98
 		i++
-		dAtA[i] = 0x2
+		dAtA[i] = 0x3
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.SnapshotCount))
 	}
 	if m.QuotaBackendBytes != 0 {
-		dAtA[i] = 0xd0
+		dAtA[i] = 0xa0
 		i++
-		dAtA[i] = 0x2
+		dAtA[i] = 0x3
 		i++
 		i = encodeVarintRpc(dAtA, i, uint64(m.QuotaBackendBytes))
 	}
 	if m.PreVote {
-		dAtA[i] = 0xd8
+		dAtA[i] = 0xf8
 		i++
-		dAtA[i] = 0x2
+		dAtA[i] = 0x3
 		i++
 		if m.PreVote {
 			dAtA[i] = 1
@@ -642,9 +748,9 @@ func (m *Etcd) MarshalTo(dAtA []byte) (int, error) {
 		i++
 	}
 	if m.InitialCorruptCheck {
-		dAtA[i] = 0xe0
+		dAtA[i] = 0x80
 		i++
-		dAtA[i] = 0x2
+		dAtA[i] = 0x4
 		i++
 		if m.InitialCorruptCheck {
 			dAtA[i] = 1
@@ -1106,6 +1212,24 @@ func (m *Etcd) Size() (n int) {
 			n += 2 + l + sovRpc(uint64(l))
 		}
 	}
+	if m.ClientAutoTLS {
+		n += 3
+	}
+	if m.ClientCertAuth {
+		n += 3
+	}
+	l = len(m.ClientCertFile)
+	if l > 0 {
+		n += 2 + l + sovRpc(uint64(l))
+	}
+	l = len(m.ClientKeyFile)
+	if l > 0 {
+		n += 2 + l + sovRpc(uint64(l))
+	}
+	l = len(m.ClientTrustedCAFile)
+	if l > 0 {
+		n += 2 + l + sovRpc(uint64(l))
+	}
 	if len(m.ListenPeerURLs) > 0 {
 		for _, s := range m.ListenPeerURLs {
 			l = len(s)
@@ -1118,6 +1242,24 @@ func (m *Etcd) Size() (n int) {
 			n += 2 + l + sovRpc(uint64(l))
 		}
 	}
+	if m.PeerAutoTLS {
+		n += 3
+	}
+	if m.PeerClientCertAuth {
+		n += 3
+	}
+	l = len(m.PeerCertFile)
+	if l > 0 {
+		n += 2 + l + sovRpc(uint64(l))
+	}
+	l = len(m.PeerKeyFile)
+	if l > 0 {
+		n += 2 + l + sovRpc(uint64(l))
+	}
+	l = len(m.PeerTrustedCAFile)
+	if l > 0 {
+		n += 2 + l + sovRpc(uint64(l))
+	}
 	l = len(m.InitialCluster)
 	if l > 0 {
 		n += 2 + l + sovRpc(uint64(l))
@@ -1532,6 +1674,133 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			m.AdvertiseClientURLs = append(m.AdvertiseClientURLs, string(dAtA[iNdEx:postIndex]))
 			iNdEx = postIndex
 		case 23:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClientAutoTLS", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.ClientAutoTLS = bool(v != 0)
+		case 24:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClientCertAuth", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.ClientCertAuth = bool(v != 0)
+		case 25:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClientCertFile", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ClientCertFile = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 26:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClientKeyFile", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ClientKeyFile = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 27:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field ClientTrustedCAFile", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.ClientTrustedCAFile = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 31:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field ListenPeerURLs", wireType)
 			}
@@ -1560,7 +1829,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			}
 			m.ListenPeerURLs = append(m.ListenPeerURLs, string(dAtA[iNdEx:postIndex]))
 			iNdEx = postIndex
-		case 24:
+		case 32:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field InitialAdvertisePeerURLs", wireType)
 			}
@@ -1589,7 +1858,134 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			}
 			m.InitialAdvertisePeerURLs = append(m.InitialAdvertisePeerURLs, string(dAtA[iNdEx:postIndex]))
 			iNdEx = postIndex
-		case 31:
+		case 33:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PeerAutoTLS", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.PeerAutoTLS = bool(v != 0)
+		case 34:
+			if wireType != 0 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PeerClientCertAuth", wireType)
+			}
+			var v int
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				v |= (int(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			m.PeerClientCertAuth = bool(v != 0)
+		case 35:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PeerCertFile", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.PeerCertFile = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 36:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PeerKeyFile", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.PeerKeyFile = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 37:
+			if wireType != 2 {
+				return fmt.Errorf("proto: wrong wireType = %d for field PeerTrustedCAFile", wireType)
+			}
+			var stringLen uint64
+			for shift := uint(0); ; shift += 7 {
+				if shift >= 64 {
+					return ErrIntOverflowRpc
+				}
+				if iNdEx >= l {
+					return io.ErrUnexpectedEOF
+				}
+				b := dAtA[iNdEx]
+				iNdEx++
+				stringLen |= (uint64(b) & 0x7F) << shift
+				if b < 0x80 {
+					break
+				}
+			}
+			intStringLen := int(stringLen)
+			if intStringLen < 0 {
+				return ErrInvalidLengthRpc
+			}
+			postIndex := iNdEx + intStringLen
+			if postIndex > l {
+				return io.ErrUnexpectedEOF
+			}
+			m.PeerTrustedCAFile = string(dAtA[iNdEx:postIndex])
+			iNdEx = postIndex
+		case 41:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field InitialCluster", wireType)
 			}
@@ -1618,7 +2014,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			}
 			m.InitialCluster = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 32:
+		case 42:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field InitialClusterState", wireType)
 			}
@@ -1647,7 +2043,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			}
 			m.InitialClusterState = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 33:
+		case 43:
 			if wireType != 2 {
 				return fmt.Errorf("proto: wrong wireType = %d for field InitialClusterToken", wireType)
 			}
@@ -1676,7 +2072,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 			}
 			m.InitialClusterToken = string(dAtA[iNdEx:postIndex])
 			iNdEx = postIndex
-		case 41:
+		case 51:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field SnapshotCount", wireType)
 			}
@@ -1695,7 +2091,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 42:
+		case 52:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field QuotaBackendBytes", wireType)
 			}
@@ -1714,7 +2110,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 					break
 				}
 			}
-		case 43:
+		case 63:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field PreVote", wireType)
 			}
@@ -1734,7 +2130,7 @@ func (m *Etcd) Unmarshal(dAtA []byte) error {
 				}
 			}
 			m.PreVote = bool(v != 0)
-		case 44:
+		case 64:
 			if wireType != 0 {
 				return fmt.Errorf("proto: wrong wireType = %d for field InitialCorruptCheck", wireType)
 			}
@@ -2995,137 +3391,149 @@ var (
 func init() { proto.RegisterFile("rpcpb/rpc.proto", fileDescriptorRpc) }
 
 var fileDescriptorRpc = []byte{
-	// 2099 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x5b, 0x77, 0xdb, 0x58,
-	0x15, 0x8e, 0x92, 0x26, 0x4d, 0x4e, 0x6e, 0xea, 0x49, 0xd3, 0xa8, 0x97, 0x89, 0x52, 0x95, 0x96,
-	0x34, 0x8c, 0x52, 0x68, 0x59, 0xc0, 0x94, 0x19, 0x3a, 0x8e, 0xa3, 0x36, 0x26, 0x8a, 0xed, 0x1e,
-	0x2b, 0x6d, 0xe7, 0xc9, 0xc8, 0xd2, 0xb1, 0x2d, 0xa2, 0x48, 0xaa, 0x74, 0x9c, 0x71, 0xe6, 0x0f,
-	0xb0, 0x78, 0xe3, 0x91, 0x1f, 0xc1, 0xfc, 0x8f, 0xce, 0x05, 0x18, 0xe0, 0x8d, 0x07, 0x03, 0x65,
-	0xb1, 0x16, 0xcf, 0x5e, 0xfc, 0x00, 0xd6, 0xb9, 0xd8, 0x96, 0x7c, 0x49, 0xfb, 0x96, 0xb3, 0xf7,
-	0xf7, 0x7d, 0xda, 0x67, 0x9f, 0x7d, 0xf6, 0x3e, 0x0e, 0x58, 0x8d, 0x23, 0x27, 0xaa, 0x3d, 0x88,
-	0x23, 0x67, 0x37, 0x8a, 0x43, 0x12, 0xc2, 0x59, 0x66, 0xb8, 0xa1, 0x37, 0x3c, 0xd2, 0x6c, 0xd5,
-	0x76, 0x9d, 0xf0, 0xf4, 0x41, 0x23, 0x6c, 0x84, 0x0f, 0x98, 0xb7, 0xd6, 0xaa, 0xb3, 0x15, 0x5b,
-	0xb0, 0xbf, 0x38, 0x4b, 0xfb, 0xef, 0x3c, 0xb8, 0x64, 0x10, 0xc7, 0x85, 0x77, 0xc0, 0xa5, 0xa2,
-	0x7d, 0x8a, 0x15, 0x69, 0x4b, 0xda, 0x5e, 0xd8, 0x5b, 0xed, 0x76, 0xd4, 0xc5, 0x73, 0xfb, 0xd4,
-	0x7f, 0xac, 0x05, 0xf6, 0x29, 0xd6, 0x10, 0x73, 0x42, 0x1d, 0x5c, 0xde, 0xb7, 0x89, 0xbd, 0xef,
-	0xc5, 0xca, 0x34, 0xc3, 0xad, 0x75, 0x3b, 0xea, 0x2a, 0xc7, 0xb9, 0x36, 0xb1, 0x75, 0xd7, 0x8b,
-	0x35, 0xd4, 0xc3, 0xc0, 0x1d, 0x30, 0xf7, 0x32, 0x67, 0x52, 0xf4, 0x0c, 0x43, 0xc3, 0x6e, 0x47,
-	0x5d, 0xe1, 0xe8, 0xcf, 0x6d, 0x9f, 0x83, 0x05, 0x02, 0x96, 0xc0, 0xda, 0x01, 0xb6, 0x63, 0x52,
-	0xc3, 0x36, 0x29, 0x04, 0x04, 0xc7, 0x67, 0xb6, 0x7f, 0x94, 0x28, 0x8b, 0x5b, 0xd2, 0xf6, 0xcc,
-	0xde, 0x07, 0xdd, 0x8e, 0x7a, 0x9d, 0x13, 0x9b, 0x3d, 0x90, 0xee, 0x09, 0x94, 0x86, 0xc6, 0x31,
-	0x61, 0x01, 0x5c, 0x31, 0x7c, 0xec, 0x10, 0x2f, 0x0c, 0x2c, 0xef, 0x14, 0x87, 0x2d, 0x72, 0x94,
-	0x28, 0x4b, 0x4c, 0xee, 0x66, 0xb7, 0xa3, 0x6e, 0x70, 0x39, 0x2c, 0x20, 0x3a, 0xe1, 0x18, 0x0d,
-	0x8d, 0xb2, 0x60, 0x01, 0xc8, 0xa6, 0x97, 0x10, 0x1c, 0xe4, 0x7d, 0x0f, 0x07, 0xe4, 0x18, 0x99,
-	0x89, 0xb2, 0xbe, 0x35, 0xb3, 0xbd, 0x90, 0x0e, 0xcc, 0x67, 0x08, 0xdd, 0x61, 0x10, 0xbd, 0x15,
-	0xfb, 0x89, 0x86, 0x46, 0x68, 0x10, 0x81, 0xb5, 0x9c, 0x7b, 0x86, 0x63, 0xe2, 0x25, 0x38, 0xa5,
-	0x76, 0x8d, 0xa9, 0x6d, 0x75, 0x3b, 0xea, 0x2d, 0xae, 0x66, 0xf7, 0x40, 0x59, 0xc1, 0x71, 0x64,
-	0x98, 0x07, 0x2b, 0xfc, 0x3b, 0x65, 0x8c, 0x63, 0x26, 0xb7, 0xc1, 0xe4, 0x52, 0xdb, 0x14, 0xc1,
-	0x45, 0x18, 0xc7, 0x42, 0x69, 0x88, 0x02, 0x6b, 0x40, 0x29, 0x04, 0x1e, 0xf1, 0x6c, 0xbf, 0xff,
-	0x89, 0xbe, 0x9c, 0xc2, 0xe4, 0xee, 0x75, 0x3b, 0xaa, 0xc6, 0xe5, 0x3c, 0x8e, 0xd4, 0x07, 0x51,
-	0xa6, 0x94, 0x27, 0xea, 0xc0, 0x3d, 0xb0, 0x22, 0x7c, 0x79, 0xbf, 0x95, 0x10, 0x1c, 0x2b, 0x2a,
-	0xab, 0x8b, 0x1b, 0xdd, 0x8e, 0x7a, 0x2d, 0xab, 0xec, 0x70, 0x80, 0x86, 0x86, 0x18, 0x34, 0x81,
-	0x59, 0x4b, 0x85, 0xd8, 0x04, 0x2b, 0x5b, 0x4c, 0x28, 0x95, 0xc0, 0x21, 0x21, 0x3d, 0xa1, 0x30,
-	0x0d, 0x8d, 0x23, 0x8f, 0x6a, 0x5a, 0xe1, 0x09, 0x0e, 0x94, 0xdb, 0xef, 0xd2, 0x24, 0x14, 0x36,
-	0xa2, 0xc9, 0xc8, 0xf0, 0x09, 0x58, 0xae, 0x04, 0x76, 0x94, 0x34, 0x43, 0x92, 0x0f, 0x5b, 0x01,
-	0x51, 0xee, 0xb3, 0xd2, 0xbb, 0xde, 0xed, 0xa8, 0xeb, 0x5c, 0x2d, 0x11, 0x6e, 0xdd, 0xa1, 0x7e,
-	0x0d, 0x65, 0xf1, 0xd0, 0x04, 0x57, 0x9e, 0xb7, 0x42, 0x62, 0xef, 0xd9, 0xce, 0x09, 0x0e, 0xdc,
-	0xbd, 0x73, 0x82, 0x13, 0x65, 0x87, 0x89, 0x6c, 0x76, 0x3b, 0xea, 0x0d, 0x2e, 0xf2, 0x9a, 0x42,
-	0xf4, 0x1a, 0xc7, 0xe8, 0x35, 0x0a, 0xd2, 0xd0, 0x28, 0x91, 0xde, 0xdc, 0x72, 0x8c, 0x5f, 0x84,
-	0x04, 0x2b, 0x3f, 0xd8, 0x92, 0xb6, 0xe7, 0xd3, 0x37, 0x37, 0x8a, 0xb1, 0x7e, 0x16, 0xd2, 0xec,
-	0xf4, 0x30, 0xe9, 0x8c, 0x84, 0x71, 0xdc, 0x8a, 0x48, 0xbe, 0x89, 0x9d, 0x13, 0xe5, 0x43, 0x46,
-	0x1d, 0x97, 0x11, 0x8e, 0xd2, 0x1d, 0x0a, 0x4b, 0x65, 0x24, 0x45, 0xd6, 0x7e, 0x3b, 0x0b, 0xe6,
-	0x8e, 0xf0, 0x69, 0x0d, 0xc7, 0xf0, 0x13, 0xb0, 0x44, 0x9b, 0x8e, 0xd1, 0xc6, 0x4e, 0xd9, 0x26,
-	0x4d, 0xd1, 0x74, 0x52, 0xb9, 0xc1, 0xc4, 0x71, 0x75, 0xdc, 0xc6, 0x8e, 0x1e, 0xd9, 0xa4, 0xa9,
-	0xa1, 0x0c, 0x1c, 0x3e, 0x02, 0x0b, 0xb9, 0x06, 0x0e, 0x48, 0xce, 0x75, 0x63, 0xd6, 0x21, 0x16,
-	0xf6, 0xd6, 0xbb, 0x1d, 0xf5, 0x8a, 0xb8, 0x3a, 0xd4, 0xa5, 0xdb, 0xae, 0x1b, 0x6b, 0x68, 0x80,
-	0xa3, 0xf9, 0x7c, 0x6a, 0x7b, 0x7e, 0x14, 0x7a, 0x01, 0x39, 0xb0, 0xac, 0x32, 0x23, 0x2f, 0x31,
-	0x72, 0x2a, 0x9f, 0xf5, 0x1e, 0x44, 0x6f, 0x12, 0x12, 0x09, 0x95, 0x51, 0x22, 0xcd, 0xe7, 0x9e,
-	0x9d, 0x60, 0xda, 0xdb, 0xf0, 0x70, 0x27, 0xac, 0xd9, 0x09, 0x16, 0x9d, 0x50, 0x60, 0xe0, 0x63,
-	0xb0, 0x48, 0x77, 0x60, 0x86, 0x0d, 0xb6, 0xdf, 0x3a, 0xa3, 0x28, 0xdd, 0x8e, 0x7a, 0x35, 0xb5,
-	0x5f, 0x3f, 0x6c, 0x88, 0xed, 0xa6, 0xc1, 0x30, 0x07, 0x96, 0xe9, 0x92, 0x5f, 0x78, 0xcb, 0xac,
-	0x28, 0x5f, 0x49, 0xec, 0x18, 0x52, 0xb7, 0x86, 0xd1, 0x45, 0xa3, 0x20, 0xf4, 0x0e, 0x66, 0x19,
-	0xf0, 0x19, 0x58, 0x1d, 0x18, 0xca, 0x71, 0xd8, 0x3e, 0x57, 0xbe, 0xe6, 0x22, 0xb7, 0xba, 0x1d,
-	0x55, 0x19, 0x15, 0x89, 0x28, 0x46, 0x43, 0xc3, 0xac, 0x5e, 0x2c, 0xf4, 0x46, 0x73, 0x99, 0x6f,
-	0xc6, 0xc7, 0xc2, 0xda, 0x81, 0x10, 0xc9, 0x32, 0x60, 0x19, 0xc0, 0x81, 0xaa, 0x11, 0xb8, 0x2c,
-	0xaf, 0xca, 0xb7, 0xbc, 0x04, 0xd4, 0x6e, 0x47, 0xbd, 0x39, 0x1a, 0x0e, 0x16, 0x30, 0x0d, 0x8d,
-	0xe1, 0xc2, 0x1f, 0xf1, 0x11, 0xa6, 0x7c, 0x49, 0x67, 0xd2, 0xe2, 0xc3, 0xc5, 0x5d, 0x36, 0x09,
-	0x77, 0xa9, 0x2d, 0x3d, 0xc8, 0xa8, 0xa0, 0x86, 0x18, 0x54, 0xfb, 0xfb, 0x12, 0x98, 0xb3, 0x30,
-	0x6b, 0x28, 0x4f, 0xc0, 0x32, 0xff, 0xab, 0x88, 0xc9, 0xe7, 0x61, 0x7c, 0x32, 0x5a, 0x8c, 0x84,
-	0xb9, 0xf5, 0x80, 0xfb, 0x35, 0x94, 0xc5, 0xc3, 0x9f, 0x00, 0xc0, 0x0d, 0xac, 0xa2, 0xf8, 0x5c,
-	0xbc, 0xd6, 0xed, 0xa8, 0x30, 0xc3, 0xe6, 0x95, 0x94, 0x42, 0xd2, 0xb6, 0xbd, 0x8f, 0x7d, 0xfb,
-	0xdc, 0xb4, 0x09, 0x0e, 0x9c, 0x73, 0x31, 0xec, 0x96, 0xd3, 0x6d, 0xdb, 0xa5, 0x7e, 0xdd, 0xe7,
-	0x00, 0xfd, 0x94, 0xb6, 0xed, 0x2c, 0x05, 0xfe, 0x12, 0xc8, 0x59, 0x0b, 0x3a, 0x63, 0x45, 0xbd,
-	0x9c, 0x2e, 0xea, 0x61, 0x19, 0x3d, 0x3e, 0xd3, 0xd0, 0x08, 0x0f, 0x7e, 0x06, 0xd6, 0x8f, 0x23,
-	0xd7, 0x26, 0xd8, 0x1d, 0x8a, 0x6b, 0x99, 0x09, 0xde, 0xe9, 0x76, 0x54, 0x95, 0x0b, 0xb6, 0x38,
-	0x4c, 0x1f, 0x8d, 0x6f, 0xbc, 0x02, 0xcd, 0x11, 0x0a, 0x5b, 0x81, 0x6b, 0x7a, 0xa7, 0x1e, 0x51,
-	0xd6, 0xb7, 0xa4, 0xed, 0xd9, 0x74, 0x8e, 0x62, 0xea, 0xd3, 0x7d, 0xea, 0xd4, 0x50, 0x0a, 0x09,
-	0x3f, 0x05, 0xcb, 0x46, 0xdb, 0x23, 0xa5, 0x80, 0xde, 0xc0, 0x56, 0x8c, 0x95, 0x6b, 0x23, 0xe5,
-	0xd6, 0xf6, 0x88, 0x1e, 0x06, 0x7a, 0x9d, 0x03, 0x68, 0xb9, 0xa5, 0x09, 0xf0, 0x00, 0xc8, 0xf9,
-	0x30, 0x48, 0xd8, 0xb0, 0x73, 0xce, 0x79, 0x1b, 0xdb, 0x18, 0x2e, 0x7d, 0x67, 0x80, 0xe8, 0xb5,
-	0xb0, 0x11, 0x16, 0xfc, 0x08, 0x2c, 0x1a, 0x81, 0x5d, 0xf3, 0x71, 0x39, 0x8a, 0xc3, 0xba, 0xa2,
-	0x30, 0x91, 0x8d, 0x6e, 0x47, 0x5d, 0x13, 0x91, 0x30, 0xa7, 0x1e, 0x51, 0x2f, 0xbd, 0xc2, 0x03,
-	0x2c, 0xfc, 0x18, 0x2c, 0x89, 0x78, 0xf2, 0x76, 0x82, 0x13, 0x45, 0x65, 0x03, 0x35, 0x75, 0xff,
-	0x45, 0xf4, 0xba, 0x43, 0xdd, 0x1a, 0xca, 0xa0, 0x69, 0xa1, 0x88, 0x35, 0xcb, 0xea, 0x51, 0xc2,
-	0xa6, 0x5d, 0xa6, 0x50, 0x7a, 0x7c, 0x7e, 0x20, 0xac, 0x50, 0xb2, 0x14, 0x3a, 0x7b, 0x85, 0xa5,
-	0xd2, 0x6c, 0xd5, 0xeb, 0x3e, 0x66, 0xe3, 0x2d, 0x93, 0xca, 0x9e, 0x48, 0xc2, 0x01, 0x03, 0x0d,
-	0xc1, 0x80, 0x87, 0xa9, 0x16, 0x9a, 0x0f, 0x4f, 0x4f, 0xed, 0xc0, 0x4d, 0x14, 0x6d, 0xf8, 0x21,
-	0x34, 0x68, 0xa1, 0x8e, 0xc0, 0xa4, 0x3b, 0x68, 0x8f, 0x47, 0x77, 0x85, 0x5a, 0x41, 0x80, 0xe3,
-	0xfe, 0x14, 0xb8, 0xcf, 0xae, 0x4e, 0x6a, 0x57, 0x31, 0xf3, 0xa7, 0xe7, 0xc0, 0x10, 0x85, 0xbe,
-	0xcc, 0x8c, 0x36, 0xc1, 0x71, 0x60, 0xfb, 0x7d, 0x99, 0x1d, 0x26, 0x93, 0x0a, 0x08, 0x0b, 0x44,
-	0x5a, 0x68, 0x84, 0x46, 0x8f, 0xb7, 0x42, 0x62, 0x9c, 0x24, 0xd6, 0x79, 0x84, 0x13, 0x05, 0xb3,
-	0x6d, 0xa5, 0x8e, 0x37, 0x61, 0x4e, 0x9d, 0x50, 0xaf, 0x86, 0xd2, 0x58, 0x5a, 0xa5, 0x7c, 0x79,
-	0x88, 0xcf, 0x2b, 0xde, 0x17, 0x98, 0xf5, 0xf7, 0xd9, 0x74, 0x6a, 0x05, 0xf9, 0x04, 0x9f, 0xeb,
-	0x89, 0xf7, 0x05, 0xad, 0xd2, 0x0c, 0x81, 0x36, 0xc5, 0x8c, 0xc1, 0xb4, 0xe3, 0x06, 0x56, 0x1a,
-	0x4c, 0x26, 0x35, 0x6e, 0x87, 0x64, 0x74, 0x9f, 0xc2, 0x34, 0x34, 0x86, 0x0b, 0x5f, 0x80, 0xab,
-	0x03, 0x6b, 0xab, 0x5e, 0xf7, 0xda, 0xc8, 0x0e, 0x1a, 0x58, 0x69, 0x32, 0x4d, 0xad, 0xdb, 0x51,
-	0x37, 0x47, 0x35, 0x19, 0x4e, 0x8f, 0x29, 0x50, 0x43, 0x63, 0xf9, 0xf0, 0x57, 0x60, 0x63, 0x9c,
-	0xdd, 0x6a, 0x07, 0x8a, 0xc7, 0xa4, 0x53, 0xcf, 0xc4, 0x09, 0xd2, 0x3a, 0x69, 0x07, 0x1a, 0x9a,
-	0x24, 0x43, 0x87, 0x55, 0xdf, 0x65, 0xb5, 0x83, 0x52, 0x94, 0x28, 0xbf, 0x66, 0xca, 0xa9, 0x23,
-	0x4d, 0x29, 0x93, 0x76, 0xa0, 0x87, 0x51, 0xa2, 0xa1, 0x61, 0xd6, 0xe0, 0x58, 0xf8, 0xbc, 0x48,
-	0xf8, 0xe0, 0x9c, 0xcd, 0xbc, 0xc1, 0xb8, 0x0e, 0x1f, 0x33, 0x49, 0xff, 0x58, 0x04, 0x01, 0xfe,
-	0x18, 0x2c, 0x70, 0xc3, 0xf3, 0x72, 0x85, 0x4f, 0xcc, 0xd9, 0xf4, 0x4b, 0x43, 0xb0, 0x5f, 0xd3,
-	0xaf, 0x0f, 0x80, 0xda, 0x6f, 0x24, 0x70, 0x19, 0xe1, 0xd7, 0x2d, 0x9c, 0x10, 0xb8, 0x0b, 0x16,
-	0x4a, 0x11, 0x8e, 0x6d, 0xfa, 0x83, 0x82, 0x4d, 0x96, 0x95, 0x87, 0xb2, 0x98, 0x4f, 0x7d, 0x3b,
-	0x1a, 0x40, 0xe0, 0xdd, 0xde, 0x1b, 0x49, 0xe1, 0xc3, 0x6c, 0x59, 0x80, 0xb9, 0x11, 0xf5, 0x1e,
-	0x50, 0x77, 0x7b, 0xe3, 0x8b, 0xfd, 0xb2, 0x1a, 0xc0, 0xb8, 0x11, 0x09, 0xa7, 0xf6, 0x31, 0x98,
-	0x47, 0x38, 0x89, 0xc2, 0x20, 0xc1, 0x50, 0x01, 0x97, 0x2b, 0x2d, 0xc7, 0xc1, 0x49, 0xc2, 0xe2,
-	0x98, 0x47, 0xbd, 0x25, 0xbc, 0x06, 0xe6, 0xe8, 0x3b, 0xb8, 0x95, 0xf0, 0xe1, 0x85, 0xc4, 0x6a,
-	0xe7, 0x1f, 0x52, 0x2a, 0x78, 0xb8, 0x02, 0x40, 0x31, 0x24, 0x15, 0x62, 0xc7, 0x04, 0xbb, 0xf2,
-	0x14, 0xbc, 0x0a, 0x64, 0xf1, 0xca, 0x63, 0x36, 0x3a, 0x56, 0x65, 0x09, 0xae, 0x82, 0x45, 0x84,
-	0x93, 0xbe, 0x61, 0x1a, 0x2e, 0x81, 0xf9, 0x43, 0xcf, 0xf7, 0xd9, 0x6a, 0x86, 0xba, 0x69, 0x27,
-	0xc8, 0xc5, 0x4e, 0xd3, 0x3b, 0xc3, 0xf2, 0x25, 0xaa, 0xb2, 0x8f, 0x13, 0x12, 0x87, 0xe7, 0x14,
-	0xc1, 0x5e, 0x6b, 0xf2, 0x2c, 0xbc, 0x0e, 0xd6, 0xf7, 0x7c, 0xdb, 0x39, 0x69, 0x86, 0x3e, 0xfb,
-	0xf5, 0x50, 0x0e, 0x63, 0x62, 0xb5, 0x51, 0x5b, 0x76, 0xe1, 0x4d, 0xb0, 0x71, 0x1c, 0xd4, 0xc6,
-	0x3a, 0x31, 0x5c, 0x07, 0x57, 0x58, 0xbf, 0xcb, 0x98, 0xeb, 0x70, 0x03, 0xac, 0x1d, 0x07, 0xee,
-	0x88, 0xa3, 0xb1, 0xf3, 0x9f, 0x79, 0x1e, 0x8f, 0x68, 0xb5, 0x94, 0x7f, 0x58, 0x30, 0xcd, 0x6a,
-	0xa9, 0x68, 0x54, 0x9f, 0x96, 0x4c, 0xb3, 0xf4, 0xd2, 0x40, 0xf2, 0x14, 0xfc, 0x10, 0x6c, 0x8f,
-	0x98, 0xab, 0xc7, 0x45, 0xab, 0x60, 0x56, 0x2d, 0x54, 0x78, 0xf6, 0xcc, 0x40, 0xd5, 0x4a, 0x31,
-	0x57, 0xae, 0x1c, 0x94, 0x2c, 0x9e, 0x02, 0x86, 0x36, 0x8d, 0xdc, 0xbe, 0x81, 0xe4, 0x69, 0x78,
-	0x0f, 0x68, 0x29, 0xc3, 0x24, 0xe2, 0x4c, 0x9f, 0xf8, 0xfc, 0xb8, 0x84, 0x8e, 0x8f, 0xe4, 0x4b,
-	0x2c, 0x77, 0xd4, 0x90, 0x33, 0x4d, 0x79, 0x16, 0xee, 0x80, 0x7b, 0x7b, 0x66, 0x2e, 0x7f, 0x78,
-	0x50, 0x32, 0x8d, 0x6a, 0xd9, 0x30, 0x50, 0xb5, 0x5c, 0x42, 0x56, 0xd5, 0x7a, 0x55, 0x45, 0xaf,
-	0xb2, 0x11, 0xbb, 0x30, 0x07, 0x3e, 0x79, 0x3f, 0xec, 0xa4, 0x68, 0x30, 0xfc, 0x1e, 0xd8, 0x9a,
-	0x2c, 0x21, 0xf6, 0x56, 0x87, 0x3f, 0x07, 0x3f, 0x7d, 0x17, 0x6a, 0xd2, 0x27, 0x1a, 0x17, 0x7f,
-	0x42, 0x64, 0xa1, 0x09, 0x6f, 0x83, 0x0f, 0x26, 0xa3, 0x68, 0x6a, 0x3c, 0xf8, 0x7d, 0xa0, 0xed,
-	0x1b, 0x66, 0xee, 0xb3, 0x8b, 0xd3, 0xf2, 0x46, 0x82, 0xbb, 0xe0, 0x3e, 0xca, 0x15, 0xf7, 0x4b,
-	0x47, 0xd5, 0xf7, 0xc0, 0x7f, 0x25, 0xc1, 0x5f, 0x80, 0x8f, 0xde, 0x0d, 0x9c, 0xb4, 0xc1, 0xaf,
-	0x25, 0x68, 0x80, 0x4f, 0xdf, 0xfb, 0x7b, 0x93, 0x64, 0xbe, 0x91, 0xe0, 0x6d, 0x70, 0x6b, 0x3c,
-	0x5f, 0x9c, 0xc3, 0xb7, 0x12, 0xdc, 0x06, 0x77, 0x2e, 0xfc, 0x92, 0x40, 0xfe, 0x51, 0x82, 0x3f,
-	0x03, 0x8f, 0x2e, 0x82, 0x4c, 0x0a, 0xe3, 0x4f, 0x12, 0x7c, 0x02, 0x1e, 0xbf, 0xc7, 0x37, 0x26,
-	0x09, 0xfc, 0xf9, 0x82, 0x7d, 0x88, 0xc3, 0xfe, 0xee, 0xdd, 0xfb, 0x10, 0xc8, 0xbf, 0x48, 0x70,
-	0x13, 0x5c, 0x1f, 0x0f, 0xa1, 0x35, 0xf1, 0x57, 0x09, 0xde, 0x05, 0x5b, 0x17, 0x2a, 0x51, 0xd8,
-	0xdf, 0x24, 0xa8, 0x80, 0xb5, 0x62, 0xa9, 0xfa, 0x34, 0x57, 0x30, 0xab, 0x2f, 0x0b, 0xd6, 0x41,
-	0xb5, 0x62, 0x21, 0xa3, 0x52, 0x91, 0xff, 0x30, 0x4d, 0x43, 0xc9, 0x78, 0x8a, 0x25, 0xe1, 0xac,
-	0x3e, 0x2d, 0xa1, 0xaa, 0x59, 0x78, 0x61, 0x14, 0x29, 0xf2, 0xcb, 0x69, 0xb8, 0x0a, 0x00, 0x85,
-	0x95, 0x4b, 0x85, 0xa2, 0x55, 0x91, 0x7f, 0x37, 0x03, 0x97, 0xc1, 0xbc, 0xf1, 0xca, 0x32, 0x50,
-	0x31, 0x67, 0xca, 0xff, 0x9b, 0xd9, 0x09, 0x01, 0x18, 0xbc, 0x17, 0xe0, 0x1c, 0x98, 0x3e, 0x7c,
-	0x21, 0x4f, 0xc1, 0x05, 0x30, 0x6b, 0x1a, 0xb9, 0x8a, 0x21, 0x4b, 0x70, 0x0d, 0xac, 0x1a, 0xa6,
-	0x91, 0xb7, 0x0a, 0xa5, 0x62, 0x15, 0x1d, 0x17, 0x8b, 0xac, 0x6f, 0xc8, 0x60, 0xe9, 0x65, 0xce,
-	0xca, 0x1f, 0xf4, 0x2c, 0x33, 0xb4, 0x3f, 0x99, 0xa5, 0xfc, 0x61, 0x15, 0xe5, 0xf2, 0x06, 0xea,
-	0x99, 0x2f, 0x51, 0x20, 0x13, 0xea, 0x59, 0x66, 0x1f, 0x3e, 0x01, 0x0b, 0x56, 0x6c, 0x07, 0x49,
-	0x14, 0xc6, 0x04, 0x3e, 0x4c, 0x2f, 0x56, 0xc4, 0xa4, 0x10, 0x03, 0xea, 0xc6, 0x6a, 0x7f, 0xcd,
-	0xe7, 0x84, 0x36, 0xb5, 0x2d, 0xfd, 0x50, 0xda, 0xbb, 0xfa, 0xe6, 0x5f, 0x9b, 0x53, 0x6f, 0xde,
-	0x6e, 0x4a, 0xdf, 0xbd, 0xdd, 0x94, 0xfe, 0xf9, 0x76, 0x53, 0xfa, 0xfd, 0xbf, 0x37, 0xa7, 0x6a,
-	0x73, 0xec, 0x9f, 0x86, 0x8f, 0xfe, 0x1f, 0x00, 0x00, 0xff, 0xff, 0x2d, 0x31, 0xfa, 0xc2, 0x7d,
-	0x14, 0x00, 0x00,
+	// 2292 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0xdd, 0x56, 0xdb, 0xd8,
+	0xf5, 0x47, 0x10, 0x18, 0x38, 0x7c, 0x39, 0x87, 0x10, 0x94, 0x64, 0x06, 0x11, 0x65, 0x92, 0x3f,
+	0xc3, 0xbf, 0x22, 0x6d, 0x32, 0xab, 0x6d, 0xd2, 0x4c, 0x13, 0x63, 0x94, 0xe0, 0x22, 0x6c, 0xe7,
+	0x58, 0x24, 0x99, 0x2b, 0x57, 0x96, 0x8f, 0xb1, 0x8a, 0x90, 0x1c, 0xe9, 0x98, 0x31, 0xf3, 0x02,
+	0xb3, 0x7a, 0xd7, 0xcb, 0x3e, 0x44, 0xe7, 0x3d, 0x32, 0x1f, 0x6d, 0xa7, 0xed, 0x5d, 0x2f, 0xdc,
+	0x36, 0x5d, 0x7d, 0x01, 0xaf, 0x3e, 0x40, 0xd7, 0xf9, 0x10, 0x3e, 0x92, 0x6d, 0x92, 0x3b, 0xb4,
+	0xf7, 0xef, 0xf7, 0xd3, 0x39, 0x7b, 0x6f, 0xed, 0xbd, 0x0d, 0x58, 0x8e, 0xda, 0x6e, 0xbb, 0x7e,
+	0x37, 0x6a, 0xbb, 0xdb, 0xed, 0x28, 0x24, 0x21, 0x9c, 0x66, 0x86, 0xeb, 0xc6, 0x91, 0x47, 0x5a,
+	0x9d, 0xfa, 0xb6, 0x1b, 0x9e, 0xdc, 0x3d, 0x0a, 0x8f, 0xc2, 0xbb, 0xcc, 0x5b, 0xef, 0x34, 0xd9,
+	0x13, 0x7b, 0x60, 0x7f, 0x71, 0x96, 0xfe, 0xd5, 0x12, 0xb8, 0x64, 0x12, 0xb7, 0x01, 0x6f, 0x81,
+	0x4b, 0x25, 0xe7, 0x04, 0xab, 0xca, 0x86, 0xb2, 0x39, 0xb7, 0xb3, 0xdc, 0xef, 0x69, 0xf3, 0x67,
+	0xce, 0x89, 0xff, 0x50, 0x0f, 0x9c, 0x13, 0xac, 0x23, 0xe6, 0x84, 0x06, 0xf8, 0x60, 0xd7, 0x21,
+	0xce, 0xae, 0x17, 0xa9, 0x93, 0x0c, 0xb7, 0xd2, 0xef, 0x69, 0xcb, 0x1c, 0xd7, 0x70, 0x88, 0x63,
+	0x34, 0xbc, 0x48, 0x47, 0x09, 0x06, 0x6e, 0x81, 0x99, 0x97, 0x79, 0x8b, 0xa2, 0xa7, 0x18, 0x1a,
+	0xf6, 0x7b, 0xda, 0x12, 0x47, 0x7f, 0xe1, 0xf8, 0x1c, 0x2c, 0x10, 0xb0, 0x0c, 0x56, 0xf6, 0xb0,
+	0x13, 0x91, 0x3a, 0x76, 0x48, 0x31, 0x20, 0x38, 0x3a, 0x75, 0xfc, 0x83, 0x58, 0x9d, 0xdf, 0x50,
+	0x36, 0xa7, 0x76, 0x3e, 0xea, 0xf7, 0xb4, 0x6b, 0x9c, 0xd8, 0x4a, 0x40, 0x86, 0x27, 0x50, 0x3a,
+	0x1a, 0xc5, 0x84, 0x45, 0x70, 0xd9, 0xf4, 0xb1, 0x4b, 0xbc, 0x30, 0xb0, 0xbd, 0x13, 0x1c, 0x76,
+	0xc8, 0x41, 0xac, 0x2e, 0x30, 0xb9, 0x1b, 0xfd, 0x9e, 0xb6, 0xc6, 0xe5, 0xb0, 0x80, 0x18, 0x84,
+	0x63, 0x74, 0x34, 0xcc, 0x82, 0x45, 0x90, 0xb3, 0xbc, 0x98, 0xe0, 0xa0, 0xe0, 0x7b, 0x38, 0x20,
+	0x87, 0xc8, 0x8a, 0xd5, 0xd5, 0x8d, 0xa9, 0xcd, 0x39, 0xf9, 0x60, 0x3e, 0x43, 0x18, 0x2e, 0x83,
+	0x18, 0x9d, 0xc8, 0x8f, 0x75, 0x34, 0x44, 0x83, 0x08, 0xac, 0xe4, 0x1b, 0xa7, 0x38, 0x22, 0x5e,
+	0x8c, 0x25, 0xb5, 0xab, 0x4c, 0x6d, 0xa3, 0xdf, 0xd3, 0x3e, 0xe4, 0x6a, 0x4e, 0x02, 0x4a, 0x0b,
+	0x8e, 0x22, 0xc3, 0x07, 0x60, 0x91, 0x3f, 0xe5, 0x3b, 0x24, 0xb4, 0xad, 0xaa, 0xba, 0xb6, 0xa1,
+	0x6c, 0xce, 0xca, 0xb9, 0x71, 0x3a, 0x24, 0x34, 0x08, 0x15, 0x48, 0x23, 0x61, 0x01, 0x2c, 0x71,
+	0x43, 0x01, 0x47, 0xd4, 0xd8, 0x52, 0x55, 0xc6, 0x95, 0x22, 0x24, 0xde, 0xef, 0xe2, 0x88, 0x18,
+	0x4e, 0x87, 0xb4, 0x74, 0x94, 0xa1, 0xc0, 0x47, 0xb2, 0xc8, 0x53, 0xcf, 0xc7, 0xea, 0x35, 0x96,
+	0xee, 0x2b, 0xfd, 0x9e, 0x96, 0x13, 0x22, 0x94, 0xdd, 0xf4, 0x7c, 0x9c, 0x62, 0x53, 0xec, 0xe0,
+	0xf4, 0xfb, 0xf8, 0x8c, 0x91, 0xaf, 0x67, 0x2b, 0xeb, 0x18, 0x9f, 0x09, 0x6e, 0x1a, 0x09, 0x2d,
+	0xb0, 0xc2, 0x0d, 0x76, 0xd4, 0x89, 0x09, 0x6e, 0x14, 0xf2, 0x4c, 0xe0, 0x06, 0x13, 0xb8, 0xde,
+	0xef, 0x69, 0x57, 0xb9, 0x00, 0xe1, 0x6e, 0xc3, 0x75, 0x84, 0xce, 0x28, 0x1a, 0x8d, 0x05, 0x4f,
+	0x57, 0x05, 0xe3, 0x88, 0x65, 0x45, 0x63, 0x59, 0x91, 0x62, 0x21, 0x72, 0xdc, 0xc6, 0x38, 0x12,
+	0x09, 0xc9, 0x50, 0x60, 0x1d, 0xa8, 0xc5, 0xc0, 0x23, 0x9e, 0xe3, 0x9f, 0x67, 0xea, 0x5c, 0x6e,
+	0x83, 0xc9, 0xdd, 0xe9, 0xf7, 0x34, 0x9d, 0xcb, 0x79, 0x1c, 0x69, 0x0c, 0x92, 0x2d, 0x29, 0x8f,
+	0xd5, 0x81, 0x0f, 0xc1, 0x3c, 0xfd, 0x3b, 0xc9, 0xf6, 0x4d, 0x96, 0x31, 0xb5, 0xdf, 0xd3, 0xae,
+	0x70, 0x59, 0x26, 0x32, 0x48, 0xb9, 0x0c, 0x86, 0x15, 0x00, 0xe9, 0x63, 0x26, 0xe9, 0x3a, 0x93,
+	0x90, 0xca, 0x8f, 0x49, 0x0c, 0x67, 0x7e, 0x04, 0x17, 0x7e, 0x06, 0x16, 0x98, 0x35, 0xc9, 0xfd,
+	0x2d, 0x16, 0xfd, 0x6b, 0xfd, 0x9e, 0xb6, 0x2a, 0x6b, 0x0d, 0x0a, 0x20, 0x05, 0x4f, 0x2e, 0x93,
+	0x24, 0xff, 0x63, 0xc6, 0xce, 0x5e, 0x66, 0x50, 0x01, 0x32, 0x18, 0x1e, 0x80, 0xcb, 0xf4, 0x31,
+	0x9d, 0xfd, 0xdb, 0x4c, 0x41, 0xeb, 0xf7, 0xb4, 0x1b, 0x92, 0xc2, 0x50, 0x09, 0x0c, 0x33, 0xe1,
+	0x0e, 0x58, 0x12, 0x31, 0x2f, 0xf8, 0xd4, 0x1e, 0xa9, 0x9f, 0x64, 0x2b, 0x29, 0xc9, 0x98, 0xcb,
+	0x01, 0x3a, 0xca, 0x30, 0xe8, 0xf7, 0x9d, 0xb6, 0x54, 0x89, 0x43, 0xb0, 0xba, 0xc5, 0x84, 0xa4,
+	0x00, 0x67, 0x84, 0x8c, 0x98, 0xc2, 0x74, 0x34, 0x8a, 0x3c, 0xac, 0x69, 0x87, 0xc7, 0x38, 0x50,
+	0xff, 0xff, 0x5d, 0x9a, 0x84, 0xc2, 0x86, 0x34, 0x19, 0x19, 0x3e, 0x06, 0x8b, 0xd5, 0xc0, 0x69,
+	0xc7, 0xad, 0x90, 0x14, 0xc2, 0x4e, 0x40, 0xd4, 0xfb, 0xac, 0x33, 0x4a, 0x69, 0x8b, 0x85, 0xdb,
+	0x70, 0xa9, 0x5f, 0x47, 0x69, 0x3c, 0xb4, 0xc0, 0xe5, 0xe7, 0x9d, 0x90, 0x38, 0x3b, 0x8e, 0x7b,
+	0x8c, 0x83, 0xc6, 0xce, 0x19, 0xc1, 0xb1, 0xfa, 0x29, 0x13, 0x59, 0xef, 0xf7, 0xb4, 0xeb, 0x5c,
+	0xe4, 0x35, 0x85, 0x18, 0x75, 0x8e, 0x31, 0xea, 0x14, 0xa4, 0xa3, 0x61, 0x22, 0x1d, 0x2c, 0x95,
+	0x08, 0xbf, 0x08, 0x09, 0x56, 0x1f, 0x67, 0x9b, 0x57, 0x3b, 0xc2, 0xc6, 0x69, 0x48, 0xa3, 0x93,
+	0x60, 0xe4, 0x88, 0x84, 0x51, 0xd4, 0x69, 0x93, 0x42, 0x0b, 0xbb, 0xc7, 0xea, 0x93, 0x6c, 0x19,
+	0x9f, 0x47, 0x84, 0xa3, 0x0c, 0x97, 0xc2, 0xa4, 0x88, 0x48, 0x64, 0xfd, 0xb7, 0xd3, 0x60, 0xe6,
+	0x00, 0x9f, 0xd4, 0x71, 0x44, 0x4b, 0x9a, 0xce, 0x44, 0xb3, 0x8b, 0xdd, 0x8a, 0x43, 0x5a, 0x62,
+	0x26, 0x4a, 0xb1, 0xc1, 0xc4, 0x6d, 0x18, 0xb8, 0x8b, 0x5d, 0xa3, 0xed, 0xd0, 0xef, 0x22, 0x05,
+	0x87, 0xf7, 0xc1, 0x5c, 0xfe, 0x88, 0x36, 0xd9, 0x46, 0x23, 0x62, 0x03, 0x6c, 0x6e, 0x67, 0xb5,
+	0xdf, 0xd3, 0x2e, 0x8b, 0x5e, 0x4c, 0x5d, 0x86, 0xd3, 0x68, 0x44, 0x3a, 0x1a, 0xe0, 0x68, 0x3c,
+	0x9f, 0x3a, 0x9e, 0xdf, 0x0e, 0xbd, 0x80, 0xec, 0xd9, 0x76, 0x85, 0x91, 0x17, 0x18, 0x59, 0x8a,
+	0x67, 0x33, 0x81, 0x18, 0x2d, 0x42, 0xda, 0x42, 0x65, 0x98, 0x48, 0xe3, 0xb9, 0xe3, 0xc4, 0x98,
+	0x8e, 0x5e, 0x9c, 0x6d, 0xa7, 0x75, 0x27, 0xc6, 0x62, 0x50, 0x0b, 0x0c, 0xfd, 0x08, 0xe9, 0x0d,
+	0xac, 0xf0, 0x88, 0xdd, 0xb7, 0x99, 0xfd, 0x08, 0xd9, 0x7d, 0xfd, 0xf0, 0x48, 0x5c, 0x57, 0x06,
+	0xc3, 0x3c, 0x58, 0xa4, 0x8f, 0xa2, 0xa3, 0x5a, 0x55, 0xf5, 0x1b, 0x85, 0xa5, 0x41, 0xfa, 0x6a,
+	0x18, 0x5d, 0x74, 0x13, 0x3e, 0x85, 0x52, 0x0c, 0xf8, 0x0c, 0x2c, 0x0f, 0x0c, 0x95, 0x28, 0xec,
+	0x9e, 0xa9, 0xdf, 0x72, 0x91, 0x0f, 0xfb, 0x3d, 0x4d, 0x1d, 0x16, 0x69, 0x53, 0x8c, 0x8e, 0xb2,
+	0xac, 0xe4, 0x2c, 0xf4, 0xd3, 0xe6, 0x32, 0xdf, 0x8d, 0x3e, 0x0b, 0x6b, 0x09, 0x42, 0x24, 0xcd,
+	0xa0, 0x0d, 0x72, 0xa0, 0x6a, 0x06, 0x0d, 0x16, 0x57, 0xf5, 0x7b, 0x25, 0xdb, 0x55, 0xe4, 0xe3,
+	0x60, 0x01, 0xd3, 0xd1, 0x08, 0x2e, 0xfc, 0x09, 0xdf, 0xb0, 0xd4, 0xaf, 0xe9, 0xca, 0x34, 0x7f,
+	0x6f, 0x7e, 0x9b, 0x2d, 0x6a, 0xdb, 0xd4, 0x26, 0xef, 0x59, 0x54, 0x50, 0x47, 0x0c, 0xaa, 0xff,
+	0x7d, 0x01, 0xcc, 0xd8, 0x98, 0x35, 0x94, 0xc7, 0x60, 0x91, 0xff, 0x55, 0xc2, 0xe4, 0x8b, 0x30,
+	0x3a, 0x1e, 0x2e, 0x46, 0xc2, 0xdc, 0x46, 0xc0, 0xfd, 0x3a, 0x4a, 0xe3, 0xe1, 0x4f, 0x01, 0xe0,
+	0x06, 0x56, 0x51, 0x7c, 0x6d, 0xbb, 0xda, 0xef, 0x69, 0x30, 0xc5, 0xe6, 0x95, 0x24, 0x21, 0xe9,
+	0x38, 0xdc, 0xc5, 0xbe, 0x73, 0x66, 0x39, 0x04, 0x07, 0xee, 0x99, 0xd8, 0xc5, 0x16, 0xe5, 0x71,
+	0xd8, 0xa0, 0x7e, 0xc3, 0xe7, 0x00, 0xe3, 0x84, 0x8e, 0xc3, 0x34, 0x05, 0xfe, 0x0a, 0xe4, 0xd2,
+	0x16, 0x74, 0xca, 0x8a, 0x7a, 0x51, 0x2e, 0xea, 0xac, 0x8c, 0x11, 0x9d, 0xea, 0x68, 0x88, 0x07,
+	0x3f, 0x07, 0xab, 0x87, 0xed, 0x86, 0x43, 0x70, 0x23, 0x73, 0xae, 0x45, 0x26, 0x78, 0xab, 0xdf,
+	0xd3, 0x34, 0x2e, 0xd8, 0xe1, 0x30, 0x63, 0xf8, 0x7c, 0xa3, 0x15, 0x68, 0x8c, 0x50, 0xd8, 0x09,
+	0x1a, 0x96, 0x77, 0xe2, 0x11, 0x75, 0x75, 0x43, 0xd9, 0x9c, 0x96, 0x63, 0x14, 0x51, 0x9f, 0xe1,
+	0x53, 0xa7, 0x8e, 0x24, 0x24, 0x7c, 0x02, 0x16, 0xcd, 0xae, 0x47, 0xca, 0x01, 0xfd, 0x02, 0x3b,
+	0x11, 0x56, 0xaf, 0x0e, 0x95, 0x5b, 0xd7, 0x23, 0x46, 0x18, 0x18, 0x4d, 0x0e, 0xa0, 0xe5, 0x26,
+	0x13, 0xe0, 0x1e, 0xc8, 0x15, 0xc2, 0x20, 0x66, 0x4b, 0x84, 0x7b, 0xc6, 0xdb, 0xd8, 0x5a, 0xb6,
+	0xf4, 0xdd, 0x01, 0x22, 0x69, 0x61, 0x43, 0x2c, 0xf8, 0x00, 0xcc, 0x9b, 0x81, 0x53, 0xf7, 0x71,
+	0xa5, 0x1d, 0x85, 0x4d, 0xb1, 0xc7, 0xad, 0xf5, 0x7b, 0xda, 0x8a, 0x38, 0x09, 0x73, 0x1a, 0x6d,
+	0xea, 0xa5, 0x9f, 0xf0, 0x00, 0x0b, 0x1f, 0x81, 0x05, 0x71, 0x9e, 0x82, 0x13, 0xe3, 0x64, 0xef,
+	0x91, 0xbe, 0x7f, 0x71, 0x7a, 0xc3, 0xa5, 0x6e, 0x1d, 0xa5, 0xd0, 0xb4, 0x50, 0xc4, 0x33, 0x8b,
+	0xea, 0x01, 0x5d, 0x74, 0x32, 0x85, 0x92, 0xf0, 0x79, 0x42, 0x58, 0xa1, 0xa4, 0x29, 0x74, 0xf6,
+	0x0a, 0x4b, 0xb5, 0xd5, 0x69, 0x36, 0x7d, 0x2c, 0xd6, 0x1a, 0x29, 0x94, 0x89, 0x48, 0xcc, 0x01,
+	0x03, 0x0d, 0xc1, 0x80, 0xfb, 0x52, 0x0b, 0x2d, 0x84, 0x27, 0x27, 0x4e, 0xd0, 0x88, 0x55, 0x3d,
+	0xbb, 0xa7, 0x0f, 0x5a, 0xa8, 0x2b, 0x30, 0x72, 0x07, 0x4d, 0x78, 0xf4, 0x56, 0xa8, 0x13, 0x04,
+	0x38, 0x3a, 0x9f, 0x02, 0x7c, 0x19, 0x90, 0x6e, 0x15, 0x31, 0xbf, 0x3c, 0x07, 0x32, 0x14, 0xfa,
+	0xc3, 0xc1, 0xec, 0x12, 0x1c, 0x05, 0x8e, 0x7f, 0x2e, 0xc3, 0x57, 0x01, 0xe9, 0x40, 0x58, 0x20,
+	0x64, 0xa1, 0x21, 0x1a, 0x4d, 0x6f, 0x95, 0x44, 0x38, 0x8e, 0xed, 0xb3, 0x36, 0x8e, 0x55, 0xcc,
+	0xae, 0x25, 0xa5, 0x37, 0x66, 0x4e, 0x83, 0x50, 0xaf, 0x8e, 0x64, 0x2c, 0xad, 0x52, 0xfe, 0xb8,
+	0x8f, 0xcf, 0xaa, 0xde, 0x97, 0x98, 0xf5, 0xf7, 0x69, 0x39, 0xb4, 0x82, 0x4c, 0xd7, 0xac, 0xd8,
+	0xfb, 0x92, 0x56, 0x69, 0x8a, 0x40, 0x9b, 0x62, 0xca, 0x60, 0x39, 0xd1, 0x11, 0x56, 0x8f, 0x98,
+	0x8c, 0x34, 0x6e, 0x33, 0x32, 0x86, 0x4f, 0x61, 0x3a, 0x1a, 0xc1, 0x85, 0x2f, 0xc0, 0x95, 0x81,
+	0xb5, 0xd3, 0x6c, 0x7a, 0x5d, 0xe4, 0x04, 0x47, 0x58, 0x6d, 0x31, 0x4d, 0xbd, 0xdf, 0xd3, 0xd6,
+	0x87, 0x35, 0x19, 0xce, 0x88, 0x28, 0x50, 0x47, 0x23, 0xf9, 0xf0, 0xd7, 0x60, 0x6d, 0x94, 0xdd,
+	0xee, 0x06, 0xaa, 0xc7, 0xa4, 0xa5, 0xf5, 0x7b, 0x8c, 0xb4, 0x41, 0xba, 0x81, 0x8e, 0xc6, 0xc9,
+	0xd0, 0x61, 0x75, 0xee, 0xb2, 0xbb, 0x41, 0xb9, 0x1d, 0xab, 0xbf, 0x61, 0xca, 0x52, 0x4a, 0x25,
+	0x65, 0xd2, 0x0d, 0x8c, 0xb0, 0x1d, 0xeb, 0x28, 0xcb, 0x1a, 0xa4, 0x85, 0xcf, 0x8b, 0x98, 0x0f,
+	0xce, 0xe9, 0xd4, 0x0e, 0xc6, 0x75, 0xf8, 0x98, 0x89, 0xcf, 0xd3, 0x22, 0x08, 0xf0, 0x53, 0x30,
+	0xc7, 0x0d, 0xcf, 0x2b, 0x55, 0x3e, 0x31, 0xa7, 0xe5, 0x4d, 0x43, 0xb0, 0x5f, 0xd3, 0xb7, 0x0f,
+	0x80, 0xfa, 0x57, 0x0a, 0xf8, 0x00, 0xe1, 0xd7, 0x1d, 0x1c, 0x13, 0xb8, 0x0d, 0xe6, 0xca, 0x6d,
+	0x1c, 0x39, 0xf4, 0xf7, 0x2e, 0x9b, 0x2c, 0x4b, 0xf7, 0x72, 0x62, 0x3e, 0x9d, 0xdb, 0xd1, 0x00,
+	0x02, 0x6f, 0x27, 0x3b, 0x92, 0xca, 0x87, 0xd9, 0xa2, 0x00, 0x73, 0x23, 0x4a, 0x16, 0xa8, 0xdb,
+	0xc9, 0xf8, 0x62, 0x3f, 0xfc, 0x07, 0x30, 0x6e, 0x44, 0xc2, 0xa9, 0x3f, 0x02, 0xb3, 0x08, 0xc7,
+	0xed, 0x30, 0x88, 0x31, 0x54, 0xc1, 0x07, 0xd5, 0x8e, 0xeb, 0xe2, 0x38, 0x66, 0xe7, 0x98, 0x45,
+	0xc9, 0x23, 0xbc, 0x0a, 0x66, 0xe8, 0x1e, 0xdc, 0x89, 0xf9, 0xf0, 0x42, 0xe2, 0x69, 0xeb, 0x1f,
+	0x8a, 0x74, 0x78, 0xb8, 0x04, 0x40, 0x29, 0x24, 0x55, 0xe2, 0x44, 0x04, 0x37, 0x72, 0x13, 0xf0,
+	0x0a, 0xc8, 0x89, 0x2d, 0x8f, 0xd9, 0xe8, 0x58, 0xcd, 0x29, 0x70, 0x19, 0xcc, 0x23, 0x1c, 0x9f,
+	0x1b, 0x26, 0xe1, 0x02, 0x98, 0xdd, 0xf7, 0x7c, 0x9f, 0x3d, 0x4d, 0x51, 0x37, 0xed, 0x04, 0xf9,
+	0xc8, 0x6d, 0x79, 0xa7, 0x38, 0x77, 0x89, 0xaa, 0xec, 0xe2, 0x98, 0x44, 0xe1, 0x19, 0x45, 0xb0,
+	0x6d, 0x2d, 0x37, 0x0d, 0xaf, 0x81, 0xd5, 0x1d, 0xdf, 0x71, 0x8f, 0x5b, 0xa1, 0xcf, 0x7e, 0x95,
+	0x55, 0xc2, 0x88, 0xd8, 0x5d, 0xd4, 0xcd, 0x35, 0xe0, 0x0d, 0xb0, 0x76, 0x18, 0xd4, 0x47, 0x3a,
+	0x31, 0x5c, 0x05, 0x97, 0x59, 0xbf, 0x4b, 0x99, 0x9b, 0x70, 0x0d, 0xac, 0x1c, 0x06, 0x8d, 0x21,
+	0xc7, 0xd1, 0xd6, 0x7f, 0x66, 0xf9, 0x79, 0x44, 0xab, 0xa5, 0xfc, 0xfd, 0xa2, 0x65, 0xd5, 0xca,
+	0x25, 0xb3, 0xf6, 0xb4, 0x6c, 0x59, 0xe5, 0x97, 0x26, 0xca, 0x4d, 0xc0, 0x1f, 0x81, 0xcd, 0x21,
+	0x73, 0xed, 0xb0, 0x64, 0x17, 0xad, 0x9a, 0x8d, 0x8a, 0xcf, 0x9e, 0x99, 0xa8, 0x56, 0x2d, 0xe5,
+	0x2b, 0xd5, 0xbd, 0xb2, 0xcd, 0x43, 0xc0, 0xd0, 0x96, 0x99, 0xdf, 0x35, 0x51, 0x6e, 0x12, 0xde,
+	0x01, 0xba, 0x64, 0x18, 0x47, 0x9c, 0x3a, 0x27, 0x3e, 0x3f, 0x2c, 0xa3, 0xc3, 0x83, 0xdc, 0x25,
+	0x16, 0x3b, 0x6a, 0xc8, 0x5b, 0x56, 0x6e, 0x1a, 0x6e, 0x81, 0x3b, 0x3b, 0x56, 0xbe, 0xb0, 0xbf,
+	0x57, 0xb6, 0xcc, 0x5a, 0xc5, 0x34, 0x51, 0xad, 0x52, 0x46, 0x76, 0xcd, 0x7e, 0x55, 0x43, 0xaf,
+	0xd2, 0x27, 0x6e, 0xc0, 0x3c, 0xf8, 0xec, 0xfd, 0xb0, 0xe3, 0x4e, 0x83, 0xe1, 0xc7, 0x60, 0x63,
+	0xbc, 0x84, 0xb8, 0x5b, 0x13, 0xfe, 0x02, 0xfc, 0xec, 0x5d, 0xa8, 0x71, 0xaf, 0x38, 0xba, 0xf8,
+	0x15, 0x22, 0x0a, 0x2d, 0x78, 0x13, 0x7c, 0x34, 0x1e, 0x45, 0x43, 0xe3, 0xc1, 0xff, 0x03, 0xfa,
+	0xae, 0x69, 0xe5, 0x3f, 0xbf, 0x38, 0x2c, 0x6f, 0x14, 0xb8, 0x0d, 0x3e, 0x41, 0xf9, 0xd2, 0x6e,
+	0xf9, 0xa0, 0xf6, 0x1e, 0xf8, 0x6f, 0x14, 0xf8, 0x4b, 0xf0, 0xe0, 0xdd, 0xc0, 0x71, 0x17, 0xfc,
+	0x56, 0x81, 0x26, 0x78, 0xf2, 0xde, 0xef, 0x1b, 0x27, 0xf3, 0x9d, 0x02, 0x6f, 0x82, 0x0f, 0x47,
+	0xf3, 0x45, 0x1e, 0xbe, 0x57, 0xe0, 0x26, 0xb8, 0x75, 0xe1, 0x9b, 0x04, 0xf2, 0x8f, 0x0a, 0xfc,
+	0x39, 0xb8, 0x7f, 0x11, 0x64, 0xdc, 0x31, 0xfe, 0xa4, 0xc0, 0xc7, 0xe0, 0xe1, 0x7b, 0xbc, 0x63,
+	0x9c, 0xc0, 0x9f, 0x2f, 0xb8, 0x87, 0x48, 0xf6, 0x0f, 0xef, 0xbe, 0x87, 0x40, 0xfe, 0x45, 0x81,
+	0xeb, 0xe0, 0xda, 0x68, 0x08, 0xad, 0x89, 0xbf, 0x2a, 0xf0, 0x36, 0xd8, 0xb8, 0x50, 0x89, 0xc2,
+	0xfe, 0xa6, 0x40, 0x15, 0xac, 0x94, 0xca, 0xb5, 0xa7, 0xf9, 0xa2, 0x55, 0x7b, 0x59, 0xb4, 0xf7,
+	0x6a, 0x55, 0x1b, 0x99, 0xd5, 0x6a, 0xee, 0x0f, 0x93, 0xf4, 0x28, 0x29, 0x4f, 0xa9, 0x2c, 0x9c,
+	0xb5, 0xa7, 0x65, 0x54, 0xb3, 0x8a, 0x2f, 0xcc, 0x12, 0x45, 0x7e, 0x3d, 0x09, 0x97, 0x01, 0xa0,
+	0xb0, 0x4a, 0xb9, 0x58, 0xb2, 0xab, 0xb9, 0xdf, 0x4d, 0xc1, 0x45, 0x30, 0x6b, 0xbe, 0xb2, 0x4d,
+	0x54, 0xca, 0x5b, 0xb9, 0xff, 0x4e, 0x6d, 0x85, 0x00, 0x0c, 0xf6, 0x05, 0x38, 0x03, 0x26, 0xf7,
+	0x5f, 0xe4, 0x26, 0xe0, 0x1c, 0x98, 0xb6, 0xcc, 0x7c, 0xd5, 0xcc, 0x29, 0x70, 0x05, 0x2c, 0x9b,
+	0x96, 0x59, 0xb0, 0x8b, 0xe5, 0x52, 0x0d, 0x1d, 0x96, 0x4a, 0xac, 0x6f, 0xe4, 0xc0, 0xc2, 0xcb,
+	0xbc, 0x5d, 0xd8, 0x4b, 0x2c, 0x53, 0xb4, 0x3f, 0x59, 0xe5, 0xc2, 0x7e, 0x0d, 0xe5, 0x0b, 0x26,
+	0x4a, 0xcc, 0x97, 0x28, 0x90, 0x09, 0x25, 0x96, 0xe9, 0x7b, 0x8f, 0xc1, 0x9c, 0x1d, 0x39, 0x41,
+	0xdc, 0x0e, 0x23, 0x02, 0xef, 0xc9, 0x0f, 0x4b, 0x62, 0x52, 0x88, 0x01, 0x75, 0x7d, 0xf9, 0xfc,
+	0x99, 0xcf, 0x09, 0x7d, 0x62, 0x53, 0xf9, 0xb1, 0xb2, 0x73, 0xe5, 0xcd, 0xbf, 0xd6, 0x27, 0xde,
+	0xbc, 0x5d, 0x57, 0x7e, 0x78, 0xbb, 0xae, 0xfc, 0xf3, 0xed, 0xba, 0xf2, 0xfb, 0x7f, 0xaf, 0x4f,
+	0xd4, 0x67, 0xd8, 0xff, 0xb4, 0xef, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x02, 0xb3, 0xfd, 0x10,
+	0x1c, 0x17, 0x00, 0x00,
 }

tools/functional-tester/rpcpb/rpc.proto

@@ -48,20 +48,29 @@ message Etcd {
 
   repeated string ListenClientURLs = 21 [(gogoproto.moretags) = "yaml:\"listen-client-urls\""];
   repeated string AdvertiseClientURLs = 22 [(gogoproto.moretags) = "yaml:\"advertise-client-urls\""];
-  repeated string ListenPeerURLs = 23 [(gogoproto.moretags) = "yaml:\"listen-peer-urls\""];
-  repeated string InitialAdvertisePeerURLs = 24 [(gogoproto.moretags) = "yaml:\"initial-advertise-peer-urls\""];
-
-  string InitialCluster = 31 [(gogoproto.moretags) = "yaml:\"initial-cluster\""];
-  string InitialClusterState = 32 [(gogoproto.moretags) = "yaml:\"initial-cluster-state\""];
-  string InitialClusterToken = 33 [(gogoproto.moretags) = "yaml:\"initial-cluster-token\""];
-
-  int64 SnapshotCount = 41 [(gogoproto.moretags) = "yaml:\"snapshot-count\""];
-  int64 QuotaBackendBytes = 42 [(gogoproto.moretags) = "yaml:\"quota-backend-bytes\""];
-
-  bool PreVote = 43 [(gogoproto.moretags) = "yaml:\"pre-vote\""];
-  bool InitialCorruptCheck = 44 [(gogoproto.moretags) = "yaml:\"initial-corrupt-check\""];
-
-  // TODO: support TLS
+  bool ClientAutoTLS = 23 [(gogoproto.moretags) = "yaml:\"auto-tls\""];
+  bool ClientCertAuth = 24 [(gogoproto.moretags) = "yaml:\"client-cert-auth\""];
+  string ClientCertFile = 25 [(gogoproto.moretags) = "yaml:\"cert-file\""];
+  string ClientKeyFile = 26 [(gogoproto.moretags) = "yaml:\"key-file\""];
+  string ClientTrustedCAFile = 27 [(gogoproto.moretags) = "yaml:\"trusted-ca-file\""];
+
+  repeated string ListenPeerURLs = 31 [(gogoproto.moretags) = "yaml:\"listen-peer-urls\""];
+  repeated string InitialAdvertisePeerURLs = 32 [(gogoproto.moretags) = "yaml:\"initial-advertise-peer-urls\""];
+  bool PeerAutoTLS = 33 [(gogoproto.moretags) = "yaml:\"peer-auto-tls\""];
+  bool PeerClientCertAuth = 34 [(gogoproto.moretags) = "yaml:\"peer-client-cert-auth\""];
+  string PeerCertFile = 35 [(gogoproto.moretags) = "yaml:\"peer-cert-file\""];
+  string PeerKeyFile = 36 [(gogoproto.moretags) = "yaml:\"peer-key-file\""];
+  string PeerTrustedCAFile = 37 [(gogoproto.moretags) = "yaml:\"peer-trusted-ca-file\""];
+
+  string InitialCluster = 41 [(gogoproto.moretags) = "yaml:\"initial-cluster\""];
+  string InitialClusterState = 42 [(gogoproto.moretags) = "yaml:\"initial-cluster-state\""];
+  string InitialClusterToken = 43 [(gogoproto.moretags) = "yaml:\"initial-cluster-token\""];
+
+  int64 SnapshotCount = 51 [(gogoproto.moretags) = "yaml:\"snapshot-count\""];
+  int64 QuotaBackendBytes = 52 [(gogoproto.moretags) = "yaml:\"quota-backend-bytes\""];
+
+  bool PreVote = 63 [(gogoproto.moretags) = "yaml:\"pre-vote\""];
+  bool InitialCorruptCheck = 64 [(gogoproto.moretags) = "yaml:\"initial-corrupt-check\""];
 }
 
 message Member {