From c14a5fcc6902f31fc249f2ed9bb8217ad62fb32f Mon Sep 17 00:00:00 2001
From: lassulus <git@lassul.us>
Date: Fri, 25 Jul 2025 14:09:07 +0200
Subject: [PATCH] refactor: move ssh/upload.py from cli to lib

Move the upload module to clan_lib to better organize SSH-related
utilities. Updated all imports across the codebase.
---
 pkgs/clan-cli/clan_cli/facts/upload.py                       | 2 +-
 pkgs/clan-cli/clan_cli/tests/test_upload_single_file.py      | 2 +-
 pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py | 2 +-
 pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py           | 2 +-
 pkgs/clan-cli/{clan_cli => clan_lib}/ssh/upload.py           | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/clan-cli/{clan_cli => clan_lib}/ssh/upload.py (100%)

diff --git a/pkgs/clan-cli/clan_cli/facts/upload.py b/pkgs/clan-cli/clan_cli/facts/upload.py
index 5f8880fbc..b6befeb53 100644
--- a/pkgs/clan-cli/clan_cli/facts/upload.py
+++ b/pkgs/clan-cli/clan_cli/facts/upload.py
@@ -6,9 +6,9 @@ from tempfile import TemporaryDirectory
 from clan_lib.flake import require_flake
 from clan_lib.machines.machines import Machine
 from clan_lib.ssh.host import Host
+from clan_lib.ssh.upload import upload
 
 from clan_cli.completions import add_dynamic_completer, complete_machines
-from clan_cli.ssh.upload import upload
 
 log = logging.getLogger(__name__)
 
diff --git a/pkgs/clan-cli/clan_cli/tests/test_upload_single_file.py b/pkgs/clan-cli/clan_cli/tests/test_upload_single_file.py
index a30a47bcd..7308af595 100644
--- a/pkgs/clan-cli/clan_cli/tests/test_upload_single_file.py
+++ b/pkgs/clan-cli/clan_cli/tests/test_upload_single_file.py
@@ -1,8 +1,8 @@
 from pathlib import Path
 
 import pytest
-from clan_cli.ssh.upload import upload
 from clan_lib.ssh.remote import Remote
+from clan_lib.ssh.upload import upload
 
 
 @pytest.mark.with_core
diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
index d32b8a225..fd6f6fe99 100644
--- a/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
+++ b/pkgs/clan-cli/clan_cli/vars/secret_modules/password_store.py
@@ -6,11 +6,11 @@ from collections.abc import Iterable
 from pathlib import Path
 from tempfile import TemporaryDirectory
 
-from clan_cli.ssh.upload import upload
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator, Var
 from clan_lib.flake import Flake
 from clan_lib.ssh.host import Host
+from clan_lib.ssh.upload import upload
 
 log = logging.getLogger(__name__)
 
diff --git a/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py b/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py
index 695d55c76..99c4aa71a 100644
--- a/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py
+++ b/pkgs/clan-cli/clan_cli/vars/secret_modules/sops.py
@@ -22,13 +22,13 @@ from clan_cli.secrets.secrets import (
     has_secret,
 )
 from clan_cli.secrets.sops import load_age_plugins
-from clan_cli.ssh.upload import upload
 from clan_cli.vars._types import StoreBase
 from clan_cli.vars.generate import Generator
 from clan_cli.vars.var import Var
 from clan_lib.errors import ClanError
 from clan_lib.flake import Flake
 from clan_lib.ssh.host import Host
+from clan_lib.ssh.upload import upload
 
 
 @dataclass
diff --git a/pkgs/clan-cli/clan_cli/ssh/upload.py b/pkgs/clan-cli/clan_lib/ssh/upload.py
similarity index 100%
rename from pkgs/clan-cli/clan_cli/ssh/upload.py
rename to pkgs/clan-cli/clan_lib/ssh/upload.py