Skip to content
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

Jump to bottom

CASMPET-6723 catch UnicodeDecodeError from os/run_command #54

Merged
merged 12 commits into from
Aug 10, 2023
Merged

CASMPET-6723 catch UnicodeDecodeError from os/run_command #54

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1c141d7
CASMPET-6723 raise a UnicodeDecodeError from run_command function
leliasen-hpe Aug 1, 2023
325fadd
CASMPET-6723 fix test for unicode run_command error
leliasen-hpe Aug 2, 2023
84c4714
CSAMPET-6723 remove trailing whitespace
leliasen-hpe Aug 2, 2023
cdae3a6
CASMPET-6723 remove whitespace in hsm_components_url
leliasen-hpe Aug 2, 2023
6ef5db9
Make decoding a parameter
rustydb Aug 9, 2023
b8ce6ea
CASMPET-6723 catch jsonDecodeError if request returns bad json
leliasen-hpe Aug 9, 2023
545cb6a
CASMPET-6723 fixed 'response' spelling
leliasen-hpe Aug 9, 2023
7792d4f
CASMPET-6723 fixing python lint
leliasen-hpe Aug 9, 2023
4543649
CASMPET-6723 change JSONDecodeError to ValueError
leliasen-hpe Aug 10, 2023
51176e8
CASMPET-6723 reformat printed strings
leliasen-hpe Aug 10, 2023
847e4d7
CASMPET-6723 fix line length and indentation
leliasen-hpe Aug 10, 2023
0b07ec8
Merge branch 'main' into CASMPET-6723
leliasen-hpe Aug 10, 2023
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
9 changes: 4 additions & 5 deletions libcsm/sls/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"""

import http
from json import JSONDecodeError
import requests
from libcsm import api
from libcsm.requests.session import get_session
Expand Down Expand Up @@ -69,8 +68,8 @@ def get_xname(self, hostname: str) -> str:
"""
try:
components_response = (self.get_management_components_from_sls()).json()
except JSONDecodeError as error:
raise JSONDecodeError(f'ERROR did not get valid json for management components \
rustydb marked this conversation as resolved.
Show resolved Hide resolved
except ValueError as error:
raise ValueError(f'ERROR did not get valid json for management components \
from sls. {error}') from error

for node in components_response:
Expand All @@ -89,8 +88,8 @@ def get_hostname(self, xname: str) -> str:
"""
try:
components_response = (self.get_management_components_from_sls()).json()
except JSONDecodeError as error:
raise JSONDecodeError(f'ERROR did not get valid json for management components \
except ValueError as error:
raise ValueError(f'ERROR did not get valid json for management components \
from sls. {error}') from error

for node in components_response:
Expand Down
3 changes: 1 addition & 2 deletions libcsm/sls/get_hostname.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"""

import sys
from json import JSONDecodeError
import click
import requests
from libcsm.sls import api
Expand All @@ -46,6 +45,6 @@ def main(xname, api_gateway_address) -> None:
sls_api = api.API(api_gateway_address)
try:
print(sls_api.get_hostname(xname))
except (requests.exceptions.RequestException, KeyError, ValueError, JSONDecodeError) as error:
except (requests.exceptions.RequestException, KeyError, ValueError) as error:
print(f'{error}')
sys.exit(1)
3 changes: 1 addition & 2 deletions libcsm/sls/get_xname.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
"""

import sys
from json import JSONDecodeError
import click
import requests
from libcsm.sls import api
Expand All @@ -46,6 +45,6 @@ def main(hostname, api_gateway_address) -> None:
sls_api = api.API(api_gateway_address)
try:
print(sls_api.get_xname(hostname))
except (requests.exceptions.RequestException, KeyError, ValueError, JSONDecodeError) as error:
except (requests.exceptions.RequestException, KeyError, ValueError) as error:
print(f'{error}')
sys.exit(1)