Merge remote-tracking branch 'origin/main' into fix/set-evaluation-snapshot

Author: LeeroyHannigan

.github/workflows/clippy.yml

@@ -1,6 +1,7 @@
 name: Clippy
 on:
   pull_request:
+  merge_group:
   push:
     branches: [main]
 

.github/workflows/fmt.yml

@@ -1,6 +1,7 @@
 name: Format
 on:
   pull_request:
+  merge_group:
   push:
     branches: [main]
 

.github/workflows/integration.yml

@@ -0,0 +1,84 @@
+name: Integration Tests
+on:
+  pull_request:
+  merge_group:
+  push:
+    branches: [main]
+
+permissions:
+  contents: read
+
+jobs:
+  run-integration:
+    runs-on: ubuntu-latest
+    services:
+      postgres:
+        image: postgres:16
+        env:
+          POSTGRES_PASSWORD: devpass
+        options: >-
+          --health-cmd "pg_isready -U postgres"
+          --health-interval 5s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - uses: dtolnay/rust-toolchain@stable
+
+      - uses: Swatinem/rust-cache@v2
+        with:
+          cache-on-failure: true
+
+      - name: Build release
+        run: cargo build --release
+
+      - name: Initialize ExtendDB
+        id: init
+        run: |
+          output=$(./target/release/extenddb init --config extenddb.toml \
+            --pg-host 127.0.0.1 --pg-port 5432 --pg-user postgres --pg-pass devpass 2>&1)
+          echo "$output"
+          password=$(echo "$output" | grep -oP 'Password: \K\S+')
+          echo "admin_password=$password" >> "$GITHUB_OUTPUT"
+
+      - name: Start ExtendDB
+        run: |
+          ./target/release/extenddb serve --config extenddb.toml --foreground &
+          for i in $(seq 1 30); do
+            if curl -sk https://127.0.0.1:8000/health | grep -q healthy; then
+              echo "Server ready"
+              exit 0
+            fi
+            sleep 1
+          done
+          echo "Server failed to start"
+          exit 1
+
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+
+      - name: Install Python dependencies
+        run: pip install -r requirements.txt
+
+      - name: Run integration tests
+        env:
+          EXTENDDB_TEST_ENDPOINT: https://127.0.0.1:8000
+          EXTENDDB_ADMIN_USER: admin
+          EXTENDDB_ADMIN_PASSWORD: ${{ steps.init.outputs.admin_password }}
+          EXTENDDB_TEST_PG_ADMIN_CONNECTION_STRING: postgresql://postgres:devpass@127.0.0.1:5432
+        run: devtools/run-tests --extenddb --pytest --comprehensive --parallel --filter "not import_export"
+
+  integration:
+    runs-on: ubuntu-latest
+    needs: run-integration
+    if: always()
+    steps:
+      - run: |
+          if [ "${{ needs.run-integration.result }}" != "success" ]; then
+            exit 1
+          fi

.github/workflows/test.yml

@@ -1,6 +1,7 @@
 name: Test
 on:
   pull_request:
+  merge_group:
   push:
     branches: [main]
 

Cargo.lock

@@ -48,6 +48,7 @@ axum = { version = "0.8", features = ["macros"] }
 tower = { version = "0.5", features = ["util"] }
 tower-http = { version = "0.6", features = ["compression-gzip", "cors", "set-header"] }
 hyper = { version = "1" }
+urlencoding = { version = "2.1" }
 
 # Database plugin registry
 inventory = "0.3"

Cargo.toml

@@ -28,7 +28,7 @@ pub struct InitArgs {
     #[arg(long)]
     catalog_db: Option<String>,
 
-    /// PostgreSQL host
+    /// PostgreSQL host (hostname, IP address, or absolute Unix socket directory path)
     #[arg(long)]
     pg_host: Option<String>,
 

crates/bin/src/cmd_init.rs

@@ -79,19 +79,9 @@ pub fn run(args: &ServeArgs) -> anyhow::Result<()> {
         );
     }
 
-    // Check backend is supported by this build
+    // Validate backend is supported and get catalog version (fail fast before binding port)
     let backend = &app_config.storage._backend;
-    #[cfg(not(feature = "postgres"))]
-    if backend == "postgres" {
-        anyhow::bail!("PostgreSQL backend not enabled. Rebuild with --features postgres");
-    }
-    #[cfg(feature = "postgres")]
-    if backend != "postgres" {
-        anyhow::bail!(
-            "Unknown backend '{}'. This build only supports 'postgres'.",
-            backend
-        );
-    }
+    let catalog_version = extenddb_storage::operations::catalog_version(backend)?;
 
     let port = args.port.unwrap_or(app_config.server.port);
     let bind_addr = format!("{}:{}", app_config.server.bind_addr, port);
@@ -112,9 +102,6 @@ pub fn run(args: &ServeArgs) -> anyhow::Result<()> {
     // it to stderr so a process supervisor receives banner and tracing logs
     // on the same stream — mixing stdout and stderr makes container log
     // capture noisier than necessary.
-    let backend = &app_config.storage._backend;
-    let catalog_version = extenddb_storage::operations::catalog_version(backend)
-        .unwrap_or_else(|_| "unknown".to_string());
     let banner_line1 = format!(
         "extenddb {} (catalog {}) starting on {}",
         env!("CARGO_PKG_VERSION"),

crates/bin/src/cmd_serve.rs

@@ -6,12 +6,11 @@
 use extenddb_core::limits::LimitsConfig;
 use serde::Deserialize;
 
-#[derive(Debug, Clone, Default, Deserialize)]
+#[derive(Debug, Clone, Deserialize)]
 #[serde(deny_unknown_fields)]
 pub struct AppConfig {
     #[serde(default)]
     pub server: ServerConfig,
-    #[serde(default)]
     pub storage: StorageConfig,
     /// Auth provider configuration. `provider = "builtin"` for `SigV4` with
     /// local credential store. The server refuses to start with `provider = "none"`.
@@ -180,6 +179,7 @@ impl<'de> serde::Deserialize<'de> for StorageConfig {
     }
 }
 
+#[cfg(feature = "postgres")]
 impl Default for StorageConfig {
     fn default() -> Self {
         Self {
@@ -315,6 +315,7 @@ pub fn expand_tilde(path: &str) -> String {
     }
     path.to_owned()
 }
+#[cfg(feature = "postgres")]
 fn default_backend() -> String {
     "postgres".to_owned()
 }

crates/bin/src/config.rs

@@ -92,7 +92,7 @@ pub fn pid_file_path(run_dir: &str, port: u16) -> PathBuf {
 /// PID file path using the default run directory. Used by `status` when
 /// no config file is loaded.
 pub fn pid_file_path_default(port: u16) -> PathBuf {
-    let run_dir = config::AppConfig::default().server.run_dir;
+    let run_dir = config::ServerConfig::default().run_dir;
     pid_file_path(&run_dir, port)
 }