gitadmin
/
ansible-netbird
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moving over to a regular old exception

This commit is contained in:
Mark J. Horninger 2024-03-10 22:31:40 -04:00
parent 51cd4c0851
commit 87549bd54b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plugins/inventory/netbird.py
View File

@ -152,7 +152,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
try: try:
self.peers = self.client.ListPeers() self.peers = self.client.ListPeers()
except Exception as e: except Exception as e:
raise AnsibleError(f"Could not retrieve the Netbird inventory: {e.message}") raise AnsibleError from e
def _filter_by_config(self): def _filter_by_config(self):
"""Filter peers by user specified configuration.""" """Filter peers by user specified configuration."""
@ -290,11 +290,8 @@ class NetbirdApi:
} }
peers = [] peers = []
response = requests.request("GET", url, headers=headers) response = requests.request("GET", url, headers=headers)
if response.status_code in [401]: if re.match('4\\d\\d', response.status_code):
raise ConnectionRefusedError(f"{response.status_code}: {response.text}\nPlease check the API Key and URL.") raise Exception(f"{response.status_code}: {response.text}\nPlease check the API Key and URL.")
elif re.match('4\\d\\d', response.status_code):
raise ConnectionError(f"{response.status_code}: {response.text}\nPlease check the API Key and URL.")
peer_json = json.loads(response.text) peer_json = json.loads(response.text)
for current_peer_map in peer_json: for current_peer_map in peer_json: