editoast: fga: add OpenFGA client lib

Signed-off-by: Leo Valais <[email protected]>

Author: leovalais

docker-compose.yml

@@ -39,6 +39,32 @@ services:
       interval: 5s
       retries: 20
 
+  openfga-migrate:
+    depends_on:
+      postgres: { condition: service_healthy }
+    image: openfga/openfga:latest
+    container_name: osrd-openfga-migrate
+    command: migrate
+    environment:
+      OPENFGA_DATASTORE_ENGINE: "postgres"
+      OPENFGA_DATASTORE_URI: "postgres://osrd:password@postgres:5432/osrd?search_path=openfga"
+
+  openfga:
+    depends_on:
+      openfga-migrate:
+        condition: service_completed_successfully
+    image: openfga/openfga:latest
+    container_name: osrd-openfga
+    environment:
+      OPENFGA_DATASTORE_ENGINE: "postgres"
+      OPENFGA_DATASTORE_URI: "postgres://osrd:password@postgres:5432/osrd?search_path=openfga"
+      OPENFGA_HTTP_ADDR: "0.0.0.0:8091"
+      OPENFGA_PLAYGROUND_PORT: 8092
+    command: run
+    ports:
+      - "8091:8091" # http
+      - "8092:8092" # playground
+
   rabbitmq:
     image: rabbitmq:4-management
     container_name: osrd-rabbitmq

docker/docker-compose.host.yml

@@ -9,6 +9,18 @@ services:
     ports: !reset []
     network_mode: host
 
+  openfga-migrate:
+    ports: !reset []
+    network_mode: host
+    environment:
+      OPENFGA_DATASTORE_URI: "postgres://osrd:password@localhost:5432/osrd?search_path=openfga"
+
+  openfga:
+    ports: !reset []
+    network_mode: host
+    environment:
+      OPENFGA_DATASTORE_URI: "postgres://osrd:password@localhost:5432/osrd?search_path=openfga"
+
   editoast:
     ports: !reset []
     network_mode: host

docker/docker-compose.pr-tests.yml

@@ -54,6 +54,31 @@ services:
     networks:
       - pr-tests
 
+  openfga-migrate:
+    image: openfga/openfga:latest
+    container_name: osrd-openfga-migrate-pr-tests
+    command: migrate
+    environment:
+      OPENFGA_DATASTORE_ENGINE: "postgres"
+      OPENFGA_DATASTORE_URI: "postgres://osrd:password@postgres:5433/osrd?search_path=openfga"
+    networks:
+      - pr-tests
+
+  openfga:
+    image: openfga/openfga:latest
+    container_name: osrd-openfga-pr-tests
+    environment:
+      OPENFGA_DATASTORE_ENGINE: "postgres"
+      OPENFGA_DATASTORE_URI: "postgres://osrd:password@postgres:5433/osrd?search_path=openfga"
+      OPENFGA_HTTP_ADDR: "0.0.0.0:8191"
+      OPENFGA_PLAYGROUND_PORT: 8192
+    command: run
+    ports:
+      - "8191:8191" # http
+      - "8192:8192" # playground
+    networks:
+      - pr-tests
+
   rabbitmq:
     image: rabbitmq:4-management
     container_name: osrd-rabbitmq-pr-tests
@@ -94,10 +119,9 @@ services:
       valkey: { condition: service_healthy }
       rabbitmq: { condition: service_healthy }
     restart: unless-stopped
-    ports: [ "8091:8091" ]
     environment:
-      EDITOAST_PORT: 8091
-      ROOT_URL: "http://localhost:8091"
+      EDITOAST_PORT: 8090
+      ROOT_URL: "http://osrd-editoast-pr-tests:8090"
       VALKEY_URL: "redis://valkey:6380"
       DATABASE_URL: "postgres://osrd:password@postgres:5433/osrd"
       TELEMETRY_KIND: "opentelemetry"
@@ -109,7 +133,7 @@ services:
       - -c
       - "diesel migration run && exec editoast runserver"
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8091/health" ]
+      test: [ "CMD", "curl", "-f", "http://localhost:8090/health" ]
       start_period: 4s
       interval: 5s
       retries: 6

docker/gateway.pr-tests.simple.toml

@@ -20,7 +20,7 @@ redirect_404_to_index = true
 [[targets]]
 tracing_name = "editoast"
 prefix = "/api"
-upstream = "http://osrd-editoast-pr-tests:8091"
+upstream = "http://editoast:8090"
 require_auth = true
 
 [[targets]]

docker/init_db.sql

@@ -6,13 +6,18 @@ create database template_osrd WITH IS_TEMPLATE true;
 -- Connect to template_osrd
 \c template_osrd
 
+-- Create openfga schema
+create schema openfga;
+
 -- Enable required extensions
 create extension postgis;
 create extension pg_trgm;
 create extension unaccent;
 
 -- Grant privileges to user
 grant all privileges on schema public to osrd;
+grant all privileges on schema openfga to osrd;
+
 
 -- Create osrd database using template_osrd
 create database osrd TEMPLATE template_osrd;

editoast/Cargo.lock

@@ -13,6 +13,8 @@ members = [
   "editoast_osrdyne_client",
   "editoast_schemas",
   "editoast_search",
+  "fga",
+  "fga_derive",
   "osm_to_railjson",
 ]
 
@@ -27,6 +29,7 @@ license = "LGPL-3.0"
 [workspace.dependencies]
 chrono = { version = "0.4.39", default-features = false, features = ["serde"] }
 clap = { version = "4.5", features = ["derive", "env"] }
+darling = "0.20"
 derivative = "2.2.0"
 diesel = { version = "2.2", default-features = false, features = [
   "32-column-tables",
@@ -66,9 +69,12 @@ paste = "1.0.15"
 postgis_diesel = { version = "2.4.1", features = ["serde"] }
 postgres-openssl = "0.5.1"
 pretty_assertions = "1.4.1"
+proc-macro2 = "1.0"
+quote = "1.0"
 rand = "0.9.0"
 rangemap = "1.5.1"
 regex = "1.11"
+syn = "2.0"
 # 0.12.0 to 0.12.4 have weird timeout issues https://github.com/seanmonstar/reqwest/issues/2283
 # This bug was introduced between 0.12.0 and 0.12.3.
 reqwest = { version = "0.11.27", features = ["json"] }

editoast/Cargo.toml

@@ -7,12 +7,12 @@ edition.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-darling = "0.20"
+darling.workspace = true
 paste.workspace = true
-proc-macro2 = "1.0"
-quote = "1.0"
+proc-macro2.workspace = true
+quote.workspace = true
 serde_json.workspace = true
-syn = "2.0"
+syn.workspace = true
 
 [lib]
 proc-macro = true

editoast/editoast_derive/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+name = "fga"
+license.workspace = true
+version.workspace = true
+edition.workspace = true
+
+[dependencies]
+fga_derive = { path = "../fga_derive" }
+futures.workspace = true
+futures-util.workspace = true
+itertools.workspace = true
+reqwest.workspace = true
+serde.workspace = true
+serde_json.workspace = true
+tempfile.workspace = true
+thiserror.workspace = true
+tokio.workspace = true
+tracing.workspace = true
+url.workspace = true
+
+[dev-dependencies]
+derive_more = { version = "2.0.1", features = ["from"] }
+stdext = "0.3.3"
+tracing-subscriber.workspace = true