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

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

@@ -4,6 +4,12 @@ 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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: fujin-cli
-Version: 0.9.1
+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.1 → 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.1 → 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.1 → 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.1 → 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.1 → fujin_cli-0.10.0}/pyproject.toml

@@ -7,7 +7,7 @@ requires = [
 
 [project]
 name = "fujin-cli"
-version = "0.9.1"
+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.1"
+current_version = "0.10.0"
 parse = "(?P<major>\\d+)\\.(?P<minor>\\d+)\\.(?P<patch>\\d+)"
 serialize = [
   "{major}.{minor}.{patch}",

{fujin_cli-0.9.1 → 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.1 → 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
 ~~~~~~~~~~~~
@@ -221,6 +222,7 @@ class InstallationMode(StrEnum):
 class SecretAdapter(StrEnum):
     BITWARDEN = "bitwarden"
     ONE_PASSWORD = "1password"
+    DOPPLER = "doppler"
 
 
 class SecretConfig(msgspec.Struct):

{fujin_cli-0.9.1 → 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.1 → fujin_cli-0.10.0}/uv.lock

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