From bcd09af2d60ac2a9f87cbdfe79814348af1dd7ef Mon Sep 17 00:00:00 2001 From: StarFleetCPTN Date: Tue, 8 Apr 2025 20:33:32 -0700 Subject: [PATCH] fix: Consolidate Hetzner support under SFTP provider - Updated the rclone connection logic to treat Hetzner as an SFTP provider, simplifying the configuration process. - Removed redundant case handling for Hetzner, streamlining the code and enhancing maintainability. --- internal/rclone_service/rclone_service.go | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/internal/rclone_service/rclone_service.go b/internal/rclone_service/rclone_service.go index 7796936..753a071 100644 --- a/internal/rclone_service/rclone_service.go +++ b/internal/rclone_service/rclone_service.go @@ -90,6 +90,10 @@ func TestRcloneConnection(config db.TransferConfig, providerType string, dbInsta rclonePath = "rclone" } + if provider == "hetzner" { + provider = "sftp" + } + createArgs := []string{ "config", "create", remoteName, provider, "--config", tempConfigPath, @@ -105,7 +109,7 @@ func TestRcloneConnection(config db.TransferConfig, providerType string, dbInsta var createCmd *exec.Cmd switch provider { - case "sftp": + case "sftp", "hetzner": createArgs = append(createArgs, "host", host, "user", user) if port != 0 { createArgs = append(createArgs, "port", fmt.Sprintf("%d", port)) @@ -116,17 +120,6 @@ func TestRcloneConnection(config db.TransferConfig, providerType string, dbInsta if keyFile != "" { createArgs = append(createArgs, "key_file", keyFile) } - case "hetzner": - createArgs = append(createArgs, "host", host, "user", user, "pass", pass, "key_file", keyFile) - if port != 0 { - createArgs = append(createArgs, "port", fmt.Sprintf("%d", port)) - } - if pass != "" { - createArgs = append(createArgs, "pass", pass) - } - if keyFile != "" { - createArgs = append(createArgs, "key_file", keyFile) - } case "s3": createArgs = append(createArgs, "provider", "AWS", "env_auth", "false") if accessKey != "" {