wip

Author: b4l

.github/workflows/cite.yml

@@ -12,24 +12,50 @@ jobs:
     name: OGC Cite Validation (Features)
     runs-on: ubuntu-latest
 
+    services:
+      db:
+        image: docker.io/postgis/postgis
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: password
+          POSTGRES_DB: ogcapi
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          - 5432:5432
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup
-        run: docker compose up --build -d
-
-      - name: Check running containers
-        run: docker ps -a
-
-      - name: Build
-        run: docker exec ogcapi cargo run -p data-loader -- --input data/ne_110m_admin_0_countries.geojson --collection countries
+      - name: Load
+        run: cargo run -p data-loader -- --input data/ne_110m_admin_0_countries.geojson --collection countries
+        env:
+          DATABASE_URL: "postgresql://postgres:password@localhost:5432/ogcapi"
 
       - name: Run
-        run: docker exec -d ogcapi cargo run -p cite-service
+        run: RUNNER_TRACKING_ID="" && cargo run -p cite-service &
+        env:
+          APP_HOST: "0.0.0.0"
+          APP_PORT: "8484"
+          DATABASE_URL: "postgresql://postgres:password@localhost:5432/ogcapi"
+
+      - name: Check running service
+        # run: curl --retry 20 --retry-delay 5 -s -o /dev/null http://localhost:8484
+        run: |
+          until [ \
+            "$(curl -s -w '%{http_code}' -o /dev/null "http://localhost:8484/")" \
+            -eq 200 ]
+          do
+            sleep 5
+          done
+
 
       - name: Validate
         uses: OSGEO/[email protected]
         with:
           test_suite_identifier: ogcapi-features-1.0
-          test_session_arguments: iut=http://host.docker.internal:8484
+          test_session_arguments: iut=http://0.0.0.0:8484

Cargo.lock

@@ -47,6 +47,8 @@ services:
     command: tail -f /dev/null
     ports:
       - ${APP_PORT}:${APP_PORT}
+    extra_hosts:
+      - "host.docker.internal:host-gateway"
 
   minio:
     image: docker.io/minio/minio

docker-compose.yml

@@ -4,12 +4,9 @@ version = "0.1.0"
 edition.workspace = true
 publish = false
 
-[features]
-stac = []
 
 [dependencies]
 clap = { version = "4.5", features = ["derive", "env"] }
-dotenvy = "0.15.7"
 tokio = { version = "1.47", features = ["full"] }
 tracing = "0.1.41"
 tracing-subscriber = { version = "0.3.19", features = ["env-filter"] }
@@ -18,6 +15,4 @@ ogcapi = { path = "../../ogcapi", version = "0.3", features = [
     "services",
     "common",
     "features",
-    "greeter",
-    "geojson-loader",
 ] }

examples/cite-service/Cargo.toml

@@ -1,19 +1,13 @@
 use clap::Parser;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
 
-use ogcapi::{
-    processes::{gdal_loader::GdalLoader, geojson_loader::GeoJsonLoader, greeter::Greeter},
-    services::{AppState, Config, Service},
-};
+use ogcapi::services::{AppState, Config, Service};
 
 #[tokio::main]
 async fn main() {
-    // setup env
-    dotenvy::dotenv().ok();
-
     // setup tracing
     tracing_subscriber::registry()
-        .with(tracing_subscriber::EnvFilter::from_default_env())
+        .with(tracing_subscriber::EnvFilter::new("cite_service=debug,ogcapi=debug,sqlx=warn"))
         .with(tracing_subscriber::fmt::layer().pretty())
         .init();
 
@@ -23,12 +17,6 @@ async fn main() {
     // Application state
     let state = AppState::new_from(&config).await;
 
-    // Register processes/processors
-    let state = state.processors(vec![
-        Box::new(Greeter),
-        Box::new(GeoJsonLoader),
-    ]);
-
     // Build & run with hyper
     Service::new_with(&config, state).await.serve().await;
 }