phlo-postgres 0.3.0__tar.gz → 0.3.2__tar.gz

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phlo-postgres
-Version: 0.3.0
+Version: 0.3.2
 Summary: Postgres service plugin for Phlo
 Author-email: Phlo Team <team@phlo.dev>
 License: MIT

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/README.md

@@ -18,7 +18,7 @@ phlo plugin install postgres
 
 | Variable                 | Default  | Description            |
 | ------------------------ | -------- | ---------------------- |
-| `POSTGRES_PORT`          | `5432`   | PostgreSQL port        |
+| `POSTGRES_PORT`          | `10000`  | PostgreSQL host port   |
 | `POSTGRES_USER`          | `phlo`   | Database username      |
 | `POSTGRES_PASSWORD`      | `phlo`   | Database password      |
 | `POSTGRES_DB`            | `phlo`   | Database name          |
@@ -57,7 +57,7 @@ phlo services start --service postgres,postgres-exporter
 
 ## Endpoints
 
-- **PostgreSQL**: `localhost:5432`
+- **PostgreSQL**: `localhost:10000`
 - **Exporter Metrics**: `http://localhost:9187/metrics`
 
 ## Entry Points

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/pyproject.toml

@@ -14,7 +14,7 @@ dependencies = [
 description = "Postgres service plugin for Phlo"
 name = "phlo-postgres"
 requires-python = ">=3.11"
-version = "0.3.0"
+version = "0.3.2"
 
 [[project.authors]]
 email = "team@phlo.dev"

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/src/phlo_postgres/__init__.py

@@ -27,4 +27,4 @@ __all__ = [
     "PostgresSettings",
     "get_settings",
 ]
-__version__ = "0.3.0"
+__version__ = "0.3.2"

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/src/phlo_postgres/cli.py

@@ -23,13 +23,22 @@ from subprocess import TimeoutExpired
 
 import click
 
+from phlo.cli.authorization_wrappers import enforce_surface_mutation_authorization
 from phlo.cli.commands.services.utils import (
-    ensure_phlo_dir,
+    ensure_compose_project,
     require_container_backend as _require_selected_container_backend,
 )
 from phlo.cli.infrastructure.command import CommandError, run_command
 from phlo.cli.infrastructure.compose import compose_base_cmd
 from phlo.cli.infrastructure.utils import get_project_name
+from phlo.cli.output import (
+    command_failed_error,
+    empty_file_error,
+    exclusive_options_error,
+    file_read_error,
+)
+from phlo.cli.output import missing_query_error
+from phlo_postgres.authorization import get_postgres_cli_adapter
 from phlo_postgres.settings import get_settings
 
 
@@ -56,18 +65,18 @@ def _read_sql(*, query: str | None, file: Path | None) -> str:
 
     """
     if query and file:
-        raise click.ClickException("Use either an inline query or --file, not both.")
+        raise exclusive_options_error("an inline query", "--file")
     if file is not None:
         try:
             sql = file.read_text(encoding="utf-8")
         except OSError as exc:
-            raise click.ClickException(f"Failed to read SQL file: {file}") from exc
+            raise file_read_error(file) from exc
         if sql.strip():
             return sql
-        raise click.ClickException(f"SQL file is empty: {file}")
+        raise empty_file_error(file)
     if query and query.strip():
         return query
-    raise click.ClickException("Provide a SQL query argument or --file.")
+    raise missing_query_error(command_hint='phlo postgres query "SELECT 1"')
 
 
 def _require_container_backend() -> None:
@@ -93,7 +102,7 @@ def _postgres_exec_base(*, tty: bool) -> list[str]:
         >>> # Returns: ['docker', 'compose', '-p', 'phlo', '-f', '...', 'exec', '-t', 'postgres']
 
     """
-    phlo_dir = ensure_phlo_dir()
+    phlo_dir = ensure_compose_project()
     project_name = get_project_name()
     cmd = compose_base_cmd(phlo_dir=phlo_dir, project_name=project_name)
     cmd.append("exec")
@@ -183,6 +192,7 @@ def postgres_group(ctx: click.Context, postgres_args: tuple[str, ...]) -> None:
         return
 
     _require_container_backend()
+    enforce_surface_mutation_authorization("postgres", get_postgres_cli_adapter)
     user, database = _postgres_identity(user=None, database=None)
     cmd = _postgres_exec_base(tty=True)
     cmd.extend(["psql", "-U", user, "-d", database])
@@ -230,6 +240,7 @@ def postgres_query(
 
     """
     _require_container_backend()
+    enforce_surface_mutation_authorization("postgres.query", get_postgres_cli_adapter)
     sql = _read_sql(query=query, file=query_file)
     resolved_user, resolved_db = _postgres_identity(user=user, database=database)
     cmd = _postgres_exec_base(tty=False)
@@ -244,7 +255,12 @@ def postgres_query(
         )
     except CommandError as exc:
         stderr = exc.stderr.strip()
-        raise click.ClickException(stderr or str(exc)) from exc
+        raise command_failed_error(
+            "psql",
+            exit_code=exc.returncode,
+            details=[stderr] if stderr else ["PostgreSQL did not complete the query."],
+            run="phlo services status postgres",
+        ) from exc
     except TimeoutExpired as exc:
         raise click.ClickException(f"Query timed out after {timeout_seconds} seconds.") from exc
 
@@ -289,6 +305,7 @@ def postgres_dump(
 
     """
     _require_container_backend()
+    enforce_surface_mutation_authorization("postgres.dump", get_postgres_cli_adapter)
     resolved_user, resolved_db = _postgres_identity(user=user, database=database)
     cmd = _postgres_exec_base(tty=False)
     cmd.extend(["pg_dump", "-U", resolved_user, resolved_db])
@@ -302,7 +319,12 @@ def postgres_dump(
         )
     except CommandError as exc:
         stderr = exc.stderr.strip()
-        raise click.ClickException(stderr or str(exc)) from exc
+        raise command_failed_error(
+            "pg_dump",
+            exit_code=exc.returncode,
+            details=[stderr] if stderr else ["PostgreSQL did not create the dump."],
+            run="phlo services status postgres",
+        ) from exc
     except TimeoutExpired as exc:
         raise click.ClickException(f"Dump timed out after {timeout_seconds} seconds.") from exc
 
@@ -359,6 +381,7 @@ def postgres_restore(
 
     """
     _require_container_backend()
+    enforce_surface_mutation_authorization("postgres.restore", get_postgres_cli_adapter)
     resolved_user, resolved_db = _postgres_identity(user=user, database=database)
     cmd = _postgres_exec_base(tty=False)
     cmd.extend(["psql", "-U", resolved_user, "-d", resolved_db, "-v", "ON_ERROR_STOP=1"])
@@ -423,6 +446,7 @@ def postgres_vacuum(
 
     """
     _require_container_backend()
+    enforce_surface_mutation_authorization("postgres.vacuum", get_postgres_cli_adapter)
     resolved_user, resolved_db = _postgres_identity(user=user, database=database)
     cmd = _postgres_exec_base(tty=False)
     cmd.extend(["vacuumdb", "-U", resolved_user])

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/src/phlo_postgres/service.yaml

@@ -24,7 +24,7 @@ compose:
     # SSL/TLS
     POSTGRES_SSL_MODE: ${POSTGRES_SSL_MODE:-prefer}
   ports:
-    - "${POSTGRES_PORT:-5432}:5432"
+    - "${POSTGRES_PORT:-10000}:5432"
   volumes:
     - postgres-data:/var/lib/postgresql/data
   healthcheck:
@@ -45,7 +45,7 @@ env_vars:
     default: phlo
     description: PostgreSQL database name
   POSTGRES_PORT:
-    default: 5432
+    default: 10000
     description: PostgreSQL host port
   # SSL/TLS
   POSTGRES_SSL_MODE:

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/src/phlo_postgres.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: phlo-postgres
-Version: 0.3.0
+Version: 0.3.2
 Summary: Postgres service plugin for Phlo
 Author-email: Phlo Team <team@phlo.dev>
 License: MIT

{phlo_postgres-0.3.0 → phlo_postgres-0.3.2}/tests/test_postgres_cli.py

@@ -42,7 +42,9 @@ def test_postgres_query_runs_psql(monkeypatch) -> None:
         ]
         return CompletedProcess(cmd, 0, stdout="1\n", stderr="")
 
-    monkeypatch.setattr("phlo_postgres.cli.ensure_phlo_dir", lambda: Path("/tmp/project/.phlo"))
+    monkeypatch.setattr(
+        "phlo_postgres.cli.ensure_compose_project", lambda: Path("/tmp/project/.phlo")
+    )
     monkeypatch.setattr("phlo_postgres.cli.get_project_name", lambda: "demo")
     monkeypatch.setattr(
         "phlo_postgres.cli.compose_base_cmd",
@@ -56,6 +58,20 @@ def test_postgres_query_runs_psql(monkeypatch) -> None:
     assert result.output == "1\n"
 
 
+def test_postgres_query_requires_initialized_services(monkeypatch, tmp_path) -> None:
+    phlo_dir = tmp_path / ".phlo"
+    phlo_dir.mkdir()
+    monkeypatch.chdir(tmp_path)
+
+    result = CliRunner().invoke(postgres_group, ["query", "SELECT 1"])
+
+    assert result.exit_code != 0
+    assert "Error: Phlo services have not been initialized" in result.output
+    assert "Missing: .phlo/docker-compose.yml" in result.output
+    assert "Run: phlo services init" in result.output
+    assert "couldn't find env file" not in result.output
+
+
 def test_postgres_dump_writes_gzip_file(monkeypatch, tmp_path) -> None:
     output_file = tmp_path / "backup.sql.gz"
 
@@ -65,7 +81,9 @@ def test_postgres_dump_writes_gzip_file(monkeypatch, tmp_path) -> None:
         assert cmd[-4:] == ["pg_dump", "-U", "phlo", "phlo"]
         return CompletedProcess(cmd, 0, stdout="CREATE TABLE test ();", stderr="")
 
-    monkeypatch.setattr("phlo_postgres.cli.ensure_phlo_dir", lambda: Path("/tmp/project/.phlo"))
+    monkeypatch.setattr(
+        "phlo_postgres.cli.ensure_compose_project", lambda: Path("/tmp/project/.phlo")
+    )
     monkeypatch.setattr("phlo_postgres.cli.get_project_name", lambda: "demo")
     monkeypatch.setattr(
         "phlo_postgres.cli.compose_base_cmd",
@@ -86,7 +104,9 @@ def test_postgres_restore_reads_file(monkeypatch, tmp_path) -> None:
     input_file.write_text("SELECT 1;", encoding="utf-8")
     captured: list[tuple[list[str], str]] = []
 
-    monkeypatch.setattr("phlo_postgres.cli.ensure_phlo_dir", lambda: Path("/tmp/project/.phlo"))
+    monkeypatch.setattr(
+        "phlo_postgres.cli.ensure_compose_project", lambda: Path("/tmp/project/.phlo")
+    )
     monkeypatch.setattr("phlo_postgres.cli.get_project_name", lambda: "demo")
     monkeypatch.setattr(
         "phlo_postgres.cli.compose_base_cmd",
@@ -136,7 +156,9 @@ def test_postgres_vacuum_runs_vacuumdb(monkeypatch) -> None:
         assert cmd[-5:] == ["vacuumdb", "-U", "phlo", "-z", "phlo"]
         return CompletedProcess(cmd, 0, stdout="VACUUM\n", stderr="")
 
-    monkeypatch.setattr("phlo_postgres.cli.ensure_phlo_dir", lambda: Path("/tmp/project/.phlo"))
+    monkeypatch.setattr(
+        "phlo_postgres.cli.ensure_compose_project", lambda: Path("/tmp/project/.phlo")
+    )
     monkeypatch.setattr("phlo_postgres.cli.get_project_name", lambda: "demo")
     monkeypatch.setattr(
         "phlo_postgres.cli.compose_base_cmd",
@@ -153,7 +175,9 @@ def test_postgres_vacuum_runs_vacuumdb(monkeypatch) -> None:
 def test_postgres_shell_passthrough(monkeypatch) -> None:
     captured: list[list[str]] = []
 
-    monkeypatch.setattr("phlo_postgres.cli.ensure_phlo_dir", lambda: Path("/tmp/project/.phlo"))
+    monkeypatch.setattr(
+        "phlo_postgres.cli.ensure_compose_project", lambda: Path("/tmp/project/.phlo")
+    )
     monkeypatch.setattr("phlo_postgres.cli.get_project_name", lambda: "demo")
     monkeypatch.setattr(
         "phlo_postgres.cli.compose_base_cmd",
@@ -197,7 +221,9 @@ def test_postgres_query_timeout(monkeypatch) -> None:
             return CompletedProcess(cmd, 0, stdout="", stderr="")
         raise TimeoutExpired(cmd=cmd, timeout=30)
 
-    monkeypatch.setattr("phlo_postgres.cli.ensure_phlo_dir", lambda: Path("/tmp/project/.phlo"))
+    monkeypatch.setattr(
+        "phlo_postgres.cli.ensure_compose_project", lambda: Path("/tmp/project/.phlo")
+    )
     monkeypatch.setattr("phlo_postgres.cli.get_project_name", lambda: "demo")
     monkeypatch.setattr(
         "phlo_postgres.cli.compose_base_cmd",