From fc77407379cc213518469465c77cc5cd3f07685b Mon Sep 17 00:00:00 2001 From: Ivan Golikov Date: Wed, 8 Jan 2025 23:03:12 +0100 Subject: [PATCH 1/3] hotfix: Actually using getdel function --- pssecret_server/main.py | 4 ++-- pyproject.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pssecret_server/main.py b/pssecret_server/main.py index 6c90499..21feda8 100644 --- a/pssecret_server/main.py +++ b/pssecret_server/main.py @@ -8,7 +8,7 @@ from redis.asyncio import Redis from pssecret_server.fernet import get_fernet from pssecret_server.models import Secret, SecretSaveResult from pssecret_server.redis_db import get_redis -from pssecret_server.utils import decrypt_secret, encrypt_secret, save_secret +from pssecret_server.utils import decrypt_secret, encrypt_secret, getdel, save_secret app = FastAPI() @@ -49,7 +49,7 @@ async def set_secret( async def get_secret( secret_key: str, redis: RedisDep, fernet: FernetDep ) -> dict[str, bytes]: - data: bytes | None = await redis.getdel(secret_key) + data: bytes | None = await getdel(redis, secret_key) if data is None: raise HTTPException(404) diff --git a/pyproject.toml b/pyproject.toml index 6239ed9..2e3ce90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pssecret-server" -version = "1.1.0" +version = "1.1.1" description = "API service for secrets sharing over network" authors = ["Ivan Golikov "] license = "BSD-3-Clause" From 7f36eafc112a231c5bb5b5c8b6b70c32ab99bb1b Mon Sep 17 00:00:00 2001 From: Ivan Golikov Date: Wed, 8 Jan 2025 23:50:59 +0100 Subject: [PATCH 2/3] Added --version option --- README.md | 1 + pssecret_server/cli.py | 3 +++ 2 files changed, 4 insertions(+) diff --git a/README.md b/README.md index 41bc140..82bac32 100644 --- a/README.md +++ b/README.md @@ -51,6 +51,7 @@ Available configuration options: --uds TEXT Bind to a UNIX domain socket. --workers INTEGER Number of worker processes. Defaults to the $WEB_CONCURRENCY environment variable if available, or 1. +--version Show the version and exit. --help Show this message and exit. ``` diff --git a/pssecret_server/cli.py b/pssecret_server/cli.py index ca89451..359fc19 100644 --- a/pssecret_server/cli.py +++ b/pssecret_server/cli.py @@ -1,3 +1,5 @@ +from importlib.metadata import version + import click import uvicorn @@ -21,5 +23,6 @@ import uvicorn ), type=int, ) +@click.version_option(version("pssecret_server")) def cli(**kwargs) -> None: uvicorn.run("pssecret_server.main:app", **kwargs) From 65137b99ac85f18c9b8a851936c765a5233477ab Mon Sep 17 00:00:00 2001 From: Ivan Golikov Date: Wed, 8 Jan 2025 23:51:43 +0100 Subject: [PATCH 3/3] Version bump --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 2e3ce90..e01efcb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pssecret-server" -version = "1.1.1" +version = "1.1.2" description = "API service for secrets sharing over network" authors = ["Ivan Golikov "] license = "BSD-3-Clause"