components/ endpoint displays intended information after auto-deploy

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.26.5
+current_version = 1.26.6
 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-16T17:01:20Z
+search = {current_version} 2023-06-16T17:06:27Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-06-16T17:01:20Z
+values = 2023-06-16T17:06:27Z
 
 [bumpversion:file(version):birdhouse/config/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -17,6 +17,20 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[1.26.6](https://github.com/bird-house/birdhouse-deploy/tree/1.26.6) (2023-06-16)
+------------------------------------------------------------------------------------------------------------------
+
+## Fixes
+- `components/` endpoint displays intended information after auto-deploy
+
+  Previously, the script that generates the content for the `components/` endpoint
+  was using a feature of `grep` that is not supported by all versions of `grep`.
+  This meant that this script running in the auto-deployment docker container was
+  not able to properly parse the running components using `grep`. 
+  This fixes the issue by making the script compliant with all versions of `grep`.
+
+  Resolves https://github.com/bird-house/birdhouse-deploy/issues/342
+
 [1.26.5](https://github.com/bird-house/birdhouse-deploy/tree/1.26.5) (2023-06-16)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

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

RELEASE.txt

@@ -1 +1 @@
-1.26.5 2023-06-16T17:01:20Z
+1.26.6 2023-06-16T17:06:27Z

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.5',
-            'releaseTime': '2023-06-16T17:01:20Z',
+            'version': '1.26.6',
+            'releaseTime': '2023-06-16T17:06:27Z',
             '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.5',
-            'releaseTime': '2023-06-16T17:01:20Z',
+            'version': '1.26.6',
+            'releaseTime': '2023-06-16T17:06:27Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/scripts/get-components-json.include.sh

@@ -37,6 +37,8 @@ cd "${BIRDHOUSE_DEPLOY_COMPONENTS_ROOT}" || true  # ignore error for now, empty
 BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN="$( \
   ls -d1 ./*components/*/ ./config/*/ 2>/dev/null \
   | sed -E "s|\./(.*)/|\1|" \
+  | sed -E '/^[[:space:]]*$/d' \
+  | sed -E 's/^|[[:space:]]+/ -e /' \
 )"
 if [ -z "${BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN}" ]; then
   echo "[WARNING]" \
@@ -56,7 +58,7 @@ BIRDHOUSE_DEPLOY_COMPONENTS_LIST_ACTIVE=$( \
 BIRDHOUSE_DEPLOY_COMPONENTS_BASE="bird-house/birdhouse-deploy:"
 BIRDHOUSE_DEPLOY_COMPONENTS_LIST=$( \
   echo "${BIRDHOUSE_DEPLOY_COMPONENTS_LIST_ACTIVE}" \
-  | grep "${BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN}" \
+  | grep ${BIRDHOUSE_DEPLOY_COMPONENTS_LIST_KNOWN} \
   | sed -E 's|^\s*([A-Za-z0-0./_-]+)\s*$|"\1",|g' \
   | sed -E "s|^\"\./(.*)\"|\"${BIRDHOUSE_DEPLOY_COMPONENTS_BASE}\\1\"|g" \
   | sed '/^\n*$/d' \

docs/source/conf.py

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