From 664ca472d4a5cf147edba941772eb7ef51ec1d2b Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 5 Jun 2024 02:39:52 -0400 Subject: [PATCH 1/3] fix weaver data-source resolution for workflow steps --- CHANGES.md | 9 ++++++++- .../weaver/config/weaver/data_sources.yml.template | 2 +- birdhouse/components/weaver/docker-compose-extra.yml | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index b735e3253..a726bdcdb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -15,7 +15,14 @@ [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) +## Fixes +- Weaver: Adjust invalid `data_sources.yml` definitions. + + - Add the missing `data_sources.yml` volume mount for `weaver-worker`. + - When `weaver-worker` runs a `Workflow`, the nested `step` process locations need to be resolved according to the + current `"localhost"` instance. However, the Web API running in `weaver` service is not visible from the worker. + Since the configuration is shared between `weaver` and `weaver-worker`, use the public endpoint of `weaver` to + make process URL resolution consistent, and also provide more useful references in job logs when resolution fails. [2.4.0](https://github.com/bird-house/birdhouse-deploy/tree/2.4.0) (2024-06-04) ------------------------------------------------------------------------------------------------------------------ diff --git a/birdhouse/components/weaver/config/weaver/data_sources.yml.template b/birdhouse/components/weaver/config/weaver/data_sources.yml.template index 9e89fe777..7ad9dbb13 100644 --- a/birdhouse/components/weaver/config/weaver/data_sources.yml.template +++ b/birdhouse/components/weaver/config/weaver/data_sources.yml.template @@ -2,7 +2,7 @@ # Employed by default for looking at files available directly (e.g.: pre-fetched) localhost: netloc: "localhost" - ades: "http://localhost:4001" + ades: "https://${BIRDHOUSE_FQDN_PUBLIC}/${WEAVER_MANAGER_NAME}" default: true # Weaver self-reference, but using the exposed endpoint on the birdhouse instance diff --git a/birdhouse/components/weaver/docker-compose-extra.yml b/birdhouse/components/weaver/docker-compose-extra.yml index f1a7bf518..4fa6d5ee8 100644 --- a/birdhouse/components/weaver/docker-compose-extra.yml +++ b/birdhouse/components/weaver/docker-compose-extra.yml @@ -64,6 +64,7 @@ services: volumes: #- wps_private:/data/wps_private - ./components/weaver/config/weaver/weaver.ini:/opt/local/src/weaver/config/weaver.ini:ro + - ./components/weaver/config/weaver/data_sources.yml:/opt/local/src/weaver/config/data_sources.yml:ro - ./components/weaver/config/weaver/request_options.yml:/opt/local/src/weaver/config/request_options.yml:ro - ./components/weaver/celery-healthcheck:/opt/local/bin/weaver/celery-healthcheck:ro # WARNING: From fb27fbc8b96d30cfa1895744b1f0e91b7f635312 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 5 Jun 2024 18:21:49 -0400 Subject: [PATCH 2/3] minor patch README --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 1024eb7db..799775881 100644 --- a/README.rst +++ b/README.rst @@ -42,7 +42,7 @@ for a full-fledged production platform. Birdhouse ------- +--------- For GitHub navigation, see the following README pages: From c7507fefc6d069761ad5af6331c326269c8df216 Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Wed, 5 Jun 2024 18:22:09 -0400 Subject: [PATCH 3/3] =?UTF-8?q?Bump=20version:=202.4.0=20=E2=86=92=202.4.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 d84d38c28..965055dca 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 2.4.0 +current_version = 2.4.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} 2024-06-04T17:41:34Z +search = {current_version} 2024-06-05T22:22:08Z replace = {new_version} {utcnow:%Y-%m-%dT%H:%M:%SZ} [bumpversion:part:releaseTime] -values = 2024-06-04T17:41:34Z +values = 2024-06-05T22:22:08Z [bumpversion:file(version):birdhouse/components/canarie-api/docker_configuration.py.template] search = 'version': '{current_version}' diff --git a/CHANGES.md b/CHANGES.md index a726bdcdb..8891d9eaf 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.4.1](https://github.com/bird-house/birdhouse-deploy/tree/2.4.1) (2024-06-05) +------------------------------------------------------------------------------------------------------------------ + ## Fixes - Weaver: Adjust invalid `data_sources.yml` definitions. diff --git a/Makefile b/Makefile index 9cbbff73d..446cd102d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # Generic variables override SHELL := bash override APP_NAME := birdhouse-deploy -override APP_VERSION := 2.4.0 +override APP_VERSION := 2.4.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 799775881..860af920e 100644 --- a/README.rst +++ b/README.rst @@ -18,13 +18,13 @@ for a full-fledged production platform. * - citation - | |citation| -.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.4.0.svg +.. |commits-since| image:: https://img.shields.io/github/commits-since/bird-house/birdhouse-deploy/2.4.1.svg :alt: Commits since latest release - :target: https://github.com/bird-house/birdhouse-deploy/compare/2.4.0...master + :target: https://github.com/bird-house/birdhouse-deploy/compare/2.4.1...master -.. |latest-version| image:: https://img.shields.io/badge/tag-2.4.0-blue.svg?style=flat +.. |latest-version| image:: https://img.shields.io/badge/tag-2.4.1-blue.svg?style=flat :alt: Latest Tag - :target: https://github.com/bird-house/birdhouse-deploy/tree/2.4.0 + :target: https://github.com/bird-house/birdhouse-deploy/tree/2.4.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 e01e22df5..c0824ee0c 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -1 +1 @@ -2.4.0 2024-06-04T17:41:34Z +2.4.1 2024-06-05T22:22:08Z diff --git a/birdhouse/components/canarie-api/docker_configuration.py.template b/birdhouse/components/canarie-api/docker_configuration.py.template index 154e157c7..8cdc6b9cd 100644 --- a/birdhouse/components/canarie-api/docker_configuration.py.template +++ b/birdhouse/components/canarie-api/docker_configuration.py.template @@ -108,8 +108,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.4.0', - 'releaseTime': '2024-06-04T17:41:34Z', + 'version': '2.4.1', + 'releaseTime': '2024-06-05T22:22:08Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', @@ -141,8 +141,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.4.0', - 'releaseTime': '2024-06-04T17:41:34Z', + 'version': '2.4.1', + 'releaseTime': '2024-06-05T22:22:08Z', 'institution': '${BIRDHOUSE_INSTITUTION}', 'researchSubject': '${BIRDHOUSE_SUBJECT}', 'supportEmail': '${BIRDHOUSE_SUPPORT_EMAIL}', diff --git a/docs/source/conf.py b/docs/source/conf.py index 24ad705cf..dccaf0031 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -69,9 +69,9 @@ # built documents. # # The short X.Y version. -version = '2.4.0' +version = '2.4.1' # The full version, including alpha/beta/rc tags. -release = '2.4.0' +release = '2.4.1' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.