Backport: fix upgrade script for 1.17 (#3825)

boefjes/tests/integration/test_bench.py

@@ -3,10 +3,11 @@
 from pathlib import Path
 
 import pytest
-from tools.upgrade_v1_16_0 import upgrade
+from tools.upgrade_v1_17_0 import upgrade
 
 from boefjes.clients.bytes_client import BytesAPIClient
 from boefjes.config import BASE_DIR
+from boefjes.models import Organisation
 from boefjes.sql.organisation_storage import SQLOrganisationStorage
 from octopoes.connector.octopoes import OctopoesAPIConnector
 from octopoes.models import Reference
@@ -25,6 +26,9 @@ def test_migration(
     octopoes_api_connector.session._timeout.connect = 60
     octopoes_api_connector.session._timeout.read = 60
 
+    # Create an organisation that does not exist in Octopoes
+    organisation_repository.create(Organisation(id="test2", name="Test 2"))
+
     iterations = 30
     cache_path = Path(BASE_DIR.parent / ".ci" / f".cache_{iterations}.json")
     hostname_range = range(0, iterations)

boefjes/tools/upgrade_v1_16_0.py → boefjes/tools/upgrade_v1_17_0.py

@@ -80,6 +80,17 @@ def migrate_organisation(
     and set the source_method to the boefje id. Then update the origin, i.e. save it and delete the old one.
     """
 
+    try:
+        connector.health()
+    except HTTPStatusError as e:
+        if e.response.status_code == 404:
+            logger.warning(
+                "Organisation found that does not exist in Octopoes [organisation_id=%s]. Make sure to remove this "
+                "organisation from the Katalogus database if it is no longer in use.",
+                organisation_id,
+            )
+        raise
+
     failed = 0
     processed = 0