feat: add required backupName parameter to dump/restore commands

Author: Slach

config.go

@@ -14,4 +14,5 @@ type Config struct {
 	StorageConfig   map[string]string
 	CompressFormat  string
 	CompressLevel   int
+	BackupName      string
 }

dumper.go

@@ -124,7 +124,7 @@ func (d *Dumper) dumpSchema(table string) error {
 		return err
 	}
 
-	filename := fmt.Sprintf("%s/%s/%s.schema.sql", d.config.StorageConfig["path"], dbName, tableName)
+	filename := fmt.Sprintf("%s/%s/%s/%s.schema.sql", d.config.StorageConfig["path"], d.config.BackupName, dbName, tableName)
 	return d.storage.Upload(filename, bytes.NewReader(resp), d.config.CompressFormat, d.config.CompressLevel)
 }
 
@@ -142,6 +142,6 @@ func (d *Dumper) dumpData(table string) error {
 	}
 	defer body.Close()
 
-	filename := fmt.Sprintf("%s/%s/%s.data.sql", d.config.StorageConfig["path"], dbName, tableName)
+	filename := fmt.Sprintf("%s/%s/%s/%s.data.sql", d.config.StorageConfig["path"], d.config.BackupName, dbName, tableName)
 	return d.storage.Upload(filename, body, d.config.CompressFormat, d.config.CompressLevel)
 }

e2e_test.go

@@ -104,7 +104,7 @@ func testS3Storage(ctx context.Context, t *testing.T, clickhouseContainer testco
 	})
 }
 
-func runMainTestScenario(ctx context.Context, t *testing.T, clickhouseContainer testcontainers.Container, storageConfig map[string]string, testCase string) {
+func runMainTestScenario(ctx context.Context, t *testing.T, clickhouseContainer testcontainers.Container, storageConfig map[string]string, testCase string, backupName string) {
 	// Clear any existing tables first
 	require.NoError(t, clearTestTables(ctx, t, clickhouseContainer))
 
@@ -258,6 +258,7 @@ func runMainTestScenario(ctx context.Context, t *testing.T, clickhouseContainer
 
 	// Create test config
 	config := &Config{
+		BackupName:     backupName,
 		Host:            host,
 		Port:            port.Int(),
 		User:            "default",

main.go

@@ -149,16 +149,16 @@ func main() {
 		},
 		Commands: []*cli.Command{
 			{
-				Name:   "dump",
-				Usage:  "Dump ClickHouse tables schema and data to remote storage",
-				Action: RunDumper,
-				// Add dump-specific flags here if preferred over global
+				Name:      "dump",
+				Usage:     "Dump ClickHouse tables schema and data to remote storage",
+				Action:    RunDumper,
+				ArgsUsage: "BACKUP_NAME",
 			},
 			{
-				Name:   "restore",
-				Usage:  "Restore ClickHouse tables from remote storage",
-				Action: RunRestorer,
-				// Add restore-specific flags here if preferred over global
+				Name:      "restore",
+				Usage:     "Restore ClickHouse tables from remote storage",
+				Action:    RunRestorer,
+				ArgsUsage: "BACKUP_NAME",
 			},
 		},
 	}
@@ -174,10 +174,16 @@ func main() {
 }
 
 func RunDumper(c *cli.Context) error {
+	if c.Args().Len() == 0 {
+		return fmt.Errorf("backup name is required as argument")
+	}
+	backupName := c.Args().First()
+
 	config, err := getConfig(c)
 	if err != nil {
 		return fmt.Errorf("configuration error: %w", err)
 	}
+	config.BackupName = backupName
 	dumper, err := NewDumper(config)
 	if err != nil {
 		return fmt.Errorf("failed to initialize dumper: %w", err)
@@ -193,10 +199,16 @@ func RunDumper(c *cli.Context) error {
 }
 
 func RunRestorer(c *cli.Context) error {
+	if c.Args().Len() == 0 {
+		return fmt.Errorf("backup name is required as argument")
+	}
+	backupName := c.Args().First()
+
 	config, err := getConfig(c)
 	if err != nil {
 		return fmt.Errorf("configuration error: %w", err)
 	}
+	config.BackupName = backupName
 	restorer, err := NewRestorer(config)
 	if err != nil {
 		return fmt.Errorf("failed to initialize restorer: %w", err)

restorer.go

@@ -78,7 +78,7 @@ func (r *Restorer) Restore() error {
 	}()
 
 	// --- Restore Schema ---
-	schemaPrefix := fmt.Sprintf("%s/", r.config.StorageConfig["path"])
+	schemaPrefix := fmt.Sprintf("%s/%s/", r.config.StorageConfig["path"], r.config.BackupName)
 	schemaSuffix := ".schema.sql"
 	log.Printf("Listing schema files with prefix: %s*%s", schemaPrefix, schemaSuffix)