diff --git a/CHANGELOG.md b/CHANGELOG.md index c5418620c..8680bb510 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added - WMTS Services are now supported as custom user layers. +- Added data extraction API. ### Changed diff --git a/docker-compose.yml b/docker-compose.yml index d04b9aff9..93046041f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -115,6 +115,7 @@ services: DOTNET_USE_POLLING_FILE_WATCHER: 1 CONNECTIONSTRINGS__BdmsContext: Host=localhost;Username=SPAWNPLOW;Password=YELLOWSPATULA;Database=bdms;CommandTimeout=300 ReverseProxy__Clusters__pythonApi__Destinations__legacyApi__Address: "http://localhost:8888/" + ReverseProxy__Clusters__dataExtractionApi__Destinations__dataExtractionApi__Address: "http://localhost:8000/" Auth__Authority: http://localhost:4011 Auth__Audience: "bdms-client" Auth__GroupClaimType: "local_groups_claim" @@ -124,6 +125,18 @@ services: S3__SECURE: 1 extra_hosts: - "localhost:host-gateway" + dataextraction: + image: ghcr.io/swisstopo/swissgeol-boreholes-dataextraction-api:edge + restart: unless-stopped + ports: + - 8000:8000 + environment: + AWS_ENDPOINT: http://minio:9000 + AWS_ACCESS_KEY_ID: REDSQUIRREL + AWS_SECRET_ACCESS_KEY: YELLOWMONKEY + AWS_S3_BUCKET: "cannonflea" + healthcheck: + test: "curl --fail http://localhost:8000/health || exit 1" oidc-server: image: soluto/oidc-server-mock restart: unless-stopped diff --git a/src/api/appsettings.Development.json b/src/api/appsettings.Development.json index 9527f1a00..a94936dbf 100644 --- a/src/api/appsettings.Development.json +++ b/src/api/appsettings.Development.json @@ -31,6 +31,13 @@ "Address": "http://localhost:8888/" } } + }, + "dataExtractionApi": { + "Destinations": { + "dataExtractionApi": { + "Address": "http://localhost:8000/" + } + } } } } diff --git a/src/api/appsettings.json b/src/api/appsettings.json index 183bc777e..724cf4487 100644 --- a/src/api/appsettings.json +++ b/src/api/appsettings.json @@ -22,6 +22,18 @@ "Match": { "Path": "/api/v1/{**catch-all}" } + }, + "dataExtractionApi": { + "ClusterId": "dataExtractionApi", + "AuthorizationPolicy": "Viewer", + "Match": { + "Path": "/dataextraction/{**catch-all}" + }, + "Transforms": [ + { + "PathRemovePrefix": "/dataextraction" + } + ] } } }