From 0361979f507f558aeae662f39a61a0095bca1c93 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Tue, 19 Mar 2024 16:20:44 -0400
Subject: [PATCH 1/5] weaver: bump version to 5.1.0

---
 CHANGES.md                              | 4 +++-
 birdhouse/components/weaver/default.env | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 5e9e05a9..a65633ac 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
+
+- Weaver: bump version to 5.1.0
 
 [2.1.1](https://github.com/bird-house/birdhouse-deploy/tree/2.1.1) (2024-03-06)
 ------------------------------------------------------------------------------------------------------------------
diff --git a/birdhouse/components/weaver/default.env b/birdhouse/components/weaver/default.env
index 6dccc837..334bd7d4 100644
--- a/birdhouse/components/weaver/default.env
+++ b/birdhouse/components/weaver/default.env
@@ -47,7 +47,7 @@ OPTIONAL_VARS="
 export WEAVER_CONFIG=HYBRID
 
 # default release version that will be used to fetch docker images (API mananger & celery workers services)
-export WEAVER_VERSION=4.32.0
+export WEAVER_VERSION=5.1.0
 
 # default release of the MongoDB version employed by Weaver
 # NOTE:

From a1b735159eb64fd643d39909699131e47239001d Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Wed, 20 Mar 2024 08:45:03 -0400
Subject: [PATCH 2/5] bump weaver to 5.1.1

---
 CHANGES.md                              | 2 +-
 birdhouse/components/weaver/default.env | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index a65633ac..27262fb9 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -17,7 +17,7 @@
 
 ## Changes
 
-- Weaver: bump version to 5.1.0
+- Weaver: bump version to 5.1.1
 
 [2.1.1](https://github.com/bird-house/birdhouse-deploy/tree/2.1.1) (2024-03-06)
 ------------------------------------------------------------------------------------------------------------------
diff --git a/birdhouse/components/weaver/default.env b/birdhouse/components/weaver/default.env
index 334bd7d4..d93004a9 100644
--- a/birdhouse/components/weaver/default.env
+++ b/birdhouse/components/weaver/default.env
@@ -47,7 +47,7 @@ OPTIONAL_VARS="
 export WEAVER_CONFIG=HYBRID
 
 # default release version that will be used to fetch docker images (API mananger & celery workers services)
-export WEAVER_VERSION=5.1.0
+export WEAVER_VERSION=5.1.1
 
 # default release of the MongoDB version employed by Weaver
 # NOTE:

From fe00b80f0e220b1070c19259755df76f858e73fa Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Mon, 25 Mar 2024 11:12:44 -0400
Subject: [PATCH 3/5] update Changes

---
 CHANGES.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index 8c32e021..a57496fe 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -19,6 +19,9 @@
 
 - Weaver: bump version to 5.1.1
 
+  - See changes in the [Weaver changes 
+    file](https://github.com/crim-ca/weaver/blob/ec5f403958de21e1af27ff86da391d0d53ded5d9/CHANGES.rst?plain=1#L23-L249)
+
 [2.1.2](https://github.com/bird-house/birdhouse-deploy/tree/2.1.2) (2024-03-25)
 ------------------------------------------------------------------------------------------------------------------
 

From e6021c85d1d8cf8cd56c1df8d23b8ed50daa6e1b Mon Sep 17 00:00:00 2001
From: Francis Charette Migneault <francis.charette.migneault@gmail.com>
Date: Tue, 23 Apr 2024 10:41:10 -0400
Subject: [PATCH 4/5] fix weaver failing wps retry on unresolved network + fix
 weaver wps retry going +1 index

---
 CHANGES.md                                         | 8 ++++++++
 birdhouse/components/weaver/post-docker-compose-up | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 33664081..5a92ba77 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,14 @@
   - See changes in the [Weaver changes 
     file](https://github.com/crim-ca/weaver/blob/ec5f403958de21e1af27ff86da391d0d53ded5d9/CHANGES.rst?plain=1#L23-L249)
 
+## Fixes
+
+- Weaver: WPS retry logic on post-compose step.
+  - Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
+    against the running services (WPS bird providers, Weave and Magpie). In some cases, this network would not
+    be automatically resolved.
+  - Fix the index used during HTTP request retry to avoid going one step over the intended retry attempts.
+
 [2.2.0](https://github.com/bird-house/birdhouse-deploy/tree/2.2.0) (2024-04-18)
 ------------------------------------------------------------------------------------------------------------------
 
diff --git a/birdhouse/components/weaver/post-docker-compose-up b/birdhouse/components/weaver/post-docker-compose-up
index 29e90c1d..be366928 100755
--- a/birdhouse/components/weaver/post-docker-compose-up
+++ b/birdhouse/components/weaver/post-docker-compose-up
@@ -120,7 +120,7 @@ RANDOM_NUMBER=${RANDOM:-$(tr -dc 0-9 < /dev/urandom 2>/dev/null | head -c 5)}
 # To know when a docker run was started in case it hangs.
 DOCKER_RUN_TAG="weaver_post_curl_$(date -Isecond | sed 's/:/_/g' | sed 's/+/p/g')_${RANDOM_NUMBER}"
 curl_cmd() {
-    docker run --rm --name "${DOCKER_RUN_TAG}" "${WEAVER_CURL_IMAGE}" "$@"
+    docker run --network birdhouse_default --rm --name "${DOCKER_RUN_TAG}" "${WEAVER_CURL_IMAGE}" "$@"
 }
 
 # pull image if missing to avoid mangling output messages on first call
@@ -317,7 +317,7 @@ for prov in ${WEAVER_WPS_PROVIDERS}; do
         if [ ${ret} -ne 0 ] || [ "${code}" -ne 201 ]; then
             printf "\n%s\n" "${WARN}Failed registration of remote WPS provider [${prov}] on [${prov_url}]${retry_msg}."
             printf "Error:\n%s\n" "${body}"
-            if [ ${retry} -gt ${total} ]; then
+            if [ ${retry} -ge ${total} ]; then
               echo "${ERROR}Maximum retry attempts ${total} reached for WPS provider [${prov}]. Aborting."
               reset_state
               exit 23

From d1e5e3bfc5bf95e87f0ee648c107871d35256c63 Mon Sep 17 00:00:00 2001
From: mishaschwartz <4380924+mishaschwartz@users.noreply.github.com>
Date: Thu, 23 May 2024 10:45:18 -0400
Subject: [PATCH 5/5] fix CHANGES.md after merge

---
 CHANGES.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 3079a7c0..5d5e2670 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -22,6 +22,12 @@
   - See changes in the [Weaver changes 
     file](https://github.com/crim-ca/weaver/blob/ec5f403958de21e1af27ff86da391d0d53ded5d9/CHANGES.rst?plain=1#L23-L249)
 
+- Weaver: WPS retry logic on post-compose step.
+  - Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
+    against the running services (WPS bird providers, Weave and Magpie). In some cases, this network would not
+    be automatically resolved.
+  - Fix the index used during HTTP request retry to avoid going one step over the intended retry attempts.
+
 [2.3.1](https://github.com/bird-house/birdhouse-deploy/tree/2.3.1) (2024-05-21)
 ------------------------------------------------------------------------------------------------------------------
 
@@ -71,12 +77,6 @@
 
 ## Fixes
 
-- Weaver: WPS retry logic on post-compose step.
-  - Apply `--network birdhouse_default` to the Docker `curl` image to allow HTTP requests to properly resolve
-    against the running services (WPS bird providers, Weave and Magpie). In some cases, this network would not
-    be automatically resolved.
-  - Fix the index used during HTTP request retry to avoid going one step over the intended retry attempts.
-
 - docs: Fix version of `sphinx-mdinclude` to address incompatible `docutils` operation under ReadTheDocs Sphinx build.
 
   - See [docutils 0.21 changes](https://docutils.sourceforge.io/RELEASE-NOTES.html#release-0-21-2024-04-09).