Fix ydb cli adjust path usage (#14404)

6 files changed, 33 insertions, 14 deletions

diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_export.cpp b/ydb/public/lib/ydb_cli/commands/ydb_service_export.cpp
index 4e7f78291c..411caef9d1 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_service_export.cpp
+++ b/ydb/public/lib/ydb_cli/commands/ydb_service_export.cpp
@@ -157,7 +157,10 @@ void TCommandExportToYt::Parse(TConfig& config) {
     if (Items.empty()) {
         throw TMisuseException() << "At least one item should be provided";
     }
+}
 
+void TCommandExportToYt::ExtractParams(TConfig& config) {
+    TClientCommand::ExtractParams(config);
     for (auto& item : Items) {
         NConsoleClient::AdjustPath(item.Source, config);
 
@@ -317,6 +320,10 @@ void TCommandExportToS3::Parse(TConfig& config) {
     if (Items.empty()) {
         throw TMisuseException() << "At least one item should be provided";
     }
+}
+
+void TCommandExportToS3::ExtractParams(TConfig& config) {
+    TClientCommand::ExtractParams(config);
 
     for (auto& item : Items) {
         NConsoleClient::AdjustPath(item.Source, config);
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_export.h b/ydb/public/lib/ydb_cli/commands/ydb_service_export.h
index 3bfab34a56..b8b286722f 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_service_export.h
+++ b/ydb/public/lib/ydb_cli/commands/ydb_service_export.h
@@ -27,6 +27,7 @@ public:
     TCommandExportToYt();
     virtual void Config(TConfig& config) override;
     virtual void Parse(TConfig& config) override;
+    virtual void ExtractParams(TConfig& config) override;
     virtual int Run(TConfig& config) override;
 
 private:
@@ -53,6 +54,7 @@ public:
     TCommandExportToS3();
     virtual void Config(TConfig& config) override;
     virtual void Parse(TConfig& config) override;
+    virtual void ExtractParams(TConfig& config) override;
     virtual int Run(TConfig& config) override;
 
 private:
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_import.cpp b/ydb/public/lib/ydb_cli/commands/ydb_service_import.cpp
index 1164d823e3..60abdc7229 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_service_import.cpp
+++ b/ydb/public/lib/ydb_cli/commands/ydb_service_import.cpp
@@ -126,6 +126,10 @@ void TCommandImportFromS3::Parse(TConfig& config) {
         throw TMisuseException() << "At least one item should be provided";
     }
 
+}
+
+void TCommandImportFromS3::ExtractParams(TConfig& config) {
+    TClientCommand::ExtractParams(config);
     for (auto& item : Items) {
         NConsoleClient::AdjustPath(item.Destination, config);
     }
@@ -246,7 +250,6 @@ void TCommandImportFileBase::Config(TConfig& config) {
 
 void TCommandImportFileBase::Parse(TConfig& config) {
     TYdbCommand::Parse(config);
-    AdjustPath(config);
 
     if (auto bytesPerRequest = NYdb::SizeFromString(BytesPerRequest)) {
         if (bytesPerRequest > TImportFileSettings::MaxBytesPerRequest) {
@@ -275,6 +278,11 @@ void TCommandImportFileBase::Parse(TConfig& config) {
     }
 }
 
+void TCommandImportFileBase::ExtractParams(TConfig& config) {
+    TClientCommand::ExtractParams(config);
+    AdjustPath(config);
+}
+
 /// Import CSV
 
 void TCommandImportFromCsv::Config(TConfig& config) {
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_service_import.h b/ydb/public/lib/ydb_cli/commands/ydb_service_import.h
index 27da29f858..fe95c281fe 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_service_import.h
+++ b/ydb/public/lib/ydb_cli/commands/ydb_service_import.h
@@ -22,6 +22,7 @@ public:
     TCommandImportFromS3();
     void Config(TConfig& config) override;
     void Parse(TConfig& config) override;
+    void ExtractParams(TConfig& config) override;
     int Run(TConfig& config) override;
 
 private:
@@ -56,6 +57,7 @@ public:
         Args[0] = "<input files...>";
     }
     void Config(TConfig& config) override;
+    void ExtractParams(TConfig& config) override;
     void Parse(TConfig& config) override;
 
 protected:
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp b/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp
index 4d06dcebb8..d079cfbccb 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp
+++ b/ydb/public/lib/ydb_cli/commands/ydb_tools.cpp
@@ -84,10 +84,6 @@ void TCommandDump::Config(TConfig& config) {
         .DefaultValue(defaults.Ordered_).StoreTrue(&Ordered);
 }
 
-void TCommandDump::Parse(TConfig& config) {
-    TClientCommand::Parse(config);
-}
-
 void TCommandDump::ExtractParams(TConfig& config) {
     TClientCommand::ExtractParams(config);
     AdjustPath(config);
@@ -199,8 +195,8 @@ void TCommandRestore::Config(TConfig& config) {
     config.Opts->MutuallyExclusive("import-data", "bulk-upsert");
 }
 
-void TCommandRestore::Parse(TConfig& config) {
-    TClientCommand::Parse(config);
+void TCommandRestore::ExtractParams(TConfig& config) {
+    TClientCommand::ExtractParams(config);
     AdjustPath(config);
 }
 
@@ -283,6 +279,10 @@ void TCommandCopy::Parse(TConfig& config) {
     if (Items.empty()) {
         throw TMisuseException() << "At least one item should be provided";
     }
+}
+
+void TCommandCopy::ExtractParams(TConfig& config) {
+    TClientCommand::ExtractParams(config);
 
     for (auto& item : Items) {
         NConsoleClient::AdjustPath(item.Source, config);
@@ -373,6 +373,10 @@ void TCommandRename::Parse(TConfig& config) {
     if (Items.empty()) {
         throw TMisuseException() << "At least one item should be provided";
     }
+}
+
+void TCommandRename::ExtractParams(TConfig& config) {
+    TClientCommand::ExtractParams(config);
 
     for (auto& item : Items) {
         NConsoleClient::AdjustPath(item.Source, config);
@@ -411,10 +415,6 @@ void TCommandPgConvert::Config(TConfig& config) {
     config.Opts->AddLongOption("ignore-unsupported", "Comment unsupported statements in result dump file if specified.").StoreTrue(&IgnoreUnsupported);
 }
 
-void TCommandPgConvert::Parse(TConfig& config) {
-    TToolsCommand::Parse(config);
-}
-
 int TCommandPgConvert::Run(TConfig& config) {
     Y_UNUSED(config);
     TPgDumpParser parser(Cout, IgnoreUnsupported);
diff --git a/ydb/public/lib/ydb_cli/commands/ydb_tools.h b/ydb/public/lib/ydb_cli/commands/ydb_tools.h
index 6c952d7e65..6c62fd30d2 100644
--- a/ydb/public/lib/ydb_cli/commands/ydb_tools.h
+++ b/ydb/public/lib/ydb_cli/commands/ydb_tools.h
@@ -32,7 +32,6 @@ class TCommandDump : public TToolsCommand, public TCommandWithPath {
 public:
     TCommandDump();
     virtual void Config(TConfig& config) override;
-    virtual void Parse(TConfig& config) override;
     virtual void ExtractParams(TConfig& config) override;
     virtual int Run(TConfig& config) override;
 
@@ -51,7 +50,7 @@ class TCommandRestore : public TToolsCommand, public TCommandWithPath {
 public:
     TCommandRestore();
     virtual void Config(TConfig& config) override;
-    virtual void Parse(TConfig& config) override;
+    virtual void ExtractParams(TConfig& config) override;
     virtual int Run(TConfig& config) override;
 
 private:
@@ -77,6 +76,7 @@ public:
     TCommandCopy();
     virtual void Config(TConfig& config) override;
     virtual void Parse(TConfig& config) override;
+    virtual void ExtractParams(TConfig& config) override;
     virtual int Run(TConfig& config) override;
 
 private:
@@ -95,6 +95,7 @@ public:
     TCommandRename();
     virtual void Config(TConfig& config) override;
     virtual void Parse(TConfig& config) override;
+    virtual void ExtractParams(TConfig& config) override;
     virtual int Run(TConfig& config) override;
 
 private:
@@ -113,7 +114,6 @@ class TCommandPgConvert : public TToolsCommand {
 public:
     TCommandPgConvert();
     virtual void Config(TConfig& config) override;
-    virtual void Parse(TConfig& config) override;
     virtual int Run(TConfig& config) override;
 
 private: