Fixed issues

Author: GrigoriyPA

ydb/tests/tools/fqrun/fqrun.cpp

@@ -200,7 +200,7 @@ class TMain : public TMainBase {
                 }
             });
 
-        options.AddLongOption("cnacel-on-file-finish", "Cancel emulate YDS topics when topic file finished")
+        options.AddLongOption("cancel-on-file-finish", "Cancel emulate YDS topics when topic file finished")
             .RequiredArgument("topic")
             .Handler1([this](const NLastGetopt::TOptsParser* option) {
                 TopicsSettings[option->CurVal()].CancelOnFileFinish = true;

ydb/tests/tools/fqrun/src/ya.make

@@ -9,7 +9,6 @@ SRCS(
 PEERDIR(
     library/cpp/colorizer
     library/cpp/testing/unittest
-    util
     ydb/core/fq/libs/config/protos
     ydb/core/fq/libs/control_plane_proxy/events
     ydb/core/fq/libs/init

ydb/tests/tools/fqrun/ya.make

@@ -14,7 +14,6 @@ PEERDIR(
     library/cpp/colorizer
     library/cpp/getopt
     library/cpp/lfalloc/alloc_profiler
-    util
     ydb/core/blob_depot
     ydb/library/yql/providers/pq/gateway/dummy
     ydb/tests/tools/fqrun/src

ydb/tests/tools/kqprun/runlib/utils.h

@@ -47,14 +47,11 @@ class TChoices {
 
         const auto it = ChoicesMap.find(choice);
         if (it == ChoicesMap.end()) {
-            auto error = yexception() << "Value '" << choice << "' is not allowed " << (OptionName ? TStringBuilder() << "for option " << OptionName : TStringBuilder()) << ", available variants:\n";
-            for (auto it = ChoicesMap.begin(); it != ChoicesMap.end();) {
-                error << choice;
-                if (++it != ChoicesMap.end()) {
-                    error << ", ";
-                }
+            auto error = yexception() << "Value '" << choice << "' is not allowed " << (OptionName ? TStringBuilder() << "for option " << OptionName : TStringBuilder()) << ", available variants:";
+            for (const auto& [value, _] : ChoicesMap) {
+                error << " " << value;
             }
-            ythrow error;
+            throw error;
         }
         return it->second;
     }

ydb/tests/tools/kqprun/runlib/ya.make

@@ -9,7 +9,6 @@ PEERDIR(
     library/cpp/colorizer
     library/cpp/getopt
     library/cpp/json
-    util
     ydb/core/base
     ydb/core/blob_depot
     ydb/core/fq/libs/compute/common