diff --git a/proto/topo.proto b/proto/topo.proto index edcd1998..86418f8f 100644 --- a/proto/topo.proto +++ b/proto/topo.proto @@ -186,9 +186,15 @@ message CertificateCfg { SelfSignedCertCfg self_signed = 1; // Additional options will be for loading pregenerated certs. // Also support for CSR and generation workflow. + CertCfg cert = 2; } } +message CertCfg { + bytes server_cert = 1; + bytes client_cert = 2; +} + message SelfSignedCertCfg { // Certificate name on the node. string cert_name = 1; diff --git a/proto/topo/topo.pb.go b/proto/topo/topo.pb.go index 7e1aa954..76624a9d 100644 --- a/proto/topo/topo.pb.go +++ b/proto/topo/topo.pb.go @@ -1052,6 +1052,7 @@ type CertificateCfg struct { // Types that are assignable to Config: // // *CertificateCfg_SelfSigned + // *CertificateCfg_Cert Config isCertificateCfg_Config `protobuf_oneof:"config"` } @@ -1101,6 +1102,13 @@ func (x *CertificateCfg) GetSelfSigned() *SelfSignedCertCfg { return nil } +func (x *CertificateCfg) GetCert() *CertCfg { + if x, ok := x.GetConfig().(*CertificateCfg_Cert); ok { + return x.Cert + } + return nil +} + type isCertificateCfg_Config interface { isCertificateCfg_Config() } @@ -1110,8 +1118,71 @@ type CertificateCfg_SelfSigned struct { SelfSigned *SelfSignedCertCfg `protobuf:"bytes,1,opt,name=self_signed,json=selfSigned,proto3,oneof"` } +type CertificateCfg_Cert struct { + // Additional options will be for loading pregenerated certs. + // Also support for CSR and generation workflow. + Cert *CertCfg `protobuf:"bytes,2,opt,name=cert,proto3,oneof"` +} + func (*CertificateCfg_SelfSigned) isCertificateCfg_Config() {} +func (*CertificateCfg_Cert) isCertificateCfg_Config() {} + +type CertCfg struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + ServerCert []byte `protobuf:"bytes,1,opt,name=server_cert,json=serverCert,proto3" json:"server_cert,omitempty"` + ClientCert []byte `protobuf:"bytes,2,opt,name=client_cert,json=clientCert,proto3" json:"client_cert,omitempty"` +} + +func (x *CertCfg) Reset() { + *x = CertCfg{} + if protoimpl.UnsafeEnabled { + mi := &file_topo_proto_msgTypes[9] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *CertCfg) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*CertCfg) ProtoMessage() {} + +func (x *CertCfg) ProtoReflect() protoreflect.Message { + mi := &file_topo_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 CertCfg.ProtoReflect.Descriptor instead. +func (*CertCfg) Descriptor() ([]byte, []int) { + return file_topo_proto_rawDescGZIP(), []int{9} +} + +func (x *CertCfg) GetServerCert() []byte { + if x != nil { + return x.ServerCert + } + return nil +} + +func (x *CertCfg) GetClientCert() []byte { + if x != nil { + return x.ClientCert + } + return nil +} + type SelfSignedCertCfg struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1130,7 +1201,7 @@ type SelfSignedCertCfg struct { func (x *SelfSignedCertCfg) Reset() { *x = SelfSignedCertCfg{} if protoimpl.UnsafeEnabled { - mi := &file_topo_proto_msgTypes[9] + mi := &file_topo_proto_msgTypes[10] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1143,7 +1214,7 @@ func (x *SelfSignedCertCfg) String() string { func (*SelfSignedCertCfg) ProtoMessage() {} func (x *SelfSignedCertCfg) ProtoReflect() protoreflect.Message { - mi := &file_topo_proto_msgTypes[9] + mi := &file_topo_proto_msgTypes[10] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1156,7 +1227,7 @@ func (x *SelfSignedCertCfg) ProtoReflect() protoreflect.Message { // Deprecated: Use SelfSignedCertCfg.ProtoReflect.Descriptor instead. func (*SelfSignedCertCfg) Descriptor() ([]byte, []int) { - return file_topo_proto_rawDescGZIP(), []int{9} + return file_topo_proto_rawDescGZIP(), []int{10} } func (x *SelfSignedCertCfg) GetCertName() string { @@ -1217,7 +1288,7 @@ type Service struct { func (x *Service) Reset() { *x = Service{} if protoimpl.UnsafeEnabled { - mi := &file_topo_proto_msgTypes[10] + mi := &file_topo_proto_msgTypes[11] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -1230,7 +1301,7 @@ func (x *Service) String() string { func (*Service) ProtoMessage() {} func (x *Service) ProtoReflect() protoreflect.Message { - mi := &file_topo_proto_msgTypes[10] + mi := &file_topo_proto_msgTypes[11] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -1243,7 +1314,7 @@ func (x *Service) ProtoReflect() protoreflect.Message { // Deprecated: Use Service.ProtoReflect.Descriptor instead. func (*Service) Descriptor() ([]byte, []int) { - return file_topo_proto_rawDescGZIP(), []int{10} + return file_topo_proto_rawDescGZIP(), []int{11} } func (x *Service) GetName() string { @@ -1445,47 +1516,54 @@ var file_topo_proto_rawDesc = []byte{ 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, 0x0d, 0x0a, 0x0b, 0x63, 0x6f, - 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x22, 0x56, 0x0a, 0x0e, 0x43, 0x65, 0x72, + 0x6e, 0x66, 0x69, 0x67, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x22, 0x7b, 0x0a, 0x0e, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x43, 0x66, 0x67, 0x12, 0x3a, 0x0a, 0x0b, 0x73, 0x65, 0x6c, 0x66, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x17, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x2e, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x43, 0x66, 0x67, 0x48, 0x00, 0x52, 0x0a, 0x73, 0x65, 0x6c, - 0x66, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x42, 0x08, 0x0a, 0x06, 0x63, 0x6f, 0x6e, 0x66, 0x69, - 0x67, 0x22, 0x87, 0x01, 0x0a, 0x11, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, - 0x43, 0x65, 0x72, 0x74, 0x43, 0x66, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x65, 0x72, 0x74, 0x5f, - 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x65, 0x72, 0x74, - 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x6e, 0x61, 0x6d, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x4e, 0x61, 0x6d, 0x65, 0x12, - 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xbe, 0x01, 0x0a, 0x07, - 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x69, - 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x69, 0x6e, 0x73, - 0x69, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 0x12, 0x1d, 0x0a, - 0x0a, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x09, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 0x49, 0x70, 0x12, 0x1b, 0x0a, 0x09, - 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, - 0x08, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x49, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x6e, 0x6f, 0x64, - 0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x6e, 0x6f, - 0x64, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x18, - 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x2a, 0xa7, 0x01, 0x0a, - 0x06, 0x56, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, 0x4e, 0x4f, - 0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, 0x10, 0x01, 0x12, 0x0a, - 0x0a, 0x06, 0x41, 0x52, 0x49, 0x53, 0x54, 0x41, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x49, - 0x53, 0x43, 0x4f, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x4a, 0x55, 0x4e, 0x49, 0x50, 0x45, 0x52, - 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x4b, 0x45, 0x59, 0x53, 0x49, 0x47, 0x48, 0x54, 0x10, 0x05, - 0x12, 0x07, 0x0a, 0x03, 0x46, 0x52, 0x52, 0x10, 0x06, 0x12, 0x0a, 0x0a, 0x06, 0x51, 0x55, 0x41, - 0x47, 0x47, 0x41, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x4f, 0x42, 0x47, 0x50, 0x10, 0x08, - 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4b, 0x49, 0x41, 0x10, 0x09, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, - 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x10, 0x0a, 0x12, 0x0a, 0x0a, 0x06, 0x41, - 0x4c, 0x50, 0x49, 0x4e, 0x45, 0x10, 0x0b, 0x12, 0x0d, 0x0a, 0x09, 0x44, 0x52, 0x49, 0x56, 0x45, - 0x4e, 0x45, 0x54, 0x53, 0x10, 0x0c, 0x42, 0x26, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, - 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x2f, - 0x6b, 0x6e, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x6f, 0x70, 0x6f, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x66, 0x53, 0x69, 0x67, 0x6e, 0x65, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x63, 0x65, 0x72, 0x74, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x74, 0x6f, 0x70, 0x6f, 0x2e, 0x43, 0x65, 0x72, + 0x74, 0x43, 0x66, 0x67, 0x48, 0x00, 0x52, 0x04, 0x63, 0x65, 0x72, 0x74, 0x42, 0x08, 0x0a, 0x06, + 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x22, 0x4b, 0x0a, 0x07, 0x43, 0x65, 0x72, 0x74, 0x43, 0x66, + 0x67, 0x12, 0x1f, 0x0a, 0x0b, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x43, 0x65, + 0x72, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x63, 0x65, 0x72, + 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x43, + 0x65, 0x72, 0x74, 0x22, 0x87, 0x01, 0x0a, 0x11, 0x53, 0x65, 0x6c, 0x66, 0x53, 0x69, 0x67, 0x6e, + 0x65, 0x64, 0x43, 0x65, 0x72, 0x74, 0x43, 0x66, 0x67, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x65, 0x72, + 0x74, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x65, + 0x72, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x6e, 0x61, + 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x4e, 0x61, 0x6d, + 0x65, 0x12, 0x19, 0x0a, 0x08, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x69, 0x7a, 0x65, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x0d, 0x52, 0x07, 0x6b, 0x65, 0x79, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1f, 0x0a, 0x0b, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x0a, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x4e, 0x61, 0x6d, 0x65, 0x22, 0xbe, 0x01, + 0x0a, 0x07, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, + 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, + 0x06, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x69, + 0x6e, 0x73, 0x69, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 0x12, + 0x1d, 0x0a, 0x0a, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x09, 0x6f, 0x75, 0x74, 0x73, 0x69, 0x64, 0x65, 0x49, 0x70, 0x12, 0x1b, + 0x0a, 0x09, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x69, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x09, 0x52, 0x08, 0x69, 0x6e, 0x73, 0x69, 0x64, 0x65, 0x49, 0x70, 0x12, 0x1b, 0x0a, 0x09, 0x6e, + 0x6f, 0x64, 0x65, 0x5f, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, + 0x6e, 0x6f, 0x64, 0x65, 0x50, 0x6f, 0x72, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x6e, 0x61, 0x6d, 0x65, + 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x09, 0x52, 0x05, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x2a, 0xa7, + 0x01, 0x0a, 0x06, 0x56, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x4e, 0x4b, + 0x4e, 0x4f, 0x57, 0x4e, 0x10, 0x00, 0x12, 0x08, 0x0a, 0x04, 0x48, 0x4f, 0x53, 0x54, 0x10, 0x01, + 0x12, 0x0a, 0x0a, 0x06, 0x41, 0x52, 0x49, 0x53, 0x54, 0x41, 0x10, 0x02, 0x12, 0x09, 0x0a, 0x05, + 0x43, 0x49, 0x53, 0x43, 0x4f, 0x10, 0x03, 0x12, 0x0b, 0x0a, 0x07, 0x4a, 0x55, 0x4e, 0x49, 0x50, + 0x45, 0x52, 0x10, 0x04, 0x12, 0x0c, 0x0a, 0x08, 0x4b, 0x45, 0x59, 0x53, 0x49, 0x47, 0x48, 0x54, + 0x10, 0x05, 0x12, 0x07, 0x0a, 0x03, 0x46, 0x52, 0x52, 0x10, 0x06, 0x12, 0x0a, 0x0a, 0x06, 0x51, + 0x55, 0x41, 0x47, 0x47, 0x41, 0x10, 0x07, 0x12, 0x09, 0x0a, 0x05, 0x47, 0x4f, 0x42, 0x47, 0x50, + 0x10, 0x08, 0x12, 0x09, 0x0a, 0x05, 0x4e, 0x4f, 0x4b, 0x49, 0x41, 0x10, 0x09, 0x12, 0x0e, 0x0a, + 0x0a, 0x4f, 0x50, 0x45, 0x4e, 0x43, 0x4f, 0x4e, 0x46, 0x49, 0x47, 0x10, 0x0a, 0x12, 0x0a, 0x0a, + 0x06, 0x41, 0x4c, 0x50, 0x49, 0x4e, 0x45, 0x10, 0x0b, 0x12, 0x0d, 0x0a, 0x09, 0x44, 0x52, 0x49, + 0x56, 0x45, 0x4e, 0x45, 0x54, 0x53, 0x10, 0x0c, 0x42, 0x26, 0x5a, 0x24, 0x67, 0x69, 0x74, 0x68, + 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x6f, 0x70, 0x65, 0x6e, 0x63, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x2f, 0x6b, 0x6e, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x6f, 0x70, 0x6f, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1501,7 +1579,7 @@ func file_topo_proto_rawDescGZIP() []byte { } var file_topo_proto_enumTypes = make([]protoimpl.EnumInfo, 3) -var file_topo_proto_msgTypes = make([]protoimpl.MessageInfo, 16) +var file_topo_proto_msgTypes = make([]protoimpl.MessageInfo, 17) var file_topo_proto_goTypes = []interface{}{ (Vendor)(0), // 0: topo.Vendor (Node_Type)(0), // 1: topo.Node.Type @@ -1515,40 +1593,42 @@ var file_topo_proto_goTypes = []interface{}{ (*Link)(nil), // 9: topo.Link (*Config)(nil), // 10: topo.Config (*CertificateCfg)(nil), // 11: topo.CertificateCfg - (*SelfSignedCertCfg)(nil), // 12: topo.SelfSignedCertCfg - (*Service)(nil), // 13: topo.Service - nil, // 14: topo.Node.LabelsEntry - nil, // 15: topo.Node.ServicesEntry - nil, // 16: topo.Node.ConstraintsEntry - nil, // 17: topo.Node.InterfacesEntry - nil, // 18: topo.Config.EnvEntry - (*anypb.Any)(nil), // 19: google.protobuf.Any + (*CertCfg)(nil), // 12: topo.CertCfg + (*SelfSignedCertCfg)(nil), // 13: topo.SelfSignedCertCfg + (*Service)(nil), // 14: topo.Service + nil, // 15: topo.Node.LabelsEntry + nil, // 16: topo.Node.ServicesEntry + nil, // 17: topo.Node.ConstraintsEntry + nil, // 18: topo.Node.InterfacesEntry + nil, // 19: topo.Config.EnvEntry + (*anypb.Any)(nil), // 20: google.protobuf.Any } var file_topo_proto_depIdxs = []int32{ 4, // 0: topo.Topology.nodes:type_name -> topo.Node 9, // 1: topo.Topology.links:type_name -> topo.Link 1, // 2: topo.Node.type:type_name -> topo.Node.Type - 14, // 3: topo.Node.labels:type_name -> topo.Node.LabelsEntry + 15, // 3: topo.Node.labels:type_name -> topo.Node.LabelsEntry 10, // 4: topo.Node.config:type_name -> topo.Config - 15, // 5: topo.Node.services:type_name -> topo.Node.ServicesEntry - 16, // 6: topo.Node.constraints:type_name -> topo.Node.ConstraintsEntry + 16, // 5: topo.Node.services:type_name -> topo.Node.ServicesEntry + 17, // 6: topo.Node.constraints:type_name -> topo.Node.ConstraintsEntry 0, // 7: topo.Node.vendor:type_name -> topo.Vendor - 17, // 8: topo.Node.interfaces:type_name -> topo.Node.InterfacesEntry + 18, // 8: topo.Node.interfaces:type_name -> topo.Node.InterfacesEntry 5, // 9: topo.Node.host_constraints:type_name -> topo.HostConstraint 6, // 10: topo.HostConstraint.kernel_constraint:type_name -> topo.KernelParam 7, // 11: topo.KernelParam.bounded_integer:type_name -> topo.BoundedInteger 2, // 12: topo.Interface.type:type_name -> topo.Interface.InterfaceType - 18, // 13: topo.Config.env:type_name -> topo.Config.EnvEntry + 19, // 13: topo.Config.env:type_name -> topo.Config.EnvEntry 11, // 14: topo.Config.cert:type_name -> topo.CertificateCfg - 19, // 15: topo.Config.vendor_data:type_name -> google.protobuf.Any - 12, // 16: topo.CertificateCfg.self_signed:type_name -> topo.SelfSignedCertCfg - 13, // 17: topo.Node.ServicesEntry.value:type_name -> topo.Service - 8, // 18: topo.Node.InterfacesEntry.value:type_name -> topo.Interface - 19, // [19:19] is the sub-list for method output_type - 19, // [19:19] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 20, // 15: topo.Config.vendor_data:type_name -> google.protobuf.Any + 13, // 16: topo.CertificateCfg.self_signed:type_name -> topo.SelfSignedCertCfg + 12, // 17: topo.CertificateCfg.cert:type_name -> topo.CertCfg + 14, // 18: topo.Node.ServicesEntry.value:type_name -> topo.Service + 8, // 19: topo.Node.InterfacesEntry.value:type_name -> topo.Interface + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_topo_proto_init() } @@ -1666,7 +1746,7 @@ func file_topo_proto_init() { } } file_topo_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*SelfSignedCertCfg); i { + switch v := v.(*CertCfg); i { case 0: return &v.state case 1: @@ -1678,6 +1758,18 @@ func file_topo_proto_init() { } } file_topo_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*SelfSignedCertCfg); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_topo_proto_msgTypes[11].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*Service); i { case 0: return &v.state @@ -1702,6 +1794,7 @@ func file_topo_proto_init() { } file_topo_proto_msgTypes[8].OneofWrappers = []interface{}{ (*CertificateCfg_SelfSigned)(nil), + (*CertificateCfg_Cert)(nil), } type x struct{} out := protoimpl.TypeBuilder{ @@ -1709,7 +1802,7 @@ func file_topo_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_topo_proto_rawDesc, NumEnums: 3, - NumMessages: 16, + NumMessages: 17, NumExtensions: 0, NumServices: 0, },