fujin-cli 0.9.0__tar.gz → 0.10.0__tar.gz

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/CHANGELOG.md

@@ -4,6 +4,26 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.10.0] - 2024-11-24
+
+### 🚀 Features
+
+- Add doppler support to secrets
+
+## [0.9.1] - 2024-11-23
+
+### 🚜 Refactor
+
+- Drop configurable proxy manager
+
+### 📚 Documentation
+
+- Add links to template systemd service files
+
+### ⚡ Performance
+
+- Run systemd commands concurrently using gevent
+
 ## [0.9.0] - 2024-11-23
 
 ### 🚀 Features

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fujin-cli
-Version: 0.9.0
+Version: 0.10.0
 Summary: Get your project up and running in a few minutes on your own vps.
 Project-URL: Documentation, https://github.com/falcopackages/fujin#readme
 Project-URL: Issues, https://github.com/falcopackages/fujin/issues

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/docs/commands/server.rst

@@ -4,13 +4,3 @@ server
 .. cappa:: fujin.commands.up.Server
    :style: terminal
    :terminal-width: 0
-
-
-bootstrap
----------
-
-exec
-----
-
-create-user
------------

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/docs/index.rst

@@ -17,7 +17,6 @@ fujin documentation
 
 .. toctree::
    :maxdepth: 2
-   :caption: Contents:
    :hidden:
 
    installation

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/docs/installation.rst

@@ -20,4 +20,4 @@ Here is an example of how to install the binary on x86 macOS:
 
 .. note::
 
-    If you install ``fujin`` via the GitHub release, you can keep it up to date with ``fujin self update``.
+    If you install ``fujin`` using the binary file, you can keep it up to date with ``fujin self update``.

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/docs/secrets.rst

@@ -47,4 +47,26 @@ Update your ``fujin.toml`` file with the following configuration:
 
     DEBUG=False  
     AWS_ACCESS_KEY_ID=$op://personal/aws-access-key-id/password  
-    AWS_SECRET_ACCESS_KEY=$op://personal/aws-secret-access-key/password  
+    AWS_SECRET_ACCESS_KEY=$op://personal/aws-secret-access-key/password
+
+Doppler
+-------
+
+Download and install the `Doppler CLI <https://docs.doppler.com/docs/cli>`_, and sign in to your account.
+Move to your project root directory and run ``doppler setup`` to configure your project.
+
+Update your ``fujin.toml`` file with the following configuration:
+
+.. code-block:: toml
+
+    [secrets]
+    adapter = "doppler"
+
+.. code-block:: text
+    :caption: Example of an environment file with doppler secrets
+
+    DEBUG=False
+    AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
+    AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
+
+

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/pyproject.toml

@@ -7,7 +7,7 @@ requires = [
 
 [project]
 name = "fujin-cli"
-version = "0.9.0"
+version = "0.10.0"
 description = "Get your project up and running in a few minutes on your own vps."
 readme = "README.md"
 keywords = [
@@ -154,7 +154,7 @@ lint.isort.required-imports = [
 lint.pyupgrade.keep-runtime-typing = true
 
 [tool.bumpversion]
-current_version = "0.9.0"
+current_version = "0.10.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = [
   "{major}.{minor}.{patch}",

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/src/fujin/commands/_base.py

@@ -10,8 +10,8 @@ from fujin.connection import Connection
 from fujin.connection import host_connection
 from fujin.errors import ImproperlyConfiguredError
 from fujin.hooks import HookManager
-from fujin.process_managers import ProcessManager
 from fujin.proxies import WebProxy
+from fujin.systemd import ProcessManager
 
 
 @dataclass
@@ -66,15 +66,5 @@ class BaseCommand:
     def create_web_proxy(self, conn: Connection) -> WebProxy:
         return self.web_proxy_class.create(conn=conn, config=self.config)
 
-    @cached_property
-    def process_manager_class(self) -> type[ProcessManager]:
-        module = importlib.import_module(self.config.process_manager)
-        try:
-            return getattr(module, "ProcessManager")
-        except KeyError as e:
-            raise ImproperlyConfiguredError(
-                f"Missing ProcessManager class in {self.config.process_manager}"
-            ) from e
-
     def create_process_manager(self, conn: Connection) -> ProcessManager:
-        return self.process_manager_class.create(conn=conn, config=self.config)
+        return ProcessManager.create(conn=conn, config=self.config)

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/src/fujin/commands/prune.py

@@ -8,7 +8,7 @@ from fujin.commands import BaseCommand
 
 
 @cappa.command(
-    help="Prune old version artifacts, keeping only the specified number of recent versions"
+    help="Prune old artifacts, keeping only the specified number of recent versions"
 )
 @dataclass
 class Prune(BaseCommand):

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/src/fujin/config.py

@@ -55,6 +55,7 @@ The secret management service to use. Available options:
 
 - ``bitwarden``
 - ``1password``
+- ``doppler``
 
 password_env
 ~~~~~~~~~~~~
@@ -116,6 +117,11 @@ Example:
 .. note::
 
     Commands are relative to your ``app_dir``. When generating systemd service files, the full path is automatically constructed.
+    Here are the templates for the service files:
+
+    - `web.service <https://github.com/falcopackages/fujin/blob/main/src/fujin/templates/web.service>`_
+    - `web.socket <https://github.com/falcopackages/fujin/blob/main/src/fujin/templates/web.socket>`_
+    - `simple.service <https://github.com/falcopackages/fujin/blob/main/src/fujin/templates/simple.service>`_ (for all additional processes)
 
 Host Configuration
 -------------------
@@ -216,6 +222,7 @@ class InstallationMode(StrEnum):
 class SecretAdapter(StrEnum):
     BITWARDEN = "bitwarden"
     ONE_PASSWORD = "1password"
+    DOPPLER = "doppler"
 
 
 class SecretConfig(msgspec.Struct):
@@ -235,7 +242,6 @@ class Config(msgspec.Struct, kw_only=True):
     aliases: dict[str, str] = msgspec.field(default_factory=dict)
     host: HostConfig
     processes: dict[str, str] = msgspec.field(default_factory=dict)
-    process_manager: str = "fujin.process_managers.systemd"
     webserver: Webserver
     requirements: str | None = None
     hooks: HooksDict = msgspec.field(default_factory=dict)

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/src/fujin/proxies/caddy.py

@@ -166,7 +166,8 @@ class WebProxy(msgspec.Struct):
         new_routes = [r for r in existing_routes if r.get("group") != self.app_name]
         current_config["routes"] = new_routes
         self.conn.run(
-            f"curl localhost:2019/config/apps/http/servers/srv0 -H 'Content-Type: application/json' -d '{json.dumps(current_config)}'"
+            f"curl localhost:2019/config/apps/http/servers/srv0 -H 'Content-Type: application/json' -d '{json.dumps(current_config)}'",
+            hide="out",
         )
 
     def start(self) -> None:

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/src/fujin/secrets/__init__.py

@@ -10,6 +10,7 @@ from dotenv import dotenv_values
 from fujin.config import SecretAdapter
 from fujin.config import SecretConfig
 from .bitwarden import bitwarden
+from .dopppler import doppler
 from .onepassword import one_password
 
 secret_reader = Callable[[str], str]
@@ -18,6 +19,7 @@ secret_adapter_context = Callable[[SecretConfig], ContextManager[secret_reader]]
 adapter_to_context: dict[SecretAdapter, secret_adapter_context] = {
     SecretAdapter.BITWARDEN: bitwarden,
     SecretAdapter.ONE_PASSWORD: one_password,
+    SecretAdapter.DOPPLER: doppler,
 }
 
 

fujin_cli-0.10.0/src/fujin/secrets/dopppler.py

@@ -0,0 +1,31 @@
+from __future__ import annotations
+
+import subprocess
+from contextlib import contextmanager
+from typing import Generator
+from typing import TYPE_CHECKING
+
+import cappa
+
+from fujin.config import SecretConfig
+
+if TYPE_CHECKING:
+    from . import secret_reader
+
+
+@contextmanager
+def doppler(_: SecretConfig) -> Generator[secret_reader, None, None]:
+    def read_secret(name: str) -> str:
+        result = subprocess.run(
+            ["doppler", "run", "--command", f"echo ${name}"],
+            capture_output=True,
+            text=True,
+        )
+        if result.returncode != 0:
+            raise cappa.Exit(result.stderr)
+        return result.stdout.strip()
+
+    try:
+        yield read_secret
+    finally:
+        pass

{fujin_cli-0.9.0/src/fujin/process_managers → fujin_cli-0.10.0/src/fujin}/systemd.py

@@ -4,6 +4,8 @@ import importlib.util
 from dataclasses import dataclass
 from pathlib import Path
 
+import gevent
+
 from fujin.config import Config
 from fujin.connection import Connection
 
@@ -54,11 +56,23 @@ class ProcessManager:
                 hide="out",
             )
 
+        threads = []
         for name in self.processes:
             if name == "web" and self.is_using_unix_socket:
-                self.run_pty(f"sudo systemctl enable --now {self.app_name}.socket")
+                threads.append(
+                    gevent.spawn(
+                        self.run_pty,
+                        f"sudo systemctl enable --now {self.app_name}.socket",
+                    )
+                )
             else:
-                self.run_pty(f"sudo systemctl enable {self.get_service_name(name)}")
+                threads.append(
+                    gevent.spawn(
+                        self.run_pty,
+                        f"sudo systemctl enable {self.get_service_name(name)}",
+                    )
+                )
+        gevent.joinall(threads)
 
     def get_configuration_files(
         self, ignore_local: bool = False
@@ -105,47 +119,68 @@ class ProcessManager:
 
     def uninstall_services(self) -> None:
         self.stop_services()
-        for name in self.service_names:
-            self.run_pty(f"sudo systemctl disable {name}", warn=True)
-            self.run_pty(f"sudo rm /etc/systemd/system/{name}", warn=True)
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl disable {name}", warn=True)
+            for name in self.service_names
+        ]
+        gevent.joinall(threads)
+        files_to_delete = [f"/etc/systemd/system/{name}" for name in self.service_names]
+        self.run_pty(f"sudo rm {' '.join(files_to_delete)}", warn=True)
 
     def start_services(self, *names) -> None:
         names = names or self.service_names
-        for name in names:
-            if name in self.service_names:
-                self.run_pty(f"sudo systemctl start {name}")
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl start {name}")
+            for name in names
+            if name in self.service_names
+        ]
+        gevent.joinall(threads)
 
     def restart_services(self, *names) -> None:
         names = names or self.service_names
-        for name in names:
-            if name in self.service_names:
-                self.run_pty(f"sudo systemctl restart {name}")
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl restart {name}")
+            for name in names
+            if name in self.service_names
+        ]
+        gevent.joinall(threads)
 
     def stop_services(self, *names) -> None:
         names = names or self.service_names
-        for name in names:
-            if name in self.service_names:
-                self.run_pty(f"sudo systemctl stop {name}")
+        threads = [
+            gevent.spawn(self.run_pty, f"sudo systemctl stop {name}")
+            for name in names
+            if name in self.service_names
+        ]
+        gevent.joinall(threads)
 
     def is_enabled(self, *names) -> dict[str, bool]:
         names = names or self.service_names
-        return {
-            name: self.run_pty(
-                f"sudo systemctl is-enabled {name}", warn=True, hide=True
-            ).stdout.strip()
-            == "enabled"
+        threads = {
+            name: gevent.spawn(
+                self.run_pty, f"sudo systemctl is-enabled {name}", warn=True, hide=True
+            )
             for name in names
         }
+        gevent.joinall(threads.values())
+        return {
+            name: thread.value.stdout.strip() == "enabled"
+            for name, thread in threads.items()
+        }
 
     def is_active(self, *names) -> dict[str, bool]:
         names = names or self.service_names
-        return {
-            name: self.run_pty(
-                f"sudo systemctl is-active {name}", warn=True, hide=True
-            ).stdout.strip()
-            == "active"
+        threads = {
+            name: gevent.spawn(
+                self.run_pty, f"sudo systemctl is-active {name}", warn=True, hide=True
+            )
             for name in names
         }
+        gevent.joinall(threads.values())
+        return {
+            name: thread.value.stdout.strip() == "active"
+            for name, thread in threads.items()
+        }
 
     def service_logs(self, name: str, follow: bool = False):
         # TODO: add more options here

{fujin_cli-0.9.0 → fujin_cli-0.10.0}/uv.lock

@@ -477,7 +477,7 @@ wheels = [
 
 [[package]]
 name = "fujin-cli"
-version = "0.9.0"
+version = "0.10.0"
 source = { editable = "." }
 dependencies = [
     { name = "cappa" },

fujin_cli-0.9.0/src/fujin/process_managers/__init__.py

@@ -1,40 +0,0 @@
-from __future__ import annotations
-
-from typing import Protocol
-from typing import TYPE_CHECKING
-
-from fujin.connection import Connection
-
-if TYPE_CHECKING:
-    from fujin.config import Config
-
-
-class ProcessManager(Protocol):
-    service_names: list[str]
-
-    @classmethod
-    def create(cls, config: Config, conn: Connection) -> ProcessManager: ...
-
-    def get_service_name(self, process_name: str): ...
-
-    def install_services(self) -> None: ...
-
-    def uninstall_services(self) -> None: ...
-
-    def start_services(self, *names) -> None: ...
-
-    def restart_services(self, *names) -> None: ...
-
-    def stop_services(self, *names) -> None: ...
-
-    def is_enabled(self, *names) -> dict[str, bool]: ...
-
-    def is_active(self, *names) -> dict[str, bool]: ...
-
-    def service_logs(self, name: str, follow: bool = False): ...
-
-    def reload_configuration(self) -> None: ...
-
-    def get_configuration_files(
-        self, ignore_local: bool = False
-    ) -> list[tuple[str, str]]: ...