Fix birds not creating their wps output under each bird name (#203)

Before this fix, finch, raven, flyingpigeon were dumping their output
directly under `https://PAVICS_HOST/wpsoutputs/`.

With this fix, it will be under each bird name, ex:
`https://PAVICS_HOST/wpsoutputs/finch/` which is cleaner and follows
what malleefowl and hummingbird already does.

Fixes #11.
Fixes https://crim-ca.atlassian.net/browse/DAC-398

Requires PR Ouranosinc/pavics-sdi#280,
bird-house/finch#273,
Ouranosinc/raven#459

If `optional-components/secure-data-proxy` is enabled, might need some
additional permissions for each bird in

https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/optional-components/secure-data-proxy/config/magpie/config.yml.template.

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.23.1
+current_version = 1.23.2
 commit = True
 tag = False
 tag_name = {new_version}
@@ -30,11 +30,11 @@ search = {current_version}
 replace = {new_version}
 
 [bumpversion:file:RELEASE.txt]
-search = {current_version} 2023-02-13T18:31:02Z
+search = {current_version} 2023-02-17T02:54:37Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-02-13T18:31:02Z
+values = 2023-02-17T02:54:37Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -16,6 +16,30 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.23.2](https://github.com/bird-house/birdhouse-deploy/tree/1.23.2) (2023-02-17)
+------------------------------------------------------------------------------------------------------------------
+
+## Fixes
+- Fix birds not creating their wps output under each bird name
+
+  Before this fix, finch, raven, flyingpigeon were dumping their output directly
+  under `https://PAVICS_HOST/wpsoutputs/`.
+
+  With this fix, it will be under each bird name, ex:
+  `https://PAVICS_HOST/wpsoutputs/finch/` which is cleaner and follows what
+  malleefowl and hummingbird already does.
+
+  Fixes https://github.com/bird-house/birdhouse-deploy/issues/11.
+  Fixes https://crim-ca.atlassian.net/browse/DAC-398
+
+  Requires PR https://github.com/Ouranosinc/pavics-sdi/pull/280,
+  https://github.com/bird-house/finch/pull/273 and
+  https://github.com/Ouranosinc/raven/pull/459.
+
+  If `optional-components/secure-data-proxy` is enabled, might need some
+  additional permissions for each bird in
+  https://github.com/bird-house/birdhouse-deploy/blob/master/birdhouse/optional-components/secure-data-proxy/config/magpie/config.yml.template.
+
 [1.23.1](https://github.com/bird-house/birdhouse-deploy/tree/1.23.1) (2023-02-13)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.23.1
+override APP_VERSION := 1.23.2
 
 # utility to remove comments after value of an option variable
 override clean_opt = $(shell echo "$(1)" | $(_SED) -r -e "s/[ '$'\t'']+$$//g")

README.rst

@@ -14,13 +14,13 @@ for a full-fledged production platform.
     * - releases
       - | |latest-version| |commits-since|
 
-.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.23.1.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.23.2.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.23.1...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.23.2...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.23.1-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.23.2-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.23.1
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.23.2
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-1.23.1 2023-02-13T18:31:02Z
+1.23.2 2023-02-17T02:54:37Z

birdhouse/config/canarie-api/docker_configuration.py.template

@@ -17,8 +17,8 @@ SERVICES = {
         'info': {
             'name': 'Node',
             'synopsis': 'Nodes are data, compute and index endpoints accessed through the PAVICS platform or external clients. The Node service is the backend that allows: data storage, harvesting, indexation and discovery of local and federated data; authentication and authorization; server registration and management. Node service is therefore composed of several other services.',
-            'version': '1.23.1',
-            'releaseTime': '2023-02-13T18:31:02Z',
+            'version': '1.23.2',
+            'releaseTime': '2023-02-17T02:54:37Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -242,8 +242,8 @@ PLATFORMS = {
         'info': {
             'name': 'PAVICS',
             'synopsis': 'The PAVICS (Power Analytics for Visualization of Climate Science) platform is a collection of climate analysis services served through Open Geospatial Consortium (OGC) protocols. These services include data access, processing and visualization. Both data and algorithms can be accessed either programmatically, through OGC-compliant clients such as QGIS or ArcGIS, or a custom web interface.',
-            'version': '1.23.1',
-            'releaseTime': '2023-02-13T18:31:02Z',
+            'version': '1.23.2',
+            'releaseTime': '2023-02-17T02:54:37Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/config/finch/wps.cfg.template

@@ -1,6 +1,6 @@
 [server]
-outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs
-outputpath = /data/wpsoutputs
+outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs/finch
+outputpath = /data/wpsoutputs/finch
 
 # default 3mb, fix "Broken pipe" between the proxy and the wps service
 maxrequestsize = 400mb

birdhouse/config/flyingpigeon/wps.cfg.template

@@ -1,6 +1,6 @@
 [server]
-outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs
-outputpath = /data/wpsoutputs
+outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs/flyingpigeon
+outputpath = /data/wpsoutputs/flyingpigeon
 maxsingleinputsize = 2097152000.0
 
 [logging]

birdhouse/config/raven/wps.cfg.template

@@ -1,6 +1,6 @@
 [server]
-outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs
-outputpath = /data/wpsoutputs
+outputurl = https://${PAVICS_FQDN_PUBLIC}/wpsoutputs/raven
+outputpath = /data/wpsoutputs/raven
 
 # default 3mb, fix "Broken pipe" between the proxy and the wps service
 maxrequestsize = 100mb

birdhouse/pavics-compose.sh

@@ -222,6 +222,11 @@ do
       docker exec ${postgres_id} /postgres-setup.sh
     fi
 
+    # because server.outputpath in wps.cfg do not create the dir
+    for bird in finch flyingpigeon raven; do
+      docker exec $bird mkdir -p /data/wpsoutputs/$bird
+    done
+
     for adir in ${EXTRA_CONF_DIRS}; do
       COMPONENT_POST_COMPOSE_UP="$adir/post-docker-compose-up"
       if [ -x "$COMPONENT_POST_COMPOSE_UP" ]; then

docs/source/conf.py

@@ -69,9 +69,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '1.23.1'
+version = '1.23.2'
 # The full version, including alpha/beta/rc tags.
-release = '1.23.1'
+release = '1.23.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.