Sync all CLI fixes from arcadia to stable 25-1 (#20221)

Author: pnv1

ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_describe.cpp

@@ -26,13 +26,13 @@ NYdb::NTopic::TTopicDescription TCommandWorkloadTopicDescribe::DescribeTopic(con
 
     if (!result.IsSuccess() || result.GetIssues()) {
         Cerr << "Error describe topic " << fullTopicName << "\n" << (NYdb::TStatus)result << "\n";
-        exit(EXIT_FAILURE);
+        throw yexception() << "Error describe topic " << fullTopicName;
     }
 
     NYdb::NTopic::TTopicDescription description = result.GetTopicDescription();
     if (description.GetTotalPartitionsCount() == 0) {
         Cerr << "Topic " << fullTopicName << " does not have partitions.\n";
-        exit(EXIT_FAILURE);
+        throw yexception() << "Topic " << fullTopicName << " does not have partitions.";
     }
 
     return description;

ydb/public/lib/ydb_cli/commands/topic_workload/topic_workload_reader.cpp

@@ -35,8 +35,7 @@ void TTopicWorkloadReader::ReaderLoop(TTopicWorkloadReaderParams& params, TInsta
 
         if (!std::any_of(consumers.begin(), consumers.end(), [consumerName](const auto& consumer) { return consumer.GetConsumerName() == consumerName; }))
         {
-            WRITE_LOG(params.Log, ELogPriority::TLOG_EMERG, TStringBuilder() << "Topic '" << params.TopicName << "' doesn't have a consumer '" << consumerName << "'. Run command 'workload init' with parameter '--consumers'.");
-            exit(EXIT_FAILURE);
+            throw yexception() << "Topic '" << params.TopicName << "' doesn't have a consumer '" << consumerName << "'. Run command 'workload init' with parameter '--consumers'.";
         }
         settings.ConsumerName(consumerName).AppendTopics(std::string{params.TopicName});
     } else {

ydb/public/lib/ydb_cli/commands/ydb_dynamic_config.h

@@ -102,7 +102,7 @@ class TCommandConfigVolatileDrop : public TYdbCommand {
     int Run(TConfig& config) override;
 
 private:
-    ui64 Version;
+    ui64 Version = 0;
     TString Cluster;
     THashSet<ui64> Ids;
     TString Dir;

ydb/public/lib/ydb_cli/commands/ydb_root_common.cpp

@@ -80,7 +80,7 @@ void TClientCommandRootCommon::ValidateSettings() {
     } else {
         return;
     }
-    exit(EXIT_FAILURE);
+    throw yexception() << "Invalid client settings";
 }
 
 void TClientCommandRootCommon::FillConfig(TConfig& config) {

ydb/public/lib/ydb_cli/common/command.cpp

@@ -12,6 +12,21 @@ bool TClientCommand::PROGRESS_REQUESTS = false; // display progress of long requ
 
 using namespace NUtils;
 
+namespace {
+    static bool HelpPrintedNeedToExit = false;
+    void PrintUsageAndThrowHelpPrinted(const NLastGetopt::TOptsParser* parser) {
+        parser->PrintUsage();
+        HelpPrintedNeedToExit = true;
+        throw THelpPrintedException();
+    }
+
+    void PrintSvnVersionAndThrowHelpPrinted(const NLastGetopt::TOptsParser* parser) {
+        parser->PrintUsage();
+        HelpPrintedNeedToExit = true;
+        throw THelpPrintedException();
+    }
+}
+
 TClientCommand::TClientCommand(
     const TString& name,
     const std::initializer_list<TString>& aliases,
@@ -22,11 +37,17 @@ TClientCommand::TClientCommand(
         , Description(description)
         , Visible(visible)
         , Parent(nullptr)
-        , Opts(NLastGetopt::TOpts::Default())
 {
-    HideOption("svnrevision");
-    Opts.AddHelpOption('h');
-    ChangeOptionDescription("help", "Print usage, -hh for detailed help");
+    Opts.Opts_.clear();
+    Opts.AddLongOption('V', "svnrevision", "print svn version")
+        .HasArg(NLastGetopt::EHasArg::NO_ARGUMENT)
+        .IfPresentDisableCompletion()
+        .Handler(&PrintSvnVersionAndThrowHelpPrinted)
+        .Hidden();
+    Opts.AddLongOption('h', "help", "Print usage, -hh for detailed help")
+        .HasArg(NLastGetopt::EHasArg::NO_ARGUMENT)
+        .IfPresentDisableCompletion()
+        .Handler(&PrintUsageAndThrowHelpPrinted);
     auto terminalWidth = GetTerminalWidth();
     size_t lineLength = terminalWidth ? *terminalWidth : Max<size_t>();
     Opts.SetWrap(Max(Opts.Wrap_, static_cast<ui32>(lineLength)));
@@ -157,9 +178,23 @@ TClientCommand::TOptsParseOneLevelResult::TOptsParseOneLevelResult(TConfig& conf
         }
         ++_argc;
     }
+    if (_argc > config.ArgC) {
+        // This is possible if the last option should have an argument, but it is not provided
+        _argc = config.ArgC;
+    }
     Init(config.Opts, _argc, const_cast<const char**>(config.ArgV));
 }
 
+void TClientCommand::TCommandOptsParseResult::HandleError() const {
+    if (HelpPrintedNeedToExit) {
+        throw THelpPrintedException();
+    }
+    if (ThrowOnParseError) {
+        throw;
+    }
+    NLastGetopt::TOptsParseResult::HandleError();
+}
+
 void TClientCommand::CheckForExecutableOptions(TConfig& config) {
     int argc = 1;
 
@@ -221,8 +256,13 @@ int TClientCommand::Run(TConfig& config) {
 }
 
 int TClientCommand::Process(TConfig& config) {
-    Prepare(config);
-    return ValidateAndRun(config);
+    try {
+        Prepare(config);
+        return ValidateAndRun(config);
+    } catch (const THelpPrintedException& e) {
+        // Help was printed on demand, return EXIT_SUCCESS
+        return EXIT_SUCCESS;
+    }
 }
 
 void TClientCommand::SaveParseResult(TConfig& config) {

ydb/public/lib/ydb_cli/common/command.h

@@ -336,12 +336,7 @@ class TClientCommand {
         }
         virtual ~TCommandOptsParseResult() = default;
 
-        void HandleError() const override {
-            if (ThrowOnParseError) {
-                throw;
-            }
-            NLastGetopt::TOptsParseResult::HandleError();
-        }
+        void HandleError() const override;
 
     protected:
         TCommandOptsParseResult(bool throwOnParseError)

ydb/public/lib/ydb_cli/common/common.cpp

@@ -161,7 +161,7 @@ TString InputPassword() {
 #elif defined(_win_)
             SetConsoleMode(hStdin, mode);
 #endif
-            exit(EXIT_FAILURE);
+            throw yexception() << "Input interrupted";
         } else {
             Cerr << '*';
             password.push_back(c);

ydb/public/lib/ydb_cli/common/common.h

@@ -29,6 +29,9 @@ class TMisuseException : public yexception {};
 // Print command help
 class TMisuseWithHelpException : public TMisuseException {};
 
+// Help was printed, just need to return EXIT_SUCCESS
+class THelpPrintedException : public yexception {};
+
 class TProfileConfig {
 public:
     TProfileConfig(const TString& profileName);

ydb/public/lib/ydb_cli/common/profile_manager.cpp

@@ -164,8 +164,7 @@ class TProfileManager : public IProfileManager {
             if (TFileStat(configFilePath).Mode & (S_IRGRP | S_IROTH)) {
                 int chmodResult = Chmod(configFilePath.GetPath().c_str(), S_IRUSR | S_IWUSR);
                 if (chmodResult) {
-                    Cerr << "Couldn't change permissions for the file \"" << configFilePath.GetPath() << "\"" << Endl;
-                    exit(chmodResult);
+                    throw yexception() << "Couldn't change permissions for the file \"" << configFilePath.GetPath() << "\"";
                 }
             }
             TFileOutput resultConfigFile(TFile(configFilePath, CreateAlways | WrOnly | AWUser | ARUser));