From 172ba133ee3fc721545abf890c8a497d644d62fa Mon Sep 17 00:00:00 2001 From: Long Vu Date: Thu, 27 Jul 2023 12:09:14 -0400 Subject: [PATCH 1/6] certbotwrapper: update comment where var BASH_IMAGE comes from --- birdhouse/deployment/certbotwrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/birdhouse/deployment/certbotwrapper b/birdhouse/deployment/certbotwrapper index b30789da8..4cc3769dc 100755 --- a/birdhouse/deployment/certbotwrapper +++ b/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" From 838ee0fd26dc6925e5143bf907d0b6488b8c97ee Mon Sep 17 00:00:00 2001 From: Long Vu Date: Wed, 20 Sep 2023 17:52:24 -0400 Subject: [PATCH 2/6] config: document another reason to allow not existing conf dir in EXTRA_CONF_DIRS --- birdhouse/read-configs.include.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/birdhouse/read-configs.include.sh b/birdhouse/read-configs.include.sh index 85f4950dc..6d02edd1f 100644 --- a/birdhouse/read-configs.include.sh +++ b/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. + # + # Do not exit on not existing conf dir also allow 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 From 6e60c56130ac3eb2a71735f02f866f7a14f25e96 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 8 Dec 2023 22:33:00 -0500 Subject: [PATCH 3/6] CHANGES: extra reason to allow not existing dir in `EXTRA_CONF_DIRS` --- CHANGES.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 44e423220..2d978f4b3 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,9 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ -[//]: # (list changes here, using '-' for each new entry, remove this when items are added) +## Changes +- Code documentation: extra reason to allow not existing dir in `EXTRA_CONF_DIRS` + [1.42.2](https://github.com/bird-house/birdhouse-deploy/tree/1.42.2) (2023-12-08) ------------------------------------------------------------------------------------------------------------------ From bda91a77b52b131e5a9be7167bb3886d56d3df2a Mon Sep 17 00:00:00 2001 From: Long Vu Date: Fri, 8 Dec 2023 22:37:26 -0500 Subject: [PATCH 4/6] twitcher: fix unable to change log level because of typo in qualname config --- CHANGES.md | 3 +++ birdhouse/config/twitcher/twitcher.ini.template | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES.md b/CHANGES.md index 2d978f4b3..67fcf40de 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -18,6 +18,9 @@ ## Changes - Code documentation: extra reason to allow not existing dir in `EXTRA_CONF_DIRS` +## Fixes +- Twitcher: unable to change log level because of typo in qualname config + [1.42.2](https://github.com/bird-house/birdhouse-deploy/tree/1.42.2) (2023-12-08) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/config/twitcher/twitcher.ini.template b/birdhouse/config/twitcher/twitcher.ini.template index 8e5f2437b..9bfc8ece7 100644 --- a/birdhouse/config/twitcher/twitcher.ini.template +++ b/birdhouse/config/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] From a527e998fa3bfc77dd8a7e2556fde584c308c598 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Mon, 11 Dec 2023 14:29:28 -0500 Subject: [PATCH 5/6] update comment per review feedback --- CHANGES.md | 2 +- birdhouse/read-configs.include.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index afe178305..af5463bea 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -16,7 +16,7 @@ ------------------------------------------------------------------------------------------------------------------ ## Changes -- Code documentation: extra reason to allow not existing dir in `EXTRA_CONF_DIRS` +- 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 diff --git a/birdhouse/read-configs.include.sh b/birdhouse/read-configs.include.sh index 691bd9044..6e9c56007 100644 --- a/birdhouse/read-configs.include.sh +++ b/birdhouse/read-configs.include.sh @@ -127,7 +127,7 @@ source_conf_files() { # The new adir with typo will not be active but at least all the existing # will still work. # - # Do not exit on not existing conf dir also allow for smooth + # 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 From eb751060d346c100bfccbcd6cc767f5b5c74b016 Mon Sep 17 00:00:00 2001 From: Long Vu Date: Mon, 11 Dec 2023 17:30:20 -0500 Subject: [PATCH 6/6] =?UTF-8?q?Bump=20version:=202.0.0=20=E2=86=92=202.0.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 6 +++--- CHANGES.md | 5 +++++ Makefile | 2 +- README.rst | 8 ++++---- RELEASE.txt | 2 +- .../canarie-api/docker_configuration.py.template | 8 ++++---- docs/source/conf.py | 4 ++-- 7 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 7c702806f..b98a4c202 100644 --- a/.bumpversion.cfg +++ b/.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}' diff --git a/CHANGES.md b/CHANGES.md index af5463bea..ee8768271 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,6 +15,11 @@ [Unreleased](https://github.com/bird-house/birdhouse-deploy/tree/master) (latest) ------------------------------------------------------------------------------------------------------------------ +[//]: # (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. diff --git a/Makefile b/Makefile index 21e7da382..82997cab7 100644 --- a/Makefile +++ b/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") diff --git a/README.rst b/README.rst index f978d558d..11bfffdb6 100644 --- a/README.rst +++ b/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) diff --git a/RELEASE.txt b/RELEASE.txt index 2433f8ca1..99eb908c5 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.0.0 2023-12-11T14:46:41Z +2.0.1 2023-12-11T22:30:20Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index 473e8bdcc..3e70d2735 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/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}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 53b636c92..30889a14e 100644 --- a/docs/source/conf.py +++ b/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.