Release 1.7.0: Grafana catalog, ingress/IRM, tests

tests/test_ingress.py

@@ -63,6 +63,35 @@ def test_grafana_webhook_inserts_with_mock_pool(client: TestClient) -> None:
         app.state.pool = real_pool
 
 
+def test_grafana_webhook_auto_org_from_external_url(client: TestClient) -> None:
+    from uuid import uuid4
+
+    mock_conn = AsyncMock()
+    uid = uuid4()
+    mock_conn.fetchrow = AsyncMock(return_value={"id": uid})
+    mock_cm = AsyncMock()
+    mock_cm.__aenter__ = AsyncMock(return_value=mock_conn)
+    mock_cm.__aexit__ = AsyncMock(return_value=None)
+    mock_pool = MagicMock()
+    mock_pool.acquire = MagicMock(return_value=mock_cm)
+
+    app = client.app
+    real_pool = app.state.pool
+    app.state.pool = mock_pool
+    try:
+        r = client.post(
+            "/api/v1/ingress/grafana",
+            content=json.dumps(
+                {"externalURL": "https://grafana-adibrov.example.com/", "title": "x"}
+            ),
+            headers={"Content-Type": "application/json"},
+        )
+        assert r.status_code == 202
+        assert mock_conn.fetchrow.call_args[0][3] == "grafana-adibrov.example.com"
+    finally:
+        app.state.pool = real_pool
+
+
 def test_grafana_webhook_publishes_alert_received(client: TestClient) -> None:
     from unittest.mock import patch
     from uuid import uuid4
@@ -92,3 +121,66 @@ def test_grafana_webhook_publishes_alert_received(client: TestClient) -> None:
             assert spy.await_args.kwargs.get("raw_payload_ref") == uid
         finally:
             app.state.pool = real_pool
+
+
+def test_grafana_webhook_org_any_slug_without_json_config(client: TestClient) -> None:
+    """Путь /{slug} не требует GRAFANA_SOURCES_JSON — slug просто сохраняется."""
+    from uuid import uuid4
+
+    mock_conn = AsyncMock()
+    uid = uuid4()
+    mock_conn.fetchrow = AsyncMock(return_value={"id": uid})
+    mock_cm = AsyncMock()
+    mock_cm.__aenter__ = AsyncMock(return_value=mock_conn)
+    mock_cm.__aexit__ = AsyncMock(return_value=None)
+    mock_pool = MagicMock()
+    mock_pool.acquire = MagicMock(return_value=mock_cm)
+
+    app = client.app
+    real_pool = app.state.pool
+    app.state.pool = mock_pool
+    try:
+        r = client.post(
+            "/api/v1/ingress/grafana/other",
+            content=b"{}",
+            headers={"Content-Type": "application/json"},
+        )
+        assert r.status_code == 202
+        assert mock_conn.fetchrow.call_args[0][3] == "other"
+    finally:
+        app.state.pool = real_pool
+
+
+def test_grafana_webhook_org_ok(client: TestClient) -> None:
+    from uuid import uuid4
+
+    mock_conn = AsyncMock()
+    uid = uuid4()
+    mock_conn.fetchrow = AsyncMock(return_value={"id": uid})
+    mock_cm = AsyncMock()
+    mock_cm.__aenter__ = AsyncMock(return_value=mock_conn)
+    mock_cm.__aexit__ = AsyncMock(return_value=None)
+    mock_pool = MagicMock()
+    mock_pool.acquire = MagicMock(return_value=mock_cm)
+
+    app = client.app
+    real_json = app.state.settings.grafana_sources_json
+    real_pool = app.state.pool
+    app.state.settings.grafana_sources_json = (
+        '[{"slug":"adibrov","api_url":"http://192.168.0.1:3000","api_token":"","webhook_secret":""}]'
+    )
+    app.state.pool = mock_pool
+    try:
+        r = client.post(
+            "/api/v1/ingress/grafana/adibrov",
+            content='{"title":"t"}',
+            headers={"Content-Type": "application/json"},
+        )
+        assert r.status_code == 202
+        call = mock_conn.fetchrow.call_args
+        assert "org_slug" in call[0][0].lower() or "org_slug" in str(call)
+        assert call[0][1] == "grafana"
+        assert call[0][3] == "adibrov"
+    finally:
+        app.state.settings.grafana_sources_json = real_json
+        app.state.pool = real_pool