Refactor endpoint initialisation loop

This change refactors the endpoint initialisation, swapping list
comprehensions and functional loops to a more traditional sequential
style.

This allows for improved error handling and much better readability.

Author: Alex-Welsh

capi_janitor/openstack/openstack.py

@@ -187,18 +187,18 @@ async def __aenter__(self):
                 return self
             else:
                 raise
-        self._endpoints = {
-            entry["type"]: next(
-                ep["url"]
-                for ep in entry["endpoints"]
+        self._endpoints = {}
+        for entry in response.json()["catalog"]:
+            if not entry["endpoints"]:
+                continue
+
+            for ep in entry["endpoints"]:
                 if (
-                    ep["interface"] == self._interface
-                    and (not self._region or ep["region"] == self._region)
-                )
-            )
-            for entry in response.json()["catalog"]
-            if len(entry["endpoints"]) > 0
-        }
+                    ep.get("interface") == self._interface
+                    and (not self._region or ep.get("region_id") == self._region)
+                ):
+                    self._endpoints[entry["type"]] = ep["url"]
+                    break
         return self
 
     async def __aexit__(self, exc_type, exc_value, traceback):