tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CLI: Clean up 'pki save-cert' command and remove deprecated params 

This got obsoleted 4 years ago in a monster commit.
b297e8cfa7
This commit is contained in:
Michael Friedrich 2020-02-13 16:10:34 +01:00
parent e1557def94
commit 82e055bfb6
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/cli/pkisavecertcommand.cpp
View File

@ -26,16 +26,14 @@ void PKISaveCertCommand::InitParameters(boost::program_options::options_descript
boost::program_options::options_description& hiddenDesc) const boost::program_options::options_description& hiddenDesc) const
{ {
visibleDesc.add_options() visibleDesc.add_options()
("key", po::value<std::string>(), "Key file path (input), obsolete")
("cert", po::value<std::string>(), "Certificate file path (input), obsolete")
("trustedcert", po::value<std::string>(), "Trusted certificate file path (output)") ("trustedcert", po::value<std::string>(), "Trusted certificate file path (output)")
("host", po::value<std::string>(), "Icinga 2 host") ("host", po::value<std::string>(), "Parent Icinga instance to fetch the public TLS certificate from")
("port", po::value<std::string>()->default_value("5665"), "Icinga 2 port"); ("port", po::value<std::string>()->default_value("5665"), "Icinga 2 port");
} }
std::vector<String> PKISaveCertCommand::GetArgumentSuggestions(const String& argument, const String& word) const std::vector<String> PKISaveCertCommand::GetArgumentSuggestions(const String& argument, const String& word) const
{ {
if (argument == "key" || argument == "cert" || argument == "trustedcert") if (argument == "trustedcert")
return GetBashCompletionSuggestions("file", word); return GetBashCompletionSuggestions("file", word);
else if (argument == "host") else if (argument == "host")
return GetBashCompletionSuggestions("hostname", word); return GetBashCompletionSuggestions("hostname", word);
@ -66,7 +64,7 @@ int PKISaveCertCommand::Run(const boost::program_options::variables_map& vm, con
String port = vm["port"].as<std::string>(); String port = vm["port"].as<std::string>();
Log(LogInformation, "cli") Log(LogInformation, "cli")
<< "Retrieving X.509 certificate for '" << host << ":" << port << "'."; << "Retrieving TLS certificate for '" << host << ":" << port << "'.";
std::shared_ptr<X509> cert = PkiUtility::FetchCert(host, port); std::shared_ptr<X509> cert = PkiUtility::FetchCert(host, port);