Skip to content

Filter endpoint catalog by app cred region #117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mkjpryor merged 4 commits into from
Nov 7, 2024
Merged

Filter endpoint catalog by app cred region #117

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bb3c59f
Filter endpoint catalog by app cred region
sd109 Nov 6, 2024
544ad59
Refine endpoint filtering behaviour
sd109 Nov 6, 2024
1c6f929
Fix function arg
sd109 Nov 6, 2024
e63655e
Address review comments
sd109 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions capi_janitor/openstack/openstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,12 @@ class Cloud:
"""
Object for interacting with OpenStack clouds.
"""
def __init__(self, auth, transport, interface):
def __init__(self, auth, transport, interface, region = None):
self._auth = auth
self._transport = transport
self._interface = interface
self._endpoints = {}
self._region = region
# A map of api name to client
self._clients = {}

Expand All @@ -177,7 +178,10 @@ async def __aenter__(self):
entry["type"]: next(
ep["url"]
for ep in entry["endpoints"]
if ep["interface"] == self._interface
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
Expand Down Expand Up @@ -232,10 +236,11 @@ def from_clouds(cls, clouds, cloud, cacert):
config["auth"]["application_credential_id"],
config["auth"]["application_credential_secret"]
)
region = config.get("region_name")
# Create a default context using the verification from the config
context = httpx.create_ssl_context(verify = config.get("verify", True))
# If a cacert was given, load it into the context
if cacert is not None:
context.load_verify_locations(cadata = cacert)
transport = httpx.AsyncHTTPTransport(verify = context)
return cls(auth, transport, config.get("interface", "public"))
return cls(auth, transport, config.get("interface", "public"), region)
Loading