datasette-secrets 0.1a2__tar.gz → 0.1a4__tar.gz

{datasette_secrets-0.1a2 → datasette_secrets-0.1a4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datasette-secrets
-Version: 0.1a2
+Version: 0.1a4
 Summary: Manage secrets such as API keys for use with other Datasette plugins
 Author: Datasette
 License: Apache-2.0

{datasette_secrets-0.1a2 → datasette_secrets-0.1a4}/datasette_secrets/__init__.py

@@ -3,7 +3,7 @@ from cryptography.fernet import Fernet
 import dataclasses
 from datasette import hookimpl, Forbidden, Permission, Response
 from datasette.plugins import pm
-from datasette.utils import await_me_maybe
+from datasette.utils import await_me_maybe, sqlite3
 import os
 from typing import Optional
 from . import hookspecs
@@ -23,16 +23,22 @@ async def get_secret(datasette, secret_name, actor_id=None):
         return os.environ[env_var]
     # Now look it up in the database
     config = get_config(datasette)
+    if config is None:
+        return None
+    encryption_key = config["encryption_key"]
     db = get_database(datasette)
-    db_secret = (
-        await db.execute(
-            "select id, encrypted from datasette_secrets where name = ? order by version desc limit 1",
-            (secret_name,),
-        )
-    ).first()
+    try:
+        db_secret = (
+            await db.execute(
+                "select id, encrypted from datasette_secrets where name = ? order by version desc limit 1",
+                (secret_name,),
+            )
+        ).first()
+    except sqlite3.OperationalError:
+        return None
     if not db_secret:
         return None
-    key = Fernet(config["encryption_key"].encode("utf-8"))
+    key = Fernet(encryption_key.encode("utf-8"))
     decrypted = key.decrypt(db_secret["encrypted"])
     # Update the last used timestamp and actor_id
     params = (actor_id, db_secret["id"])

{datasette_secrets-0.1a2 → datasette_secrets-0.1a4}/datasette_secrets.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datasette-secrets
-Version: 0.1a2
+Version: 0.1a4
 Summary: Manage secrets such as API keys for use with other Datasette plugins
 Author: Datasette
 License: Apache-2.0

{datasette_secrets-0.1a2 → datasette_secrets-0.1a4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "datasette-secrets"
-version = "0.1a2"
+version = "0.1a4"
 description = "Manage secrets such as API keys for use with other Datasette plugins"
 readme = "README.md"
 authors = [{name = "Datasette"}]

{datasette_secrets-0.1a2 → datasette_secrets-0.1a4}/tests/test_secrets.py

@@ -4,7 +4,7 @@ from datasette import hookimpl
 from datasette.app import Datasette
 from datasette.cli import cli
 from datasette.plugins import pm
-from datasette_secrets import get_secret, Secret
+from datasette_secrets import get_secret, Secret, startup, get_config
 import pytest
 from unittest.mock import ANY
 
@@ -269,6 +269,19 @@ async def test_get_secret(ds, monkeypatch):
     """
     assert remove_whitespace(expected_html) in remove_whitespace(response.text)
 
+    # Finally it should still work even if the datasette_secrets table is missing
+    await db.execute_write("drop table datasette_secrets")
+    monkeypatch.delenv("DATASETTE_SECRETS_EXAMPLE_SECRET")
+    assert await get_secret(ds, "EXAMPLE_SECRET") is None
+
+
+@pytest.mark.asyncio
+async def test_if_not_configured(register_multiple_secrets):
+    ds = Datasette()
+    config = get_config(ds)
+    assert config is None
+    assert await get_secret(ds, "OPENAI_API_KEY") is None
+
 
 @pytest.mark.asyncio
 async def test_secret_index_page(ds, register_multiple_secrets):