From 171ccf92a08b3dc8a2f1e635a718bfb49535a43f Mon Sep 17 00:00:00 2001 From: Alex Demidoff Date: Tue, 14 Nov 2023 13:45:10 +0300 Subject: [PATCH] PMM-12660 do not output certs when listing agents (#2604) * PMM-12660 do not leak certs when listing agents * PMM-12660 cleanup & put back AwsAccessKey --- api/managementpb/agent/agent.pb.go | 223 +++++++----------- api/managementpb/agent/agent.pb.validate.go | 10 - api/managementpb/agent/agent.proto | 15 +- api/managementpb/agent/json/agent.json | 35 +-- .../client/agent/list_agents_responses.go | 15 -- .../mgmt_service/list_services_responses.go | 15 -- api/managementpb/service/json/service.json | 35 +-- api/swagger/swagger-dev.json | 78 ++---- descriptor.bin | Bin 766212 -> 768132 bytes managed/services/management/agent.go | 5 - managed/services/management/agent_test.go | 4 - 11 files changed, 115 insertions(+), 320 deletions(-) diff --git a/api/managementpb/agent/agent.pb.go b/api/managementpb/agent/agent.pb.go index 319577f8b5..88a67e8f89 100644 --- a/api/managementpb/agent/agent.pb.go +++ b/api/managementpb/agent/agent.pb.go @@ -527,10 +527,6 @@ type UniversalAgent_MySQLOptions struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // TLS CA certificate. - TlsCa string `protobuf:"bytes,1,opt,name=tls_ca,json=tlsCa,proto3" json:"tls_ca,omitempty"` - // TLS certificate. - TlsCert string `protobuf:"bytes,2,opt,name=tls_cert,json=tlsCert,proto3" json:"tls_cert,omitempty"` // True if TLS key is set. IsTlsKeySet bool `protobuf:"varint,3,opt,name=is_tls_key_set,json=isTlsKeySet,proto3" json:"is_tls_key_set,omitempty"` } @@ -567,20 +563,6 @@ func (*UniversalAgent_MySQLOptions) Descriptor() ([]byte, []int) { return file_managementpb_agent_agent_proto_rawDescGZIP(), []int{0, 0} } -func (x *UniversalAgent_MySQLOptions) GetTlsCa() string { - if x != nil { - return x.TlsCa - } - return "" -} - -func (x *UniversalAgent_MySQLOptions) GetTlsCert() string { - if x != nil { - return x.TlsCert - } - return "" -} - func (x *UniversalAgent_MySQLOptions) GetIsTlsKeySet() bool { if x != nil { return x.IsTlsKeySet @@ -681,8 +663,6 @@ type UniversalAgent_MongoDBOptions struct { IsTlsCertificateKeySet bool `protobuf:"varint,1,opt,name=is_tls_certificate_key_set,json=isTlsCertificateKeySet,proto3" json:"is_tls_certificate_key_set,omitempty"` // True if TLS certificate file password is set. IsTlsCertificateKeyFilePasswordSet bool `protobuf:"varint,2,opt,name=is_tls_certificate_key_file_password_set,json=isTlsCertificateKeyFilePasswordSet,proto3" json:"is_tls_certificate_key_file_password_set,omitempty"` - // TLS CA certificate. - TlsCa string `protobuf:"bytes,3,opt,name=tls_ca,json=tlsCa,proto3" json:"tls_ca,omitempty"` // MongoDB auth mechanism. AuthenticationMechanism string `protobuf:"bytes,4,opt,name=authentication_mechanism,json=authenticationMechanism,proto3" json:"authentication_mechanism,omitempty"` // MongoDB auth database. @@ -741,13 +721,6 @@ func (x *UniversalAgent_MongoDBOptions) GetIsTlsCertificateKeyFilePasswordSet() return false } -func (x *UniversalAgent_MongoDBOptions) GetTlsCa() string { - if x != nil { - return x.TlsCa - } - return "" -} - func (x *UniversalAgent_MongoDBOptions) GetAuthenticationMechanism() string { if x != nil { return x.AuthenticationMechanism @@ -788,10 +761,6 @@ type UniversalAgent_PostgreSQLOptions struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - // TLS CA certificate. - SslCa string `protobuf:"bytes,1,opt,name=ssl_ca,json=sslCa,proto3" json:"ssl_ca,omitempty"` - // TLS certificate. - SslCert string `protobuf:"bytes,2,opt,name=ssl_cert,json=sslCert,proto3" json:"ssl_cert,omitempty"` // True if TLS key is set. IsSslKeySet bool `protobuf:"varint,3,opt,name=is_ssl_key_set,json=isSslKeySet,proto3" json:"is_ssl_key_set,omitempty"` } @@ -828,20 +797,6 @@ func (*UniversalAgent_PostgreSQLOptions) Descriptor() ([]byte, []int) { return file_managementpb_agent_agent_proto_rawDescGZIP(), []int{0, 3} } -func (x *UniversalAgent_PostgreSQLOptions) GetSslCa() string { - if x != nil { - return x.SslCa - } - return "" -} - -func (x *UniversalAgent_PostgreSQLOptions) GetSslCert() string { - if x != nil { - return x.SslCert - } - return "" -} - func (x *UniversalAgent_PostgreSQLOptions) GetIsSslKeySet() bool { if x != nil { return x.IsSslKeySet @@ -863,7 +818,7 @@ var file_managementpb_agent_agent_proto_rawDesc = []byte{ 0x70, 0x69, 0x76, 0x32, 0x2f, 0x6f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2f, 0x61, 0x6e, 0x6e, 0x6f, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x17, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x65, 0x2f, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, - 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xc9, 0x15, 0x0a, 0x0e, 0x55, 0x6e, 0x69, 0x76, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xec, 0x14, 0x0a, 0x0e, 0x55, 0x6e, 0x69, 0x76, 0x65, 0x72, 0x73, 0x61, 0x6c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x31, 0x0a, 0x15, 0x69, 0x73, 0x5f, 0x61, 0x67, 0x65, 0x6e, @@ -978,97 +933,91 @@ var file_managementpb_agent_agent_proto_rawDesc = []byte{ 0x69, 0x6f, 0x6e, 0x18, 0x25, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x76, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x0c, 0x69, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x6e, 0x65, 0x63, 0x74, 0x65, 0x64, 0x18, 0x26, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x43, 0x6f, 0x6e, 0x6e, - 0x65, 0x63, 0x74, 0x65, 0x64, 0x1a, 0x65, 0x0a, 0x0c, 0x4d, 0x79, 0x53, 0x51, 0x4c, 0x4f, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x15, 0x0a, 0x06, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x18, - 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, 0x6c, 0x73, 0x43, 0x61, 0x12, 0x19, 0x0a, 0x08, - 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, - 0x74, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x12, 0x23, 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x0b, 0x69, 0x73, 0x54, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x53, 0x65, 0x74, 0x1a, 0xc9, 0x01, 0x0a, - 0x0c, 0x41, 0x7a, 0x75, 0x72, 0x65, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1b, 0x0a, - 0x09, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x14, 0x69, 0x73, - 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x73, - 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x69, 0x73, 0x43, 0x6c, 0x69, 0x65, - 0x6e, 0x74, 0x53, 0x65, 0x63, 0x72, 0x65, 0x74, 0x53, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x72, - 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x12, 0x27, 0x0a, 0x0f, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, - 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x75, 0x62, - 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x74, - 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x49, 0x64, 0x1a, 0xbb, 0x03, 0x0a, 0x0e, 0x4d, 0x6f, 0x6e, - 0x67, 0x6f, 0x44, 0x42, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x1a, 0x69, - 0x73, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, - 0x16, 0x69, 0x73, 0x54, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x65, 0x4b, 0x65, 0x79, 0x53, 0x65, 0x74, 0x12, 0x54, 0x0a, 0x28, 0x69, 0x73, 0x5f, 0x74, 0x6c, - 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, - 0x79, 0x5f, 0x66, 0x69, 0x6c, 0x65, 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, - 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x22, 0x69, 0x73, 0x54, 0x6c, 0x73, - 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x46, 0x69, - 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x53, 0x65, 0x74, 0x12, 0x15, 0x0a, - 0x06, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x74, - 0x6c, 0x73, 0x43, 0x61, 0x12, 0x39, 0x0a, 0x18, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x63, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x6d, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x63, 0x68, 0x61, 0x6e, 0x69, 0x73, 0x6d, 0x12, - 0x37, 0x0a, 0x17, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x16, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, - 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x73, 0x74, 0x61, 0x74, - 0x73, 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x06, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x10, 0x73, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f, 0x6c, 0x6c, 0x65, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x4c, 0x69, 0x6d, - 0x69, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x61, 0x6c, 0x6c, - 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, - 0x08, 0x52, 0x13, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x6c, 0x6c, 0x43, 0x6f, 0x6c, 0x6c, - 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x1a, 0x6a, 0x0a, 0x11, 0x50, 0x6f, 0x73, 0x74, 0x67, 0x72, - 0x65, 0x53, 0x51, 0x4c, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x15, 0x0a, 0x06, 0x73, - 0x73, 0x6c, 0x5f, 0x63, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x73, 0x73, 0x6c, - 0x43, 0x61, 0x12, 0x19, 0x0a, 0x08, 0x73, 0x73, 0x6c, 0x5f, 0x63, 0x65, 0x72, 0x74, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x73, 0x73, 0x6c, 0x43, 0x65, 0x72, 0x74, 0x12, 0x23, 0x0a, - 0x0e, 0x69, 0x73, 0x5f, 0x73, 0x73, 0x6c, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, - 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, 0x53, 0x73, 0x6c, 0x4b, 0x65, 0x79, 0x53, - 0x65, 0x74, 0x1a, 0x3f, 0x0a, 0x11, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, 0x61, 0x62, 0x65, - 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, - 0x02, 0x38, 0x01, 0x22, 0x4a, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, 0x72, 0x76, 0x69, - 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x65, 0x72, - 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x6f, 0x64, 0x65, 0x5f, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, 0x49, 0x64, 0x22, - 0x4a, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x06, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x18, 0x01, - 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x76, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x6e, 0x69, 0x76, 0x65, 0x72, 0x73, 0x61, 0x6c, 0x41, 0x67, - 0x65, 0x6e, 0x74, 0x52, 0x06, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x32, 0xb3, 0x01, 0x0a, 0x05, - 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0xa9, 0x01, 0x0a, 0x0a, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, - 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1f, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x76, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x65, - 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x76, 0x31, - 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x58, 0x92, 0x41, 0x31, 0x12, 0x0b, 0x4c, 0x69, - 0x73, 0x74, 0x20, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x22, 0x52, 0x65, 0x74, 0x75, 0x72, - 0x6e, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, 0x20, 0x6c, 0x69, - 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x76, 0x31, 0x2f, 0x6d, 0x61, 0x6e, 0x61, - 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x2f, 0x4c, 0x69, 0x73, - 0x74, 0x42, 0xb0, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, - 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0a, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x50, 0x72, - 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x70, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x61, 0x2f, 0x70, 0x6d, 0x6d, 0x2f, 0x61, 0x70, - 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x70, 0x62, 0x2f, 0x61, - 0x67, 0x65, 0x6e, 0x74, 0x3b, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, - 0x31, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x2e, - 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x0d, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x5c, - 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x19, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x5c, - 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x3a, 0x3a, 0x56, 0x31, 0x62, - 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x63, 0x74, 0x65, 0x64, 0x1a, 0x3f, 0x0a, 0x0c, 0x4d, 0x79, 0x53, 0x51, 0x4c, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x74, 0x6c, 0x73, 0x5f, + 0x6b, 0x65, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, + 0x73, 0x54, 0x6c, 0x73, 0x4b, 0x65, 0x79, 0x53, 0x65, 0x74, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, + 0x4a, 0x04, 0x08, 0x02, 0x10, 0x03, 0x1a, 0xc9, 0x01, 0x0a, 0x0c, 0x41, 0x7a, 0x75, 0x72, 0x65, + 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x6c, 0x69, 0x65, 0x6e, + 0x74, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x63, 0x6c, 0x69, 0x65, + 0x6e, 0x74, 0x49, 0x64, 0x12, 0x2f, 0x0a, 0x14, 0x69, 0x73, 0x5f, 0x63, 0x6c, 0x69, 0x65, 0x6e, + 0x74, 0x5f, 0x73, 0x65, 0x63, 0x72, 0x65, 0x74, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x08, 0x52, 0x11, 0x69, 0x73, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x53, 0x65, 0x63, 0x72, + 0x65, 0x74, 0x53, 0x65, 0x74, 0x12, 0x25, 0x0a, 0x0e, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, + 0x65, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x27, 0x0a, 0x0f, + 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, + 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x73, 0x75, 0x62, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x49, 0x64, 0x12, 0x1b, 0x0a, 0x09, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, 0x5f, + 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x74, 0x65, 0x6e, 0x61, 0x6e, 0x74, + 0x49, 0x64, 0x1a, 0xaa, 0x03, 0x0a, 0x0e, 0x4d, 0x6f, 0x6e, 0x67, 0x6f, 0x44, 0x42, 0x4f, 0x70, + 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x3a, 0x0a, 0x1a, 0x69, 0x73, 0x5f, 0x74, 0x6c, 0x73, 0x5f, + 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, + 0x73, 0x65, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x16, 0x69, 0x73, 0x54, 0x6c, 0x73, + 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x53, 0x65, + 0x74, 0x12, 0x54, 0x0a, 0x28, 0x69, 0x73, 0x5f, 0x74, 0x6c, 0x73, 0x5f, 0x63, 0x65, 0x72, 0x74, + 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x5f, 0x66, 0x69, 0x6c, 0x65, + 0x5f, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x08, 0x52, 0x22, 0x69, 0x73, 0x54, 0x6c, 0x73, 0x43, 0x65, 0x72, 0x74, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x73, 0x73, + 0x77, 0x6f, 0x72, 0x64, 0x53, 0x65, 0x74, 0x12, 0x39, 0x0a, 0x18, 0x61, 0x75, 0x74, 0x68, 0x65, + 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x6d, 0x65, 0x63, 0x68, 0x61, 0x6e, + 0x69, 0x73, 0x6d, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x17, 0x61, 0x75, 0x74, 0x68, 0x65, + 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x65, 0x63, 0x68, 0x61, 0x6e, 0x69, + 0x73, 0x6d, 0x12, 0x37, 0x0a, 0x17, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, + 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x64, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x18, 0x05, 0x20, + 0x01, 0x28, 0x09, 0x52, 0x16, 0x61, 0x75, 0x74, 0x68, 0x65, 0x6e, 0x74, 0x69, 0x63, 0x61, 0x74, + 0x69, 0x6f, 0x6e, 0x44, 0x61, 0x74, 0x61, 0x62, 0x61, 0x73, 0x65, 0x12, 0x2b, 0x0a, 0x11, 0x73, + 0x74, 0x61, 0x74, 0x73, 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x10, 0x73, 0x74, 0x61, 0x74, 0x73, 0x43, 0x6f, 0x6c, + 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x2b, 0x0a, 0x11, 0x63, 0x6f, 0x6c, 0x6c, + 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x5f, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x10, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x73, + 0x4c, 0x69, 0x6d, 0x69, 0x74, 0x12, 0x32, 0x0a, 0x15, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x5f, + 0x61, 0x6c, 0x6c, 0x5f, 0x63, 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x18, 0x08, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x13, 0x65, 0x6e, 0x61, 0x62, 0x6c, 0x65, 0x41, 0x6c, 0x6c, 0x43, + 0x6f, 0x6c, 0x6c, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x73, 0x4a, 0x04, 0x08, 0x03, 0x10, 0x04, 0x1a, + 0x44, 0x0a, 0x11, 0x50, 0x6f, 0x73, 0x74, 0x67, 0x72, 0x65, 0x53, 0x51, 0x4c, 0x4f, 0x70, 0x74, + 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x23, 0x0a, 0x0e, 0x69, 0x73, 0x5f, 0x73, 0x73, 0x6c, 0x5f, 0x6b, + 0x65, 0x79, 0x5f, 0x73, 0x65, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x69, 0x73, + 0x53, 0x73, 0x6c, 0x4b, 0x65, 0x79, 0x53, 0x65, 0x74, 0x4a, 0x04, 0x08, 0x01, 0x10, 0x02, 0x4a, + 0x04, 0x08, 0x02, 0x10, 0x03, 0x1a, 0x3f, 0x0a, 0x11, 0x43, 0x75, 0x73, 0x74, 0x6f, 0x6d, 0x4c, + 0x61, 0x62, 0x65, 0x6c, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, + 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, + 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x4a, 0x0a, 0x10, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, + 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1d, 0x0a, 0x0a, 0x73, 0x65, + 0x72, 0x76, 0x69, 0x63, 0x65, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, + 0x73, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x49, 0x64, 0x12, 0x17, 0x0a, 0x07, 0x6e, 0x6f, 0x64, + 0x65, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x6e, 0x6f, 0x64, 0x65, + 0x49, 0x64, 0x22, 0x4a, 0x0a, 0x11, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, + 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x35, 0x0a, 0x06, 0x61, 0x67, 0x65, 0x6e, 0x74, + 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, + 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x55, 0x6e, 0x69, 0x76, 0x65, 0x72, 0x73, 0x61, + 0x6c, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x52, 0x06, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x32, 0xb3, + 0x01, 0x0a, 0x05, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x12, 0xa9, 0x01, 0x0a, 0x0a, 0x4c, 0x69, 0x73, + 0x74, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x12, 0x1f, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, + 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, 0x65, 0x6e, + 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x20, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, + 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x67, 0x65, + 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x58, 0x92, 0x41, 0x31, 0x12, + 0x0b, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x1a, 0x22, 0x52, 0x65, + 0x74, 0x75, 0x72, 0x6e, 0x73, 0x20, 0x61, 0x20, 0x66, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x65, 0x64, + 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x73, 0x2e, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1e, 0x3a, 0x01, 0x2a, 0x22, 0x19, 0x2f, 0x76, 0x31, 0x2f, 0x6d, + 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x2f, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x2f, + 0x4c, 0x69, 0x73, 0x74, 0x42, 0xb0, 0x01, 0x0a, 0x11, 0x63, 0x6f, 0x6d, 0x2e, 0x61, 0x67, 0x65, + 0x6e, 0x74, 0x2e, 0x76, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x42, 0x0a, 0x41, 0x67, 0x65, 0x6e, + 0x74, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x3a, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x65, 0x72, 0x63, 0x6f, 0x6e, 0x61, 0x2f, 0x70, 0x6d, 0x6d, + 0x2f, 0x61, 0x70, 0x69, 0x2f, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x70, + 0x62, 0x2f, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x3b, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x76, 0x31, 0x62, + 0x65, 0x74, 0x61, 0x31, 0xa2, 0x02, 0x03, 0x41, 0x58, 0x58, 0xaa, 0x02, 0x0d, 0x41, 0x67, 0x65, + 0x6e, 0x74, 0x2e, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xca, 0x02, 0x0d, 0x41, 0x67, 0x65, + 0x6e, 0x74, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0xe2, 0x02, 0x19, 0x41, 0x67, 0x65, + 0x6e, 0x74, 0x5c, 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x0e, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x3a, 0x3a, + 0x56, 0x31, 0x62, 0x65, 0x74, 0x61, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/api/managementpb/agent/agent.pb.validate.go b/api/managementpb/agent/agent.pb.validate.go index 9a136b93e7..e7906899df 100644 --- a/api/managementpb/agent/agent.pb.validate.go +++ b/api/managementpb/agent/agent.pb.validate.go @@ -635,10 +635,6 @@ func (m *UniversalAgent_MySQLOptions) validate(all bool) error { var errors []error - // no validation rules for TlsCa - - // no validation rules for TlsCert - // no validation rules for IsTlsKeySet if len(errors) > 0 { @@ -861,8 +857,6 @@ func (m *UniversalAgent_MongoDBOptions) validate(all bool) error { // no validation rules for IsTlsCertificateKeyFilePasswordSet - // no validation rules for TlsCa - // no validation rules for AuthenticationMechanism // no validation rules for AuthenticationDatabase @@ -975,10 +969,6 @@ func (m *UniversalAgent_PostgreSQLOptions) validate(all bool) error { var errors []error - // no validation rules for SslCa - - // no validation rules for SslCert - // no validation rules for IsSslKeySet if len(errors) > 0 { diff --git a/api/managementpb/agent/agent.proto b/api/managementpb/agent/agent.proto index 87567a7ae8..d9e5a775c0 100644 --- a/api/managementpb/agent/agent.proto +++ b/api/managementpb/agent/agent.proto @@ -11,10 +11,8 @@ option go_package = "api/managementpb/agent;agentv1beta1"; message UniversalAgent { message MySQLOptions { - // TLS CA certificate. - string tls_ca = 1; - // TLS certificate. - string tls_cert = 2; + reserved 1; // tls_ca + reserved 2; // tls_cert // True if TLS key is set. bool is_tls_key_set = 3; } @@ -37,8 +35,7 @@ message UniversalAgent { bool is_tls_certificate_key_set = 1; // True if TLS certificate file password is set. bool is_tls_certificate_key_file_password_set = 2; - // TLS CA certificate. - string tls_ca = 3; + reserved 3; // tls_ca // MongoDB auth mechanism. string authentication_mechanism = 4; // MongoDB auth database. @@ -52,10 +49,8 @@ message UniversalAgent { } message PostgreSQLOptions { - // TLS CA certificate. - string ssl_ca = 1; - // TLS certificate. - string ssl_cert = 2; + reserved 1; // ssl_ca + reserved 2; // ssl_cert // True if TLS key is set. bool is_ssl_key_set = 3; } diff --git a/api/managementpb/agent/json/agent.json b/api/managementpb/agent/json/agent.json index f4891a00d7..9215fd6521 100644 --- a/api/managementpb/agent/json/agent.json +++ b/api/managementpb/agent/json/agent.json @@ -196,23 +196,23 @@ "authentication_database": { "description": "MongoDB auth database.", "type": "string", - "x-order": 4 + "x-order": 3 }, "authentication_mechanism": { "description": "MongoDB auth mechanism.", "type": "string", - "x-order": 3 + "x-order": 2 }, "collections_limit": { "description": "MongoDB collections limit.", "type": "integer", "format": "int32", - "x-order": 6 + "x-order": 5 }, "enable_all_collectors": { "description": "True if all collectors are enabled.", "type": "boolean", - "x-order": 7 + "x-order": 6 }, "is_tls_certificate_key_file_password_set": { "description": "True if TLS certificate file password is set.", @@ -230,12 +230,7 @@ "items": { "type": "string" }, - "x-order": 5 - }, - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 2 + "x-order": 4 } }, "x-order": 16 @@ -246,17 +241,7 @@ "is_tls_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 - }, - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", "x-order": 0 - }, - "tls_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 } }, "x-order": 17 @@ -277,17 +262,7 @@ "is_ssl_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 - }, - "ssl_ca": { - "description": "TLS CA certificate.", - "type": "string", "x-order": 0 - }, - "ssl_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 } }, "x-order": 21 diff --git a/api/managementpb/agent/json/client/agent/list_agents_responses.go b/api/managementpb/agent/json/client/agent/list_agents_responses.go index 6143803fa9..c79c1daef7 100644 --- a/api/managementpb/agent/json/client/agent/list_agents_responses.go +++ b/api/managementpb/agent/json/client/agent/list_agents_responses.go @@ -823,9 +823,6 @@ type ListAgentsOKBodyAgentsItems0MongoDBOptions struct { // True if TLS certificate file password is set. IsTLSCertificateKeyFilePasswordSet bool `json:"is_tls_certificate_key_file_password_set,omitempty"` - // TLS CA certificate. - TLSCa string `json:"tls_ca,omitempty"` - // MongoDB auth mechanism. AuthenticationMechanism string `json:"authentication_mechanism,omitempty"` @@ -875,12 +872,6 @@ ListAgentsOKBodyAgentsItems0MysqlOptions list agents OK body agents items0 mysql swagger:model ListAgentsOKBodyAgentsItems0MysqlOptions */ type ListAgentsOKBodyAgentsItems0MysqlOptions struct { - // TLS CA certificate. - TLSCa string `json:"tls_ca,omitempty"` - - // TLS certificate. - TLSCert string `json:"tls_cert,omitempty"` - // True if TLS key is set. IsTLSKeySet bool `json:"is_tls_key_set,omitempty"` } @@ -918,12 +909,6 @@ ListAgentsOKBodyAgentsItems0PostgresqlOptions list agents OK body agents items0 swagger:model ListAgentsOKBodyAgentsItems0PostgresqlOptions */ type ListAgentsOKBodyAgentsItems0PostgresqlOptions struct { - // TLS CA certificate. - SslCa string `json:"ssl_ca,omitempty"` - - // TLS certificate. - SslCert string `json:"ssl_cert,omitempty"` - // True if TLS key is set. IsSslKeySet bool `json:"is_ssl_key_set,omitempty"` } diff --git a/api/managementpb/service/json/client/mgmt_service/list_services_responses.go b/api/managementpb/service/json/client/mgmt_service/list_services_responses.go index 708c684e4f..bb8b95abe6 100644 --- a/api/managementpb/service/json/client/mgmt_service/list_services_responses.go +++ b/api/managementpb/service/json/client/mgmt_service/list_services_responses.go @@ -1141,9 +1141,6 @@ type ListServicesOKBodyServicesItems0AgentsItems0MongoDBOptions struct { // True if TLS certificate file password is set. IsTLSCertificateKeyFilePasswordSet bool `json:"is_tls_certificate_key_file_password_set,omitempty"` - // TLS CA certificate. - TLSCa string `json:"tls_ca,omitempty"` - // MongoDB auth mechanism. AuthenticationMechanism string `json:"authentication_mechanism,omitempty"` @@ -1193,12 +1190,6 @@ ListServicesOKBodyServicesItems0AgentsItems0MysqlOptions list services OK body s swagger:model ListServicesOKBodyServicesItems0AgentsItems0MysqlOptions */ type ListServicesOKBodyServicesItems0AgentsItems0MysqlOptions struct { - // TLS CA certificate. - TLSCa string `json:"tls_ca,omitempty"` - - // TLS certificate. - TLSCert string `json:"tls_cert,omitempty"` - // True if TLS key is set. IsTLSKeySet bool `json:"is_tls_key_set,omitempty"` } @@ -1236,12 +1227,6 @@ ListServicesOKBodyServicesItems0AgentsItems0PostgresqlOptions list services OK b swagger:model ListServicesOKBodyServicesItems0AgentsItems0PostgresqlOptions */ type ListServicesOKBodyServicesItems0AgentsItems0PostgresqlOptions struct { - // TLS CA certificate. - SslCa string `json:"ssl_ca,omitempty"` - - // TLS certificate. - SslCert string `json:"ssl_cert,omitempty"` - // True if TLS key is set. IsSslKeySet bool `json:"is_ssl_key_set,omitempty"` } diff --git a/api/managementpb/service/json/service.json b/api/managementpb/service/json/service.json index 7fabf9ef74..228ef456cc 100644 --- a/api/managementpb/service/json/service.json +++ b/api/managementpb/service/json/service.json @@ -220,23 +220,23 @@ "authentication_database": { "description": "MongoDB auth database.", "type": "string", - "x-order": 4 + "x-order": 3 }, "authentication_mechanism": { "description": "MongoDB auth mechanism.", "type": "string", - "x-order": 3 + "x-order": 2 }, "collections_limit": { "description": "MongoDB collections limit.", "type": "integer", "format": "int32", - "x-order": 6 + "x-order": 5 }, "enable_all_collectors": { "description": "True if all collectors are enabled.", "type": "boolean", - "x-order": 7 + "x-order": 6 }, "is_tls_certificate_key_file_password_set": { "description": "True if TLS certificate file password is set.", @@ -254,12 +254,7 @@ "items": { "type": "string" }, - "x-order": 5 - }, - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 2 + "x-order": 4 } }, "x-order": 16 @@ -270,17 +265,7 @@ "is_tls_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 - }, - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", "x-order": 0 - }, - "tls_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 } }, "x-order": 17 @@ -301,17 +286,7 @@ "is_ssl_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 - }, - "ssl_ca": { - "description": "TLS CA certificate.", - "type": "string", "x-order": 0 - }, - "ssl_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 } }, "x-order": 21 diff --git a/api/swagger/swagger-dev.json b/api/swagger/swagger-dev.json index 3f645c0418..62a2eac6a6 100644 --- a/api/swagger/swagger-dev.json +++ b/api/swagger/swagger-dev.json @@ -19311,20 +19311,15 @@ "type": "boolean", "x-order": 1 }, - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 2 - }, "authentication_mechanism": { "description": "MongoDB auth mechanism.", "type": "string", - "x-order": 3 + "x-order": 2 }, "authentication_database": { "description": "MongoDB auth database.", "type": "string", - "x-order": 4 + "x-order": 3 }, "stats_collections": { "description": "MongoDB stats collections.", @@ -19332,18 +19327,18 @@ "items": { "type": "string" }, - "x-order": 5 + "x-order": 4 }, "collections_limit": { "description": "MongoDB collections limit.", "type": "integer", "format": "int32", - "x-order": 6 + "x-order": 5 }, "enable_all_collectors": { "description": "True if all collectors are enabled.", "type": "boolean", - "x-order": 7 + "x-order": 6 } }, "x-order": 16 @@ -19351,20 +19346,10 @@ "mysql_options": { "type": "object", "properties": { - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 0 - }, - "tls_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 - }, "is_tls_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 + "x-order": 0 } }, "x-order": 17 @@ -19387,20 +19372,10 @@ "postgresql_options": { "type": "object", "properties": { - "ssl_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 0 - }, - "ssl_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 - }, "is_ssl_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 + "x-order": 0 } }, "x-order": 21 @@ -31301,20 +31276,15 @@ "type": "boolean", "x-order": 1 }, - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 2 - }, "authentication_mechanism": { "description": "MongoDB auth mechanism.", "type": "string", - "x-order": 3 + "x-order": 2 }, "authentication_database": { "description": "MongoDB auth database.", "type": "string", - "x-order": 4 + "x-order": 3 }, "stats_collections": { "description": "MongoDB stats collections.", @@ -31322,18 +31292,18 @@ "items": { "type": "string" }, - "x-order": 5 + "x-order": 4 }, "collections_limit": { "description": "MongoDB collections limit.", "type": "integer", "format": "int32", - "x-order": 6 + "x-order": 5 }, "enable_all_collectors": { "description": "True if all collectors are enabled.", "type": "boolean", - "x-order": 7 + "x-order": 6 } }, "x-order": 16 @@ -31341,20 +31311,10 @@ "mysql_options": { "type": "object", "properties": { - "tls_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 0 - }, - "tls_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 - }, "is_tls_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 + "x-order": 0 } }, "x-order": 17 @@ -31377,20 +31337,10 @@ "postgresql_options": { "type": "object", "properties": { - "ssl_ca": { - "description": "TLS CA certificate.", - "type": "string", - "x-order": 0 - }, - "ssl_cert": { - "description": "TLS certificate.", - "type": "string", - "x-order": 1 - }, "is_ssl_key_set": { "description": "True if TLS key is set.", "type": "boolean", - "x-order": 2 + "x-order": 0 } }, "x-order": 21 diff --git a/descriptor.bin b/descriptor.bin index 99e65eae4362064e7a66a6764a015cb7f6ff1954..5ff76289d92af5a784d36ffe2c7cff6313c038c4 100644 GIT binary patch delta 26716 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 OX=JgpG_v}$rT-T*C+yS! delta 25094 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 K&g9yU7XDv#KA(U9 diff --git a/managed/services/management/agent.go b/managed/services/management/agent.go index b501440cd5..0c7ff5992e 100644 --- a/managed/services/management/agent.go +++ b/managed/services/management/agent.go @@ -185,16 +185,12 @@ func (s *AgentService) agentToAPI(agent *models.Agent) (*agentv1beta1.UniversalA if agent.MySQLOptions != nil { ua.MysqlOptions = &agentv1beta1.UniversalAgent_MySQLOptions{ IsTlsKeySet: agent.MySQLOptions.TLSKey != "", - TlsCa: agent.MySQLOptions.TLSCa, - TlsCert: agent.MySQLOptions.TLSCert, } } if agent.PostgreSQLOptions != nil { ua.PostgresqlOptions = &agentv1beta1.UniversalAgent_PostgreSQLOptions{ IsSslKeySet: agent.PostgreSQLOptions.SSLKey != "", - SslCa: agent.PostgreSQLOptions.SSLCa, - SslCert: agent.PostgreSQLOptions.SSLCert, } } @@ -207,7 +203,6 @@ func (s *AgentService) agentToAPI(agent *models.Agent) (*agentv1beta1.UniversalA StatsCollections: agent.MongoDBOptions.StatsCollections, IsTlsCertificateKeySet: agent.MongoDBOptions.TLSCertificateKey != "", IsTlsCertificateKeyFilePasswordSet: agent.MongoDBOptions.TLSCertificateKeyFilePassword != "", - TlsCa: agent.MongoDBOptions.TLSCa, } } diff --git a/managed/services/management/agent_test.go b/managed/services/management/agent_test.go index d88718ba99..6a8c34e3ee 100644 --- a/managed/services/management/agent_test.go +++ b/managed/services/management/agent_test.go @@ -129,8 +129,6 @@ func TestAgentService(t *testing.T) { UpdatedAt: timestamppb.New(now), Username: "postgres", PostgresqlOptions: &agentv1beta1.UniversalAgent_PostgreSQLOptions{ - SslCa: "", - SslCert: "", IsSslKeySet: false, }, ServiceId: "/service_id/00000000-0000-4000-8000-000000000002", @@ -147,8 +145,6 @@ func TestAgentService(t *testing.T) { UpdatedAt: timestamppb.New(now), Username: "postgres", PostgresqlOptions: &agentv1beta1.UniversalAgent_PostgreSQLOptions{ - SslCa: "", - SslCert: "", IsSslKeySet: false, }, ServiceId: "/service_id/00000000-0000-4000-8000-000000000002",