Fix Cowbird's sync_permissions config which used invalid Magpie ser…

…vice types (#336)

## Overview

In the cowbird `config.yml.template` file: the `wps_outputs` and
`weaver` keys are supposed to be Magpie service types, not magpie
service names. This causes all cowbird hooks to fail with:

```
cowbird.config.ConfigErrorInvalidServiceKey: Service `weaver` used in sync config is not valid since it was not found in Magpie services (['access', 'api', 'geoserver', 'geoserverwfs', 'geoserverwms', 'geoserverwps', 'ncwms', 'thredds', 'wfs', 'wps']).
```

This fix is already implemented in #323 but since that is waiting on
Ouranosinc/cowbird#35 to get pulled in, this PR
factors out the bugfix that isn't dependent on the cowbird PR.

This allows us to fix this configuration bug in the meantime

## Changes

**Non-breaking changes**

None (bug fix)

**Breaking changes**

None

## Related Issue / Discussion

## Additional Information

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.26.8
+current_version = 1.26.9
 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-06-22T21:22:08Z
+search = {current_version} 2023-07-04T12:44:10Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-06-22T21:22:08Z
+values = 2023-07-04T12:44:10Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -17,6 +17,13 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.26.9](https://github.com/bird-house/birdhouse-deploy/tree/1.26.9) (2023-07-04)
+------------------------------------------------------------------------------------------------------------------
+
+## Fixes
+
+- Fix Cowbird's `sync_permissions` config which used invalid Magpie service types.
+
 [1.26.8](https://github.com/bird-house/birdhouse-deploy/tree/1.26.8) (2023-06-22)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

@@ -1,7 +1,7 @@
 # Generic variables
 override SHELL       := bash
 override APP_NAME    := birdhouse-deploy
-override APP_VERSION := 1.26.8
+override APP_VERSION := 1.26.9
 
 # 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.26.8.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/1.26.9.svg
     :alt: Commits since latest release
-    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.26.8...master
+    :target: https://github.com/bird-house/birdhouse-deploy/compare/1.26.9...master
 
-.. |latest-version| image:: https://img.shields.io/badge/tag-1.26.8-blue.svg?style=flat
+.. |latest-version| image:: https://img.shields.io/badge/tag-1.26.9-blue.svg?style=flat
     :alt: Latest Tag
-    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.26.8
+    :target: https://github.com/bird-house/birdhouse-deploy/tree/1.26.9
 
 .. |readthedocs| image:: https://readthedocs.org/projects/birdhouse-deploy/badge/?version=latest
     :alt: ReadTheDocs Build Status (latest version)

RELEASE.txt

@@ -1 +1 @@
-1.26.8 2023-06-22T21:22:08Z
+1.26.9 2023-07-04T12:44:10Z

birdhouse/components/cowbird/config/cowbird/config.yml.template

@@ -41,8 +41,8 @@ sync_permissions:
     # For more info on the services available in Magpie :
     #     https://pavics-magpie.readthedocs.io/en/latest/services.html#available-services
     #     https://pavics-magpie.readthedocs.io/en/latest/autoapi/magpie/services/index.html
-    services: # Contains the different resources that can be synchronized, ordered by service
-      thredds: # Service name, which should also exist in Magpie
+    services: # Contains the different resources that can be synchronized, ordered by service type
+      thredds: # Service type, which should also exist in Magpie
         # Resource key (ex.: thredds_workspace): Custom name to represent a resource path.
         #
         # Example of resource that uses variables and a `MULTI_TOKEN`.
@@ -107,7 +107,7 @@ sync_permissions:
       - "geoserver_workspace : createStoredQuery <-> thredds_workspace : write"
   weaver_outputs:
     services:
-      weaver:
+      api:
         process_description:
           - name: weaver
             type: service
@@ -153,8 +153,7 @@ sync_permissions:
             type: route
           - name: "{outputID}"
             type: route
-      # see 'optional-components/secure-data-proxy' for more details on protected WPS-outputs
-      wps_outputs:
+        # see 'optional-components/secure-data-proxy' for more details on protected WPS-outputs
         # /wpsoutputs/weaver/{public|<user-id>}/{job-id}
         weaver_wps_outputs:
           - name: secure-data-proxy

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

@@ -109,8 +109,8 @@ SERVICES = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.26.8',
-            'releaseTime': '2023-06-22T21:22:08Z',
+            'version': '1.26.9',
+            'releaseTime': '2023-07-04T12:44:10Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',
@@ -142,8 +142,8 @@ PLATFORMS = {
             # NOTE:
             #   Below version and release time auto-managed by 'make VERSION=x.y.z bump'.
             #   Do NOT modify it manually. See 'Tagging policy' in 'birdhouse/README.rst'.
-            'version': '1.26.8',
-            'releaseTime': '2023-06-22T21:22:08Z',
+            'version': '1.26.9',
+            'releaseTime': '2023-07-04T12:44:10Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

docs/source/conf.py

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