update dggs api redirects strategy to result in correct links reporting by responses

Author: fmigneault

birdhouse/components/dggs/config/proxy/conf.extra-service.d/dggs.conf.template

@@ -33,8 +33,9 @@
         proxy_set_header X-Forwarded-Host $http_host:$server_port;
         #proxy_set_header X-Script-Name ${DGGS_API_PATH};
     }
-    location = ${DGGS_API_PATH}/json {
-        rewrite ^/${DGGS_API_PATH}/(.*) /$1 break;
+    # '/api' is the standard path by OGC: https://ogcapi.ogc.org/common/overview.html
+    location = ${DGGS_API_PATH}/api {
+        rewrite ^${DGGS_API_PATH}/(.*) ${DGGS_API_PATH_INTERNAL}/$1 break;
         proxy_pass http://dggs:8000;
         proxy_set_header Host $host;
         proxy_set_header X-Original-URI $request_uri;

birdhouse/components/dggs/default.env

@@ -8,7 +8,7 @@
 # must use single quotes to avoid early expansion before overrides in env.local
 # are applied and must be added to the list of DELAYED_EVAL.
 
-export DGGS_VERSION=0.2.0-rc
+export DGGS_VERSION=0.2.1-rc
 export DGGS_DOCKER=crim-ca/pydggsapi
 export DGGS_IMAGE='ghcr.io/${DGGS_DOCKER}:${DGGS_VERSION}'
 export DGGS_IMAGE_URI='${DGGS_IMAGE}'
@@ -25,6 +25,15 @@ export DGGS_CONFIG_PATH=./components/dggs/config/dggs/pydggsapi-config.json
 # API runtime configuration
 export DGGS_WORKERS=8
 export DGGS_LOG_LEVEL=info
+export DGGS_API_TITLE='Birdhouse - Discrete Global Grid System API'
+export DGGS_API_DESCRIPTION='PyDGGSAPI implementation of Discrete Global Grid System references and data retrieval.'
+export DGGS_API_CONTACT='
+{
+    "name": "Contact API Maintainer",
+    "url": "https://crim.ca/",
+    "email": "[email protected]"
+}
+'
 
 ### --- danger zone --- ###
 # Following variables are used to more easily map various API components across configurations.
@@ -40,7 +49,7 @@ export DGGS_API_NAME=dggs-api
 export DGGS_API_PATH='/${DGGS_API_NAME}'
 # internal path used by the actual API application from proxy redirection
 # this variable wiil allow 'DGGS_API_PATH' to be mapped directly to the API root
-export DGGS_API_PATH_INTERNAL=/dggs-api/dggs-api
+export DGGS_API_PATH_INTERNAL=/dggs-api
 # same as above, but for the additional tiles capabilities provided by the service
 export DGGS_TILES_NAME=tiles-api
 export DGGS_TILES_PATH='/${DGGS_TILES_NAME}'
@@ -74,6 +83,9 @@ OPTIONAL_VARS="
   \$DGGS_IMAGE_URI
   \$DGGS_LOG_LEVEL
   \$DGGS_WORKERS
+  \$DGGS_API_TITLE
+  \$DGGS_API_DESCRIPTION
+  \$DGGS_API_CONTACT
   \$SECURE_DATA_PROXY_AUTH_INCLUDE
 "
 

birdhouse/components/dggs/docker-compose-extra.yml

@@ -14,10 +14,15 @@ services:
       HOSTNAME: ${BIRDHOUSE_FQDN}
       HTTP_HOST: ${BIRDHOUSE_FQDN}
       FORWARDED_ALLOW_IPS: "*"
-      ROOT_PATH: "${DGGS_API_PATH}"
+      API_TITLE: "${DGGS_API_TITLE}"
+      API_CONTACT: "${DGGS_API_CONTACT}"
+      API_DESCRIPTION: "${DGGS_API_DESCRIPTION}"
+      #ROOT_PATH: "${DGGS_API_PATH}"
+      SERVICE_META_URL: "${BIRDHOUSE_FQDN_PUBLIC}/services/${DGGS_API_PATH}"
       DOCS_URL: ${DGGS_API_PATH}${DGGS_DOCS_PATH_INTERNAL}
-      OPENAPI_URL: /json
-      DGGS_PREFIX: ""
+      OPENAPI_URL: ${DGGS_API_PATH}/api
+      TILES_PREFIX: "${DGGS_TILES_PATH}"
+      DGGS_PREFIX: "${DGGS_API_PATH}"
       PYDGGSAPI_PORT: 8000
       PYDGGSAPI_WORKERS: ${DGGS_WORKERS}
       PYDGGSAPI_LOG_LEVEL: ${DGGS_LOG_LEVEL}