Skip to content

Commit

Permalink
PMM-12660 do not output certs when listing agents (#2604)
Browse files Browse the repository at this point in the history 
* PMM-12660 do not leak certs when listing agents

* PMM-12660 cleanup & put back AwsAccessKey
  • Loading branch information
@ademidoff
ademidoff authored Nov 14, 2023
1 parent 9fa78dd commit 171ccf9
Show file tree
Hide file tree
Showing 11 changed files with 115 additions and 320 deletions.
223 changes: 86 additions & 137 deletions api/managementpb/agent/agent.pb.go
View file

Large diffs are not rendered by default.

10 changes: 0 additions & 10 deletions api/managementpb/agent/agent.pb.validate.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 5 additions & 10 deletions api/managementpb/agent/agent.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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.
Expand All @@ -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;
}
Expand Down
35 changes: 5 additions & 30 deletions api/managementpb/agent/json/agent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
15 changes: 0 additions & 15 deletions api/managementpb/agent/json/client/agent/list_agents_responses.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 0 additions & 15 deletions api/managementpb/service/json/client/mgmt_service/list_services_responses.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 5 additions & 30 deletions api/managementpb/service/json/service.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.",
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down
Loading

0 comments on commit 171ccf9

Please sign in to comment.