Document extra reason to allow not existing dir in EXTRA_CONF_DIRS, fix unable to change Twitcher logging level

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.0
+current_version = 2.0.1
 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-12-11T14:46:41Z
+search = {current_version} 2023-12-11T22:30:20Z
 replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ}
 
 [bumpversion:part:releaseTime]
-values = 2023-12-11T14:46:41Z
+values = 2023-12-11T22:30:20Z
 
 [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template]
 search = 'version': '{current_version}'

CHANGES.md

@@ -17,6 +17,16 @@
 
 [//]: # (list changes here, using '-' for each new entry, remove this when items are added)
 
+[2.0.1](https://github.com/bird-house/birdhouse-deploy/tree/2.0.1) (2023-12-11)
+------------------------------------------------------------------------------------------------------------------
+
+## Changes
+- Code documentation: provide an additional reason to not exit early if a directory listed in the `EXTRA_CONF_DIRS` variable does not exist.
+
+## Fixes
+- Twitcher: unable to change log level because of typo in qualname config
+
+
 [2.0.0](https://github.com/bird-house/birdhouse-deploy/tree/2.0.0) (2023-12-11)
 ------------------------------------------------------------------------------------------------------------------
 

Makefile

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

RELEASE.txt

@@ -1 +1 @@
-2.0.0 2023-12-11T14:46:41Z
+2.0.1 2023-12-11T22:30:20Z

birdhouse/components/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': '2.0.0',
-            'releaseTime': '2023-12-11T14:46:41Z',
+            'version': '2.0.1',
+            'releaseTime': '2023-12-11T22:30:20Z',
             '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': '2.0.0',
-            'releaseTime': '2023-12-11T14:46:41Z',
+            'version': '2.0.1',
+            'releaseTime': '2023-12-11T22:30:20Z',
             'institution': 'Ouranos',
             'researchSubject': 'Climatology',
             'supportEmail': '${SUPPORT_EMAIL}',

birdhouse/components/twitcher/twitcher.ini.template

@@ -112,7 +112,7 @@ handlers = console
 # "level = WARN"    only potential problems/unexpected results reported, such as when caching is employed
 level = ${TWITCHER_LOG_LEVEL}
 handlers =
-qualname = twitcher
+qualname = TWITCHER
 
 # MagpieAdapter or any other Magpie utilities it employs through Twitcher proxy-adapter security check
 [logger_magpie]

birdhouse/deployment/certbotwrapper

@@ -52,7 +52,7 @@ SAVED_PWD="`pwd`"
 
 . "$THIS_DIR/../read-configs.include.sh"
 
-# Get PAVICS_FQDN_PUBLIC, PAVICS_FQDN, SUPPORT_EMAIL, SSL_CERTIFICATE.
+# Get PAVICS_FQDN_PUBLIC, PAVICS_FQDN, SUPPORT_EMAIL, SSL_CERTIFICATE, BASH_IMAGE.
 read_configs
 
 CERT_DOMAIN="$PAVICS_FQDN_PUBLIC"

birdhouse/read-configs.include.sh

@@ -126,6 +126,14 @@ source_conf_files() {
           # fix immediately.
           # The new adir with typo will not be active but at least all the existing
           # will still work.
+          #
+          # Allowing not existing conf dir also helps for smooth
+          # transition of component path when they are new/renamed/deleted.
+          #
+          # New component names can be added to EXTRA_CONF_DIRS before the
+          # corresponding PR are merged and old component names can be removed
+          # after the corresponding PR are merge without any impact on the
+          # autodeploy process.
           echo "WARNING: '$adir' in $conf_locations does not exist" 1>&2
       fi
       if [ -f "$adir/default.env" ]; then

docs/source/conf.py

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