Skip to content
Merged
Changes from all commits
Commits
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
17 changes: 14 additions & 3 deletions src/cdpy/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
from cdpcli.client import ClientCreator, Context
from cdpcli.credentials import Credentials
from cdpcli.endpoint import EndpointCreator, EndpointResolver
from cdpcli.exceptions import ClientError
from cdpcli.exceptions import ClientError, ParamValidationError
from cdpcli.loader import Loader
from cdpcli.parser import ResponseParserFactory
from cdpcli.retryhandler import create_retry_handler
Expand Down Expand Up @@ -65,13 +65,23 @@ def __init__(self, base_error, *args):
except KeyError:
self.error_code = ''
self.violations = _violations
self.message = _violations
self.message = "Client request error"
self.status_code = _payload.group(1)
self.rc = 1
self.service = _payload.group(3)
self.operation = _payload.group(4)
self.request_id = _payload.group(5)

if isinstance(self.base_error, ParamValidationError):
_PARAM_ERROR_PATTERN = re.compile(
r"Parameter validation failed:\n([\s\S]*)"
)
_payload = re.search(_PARAM_ERROR_PATTERN, str(self.base_error))
_violations = _payload.group(1).split('\n')
self.violations = _violations
self.message = "Parameter validation error"
self.error_code = 'PARAMETER_VALIDATION_ERROR'

super().__init__(base_error, *args)

def update(self, *args, **kwargs):
Expand Down Expand Up @@ -186,6 +196,7 @@ def _warning_format(message, category, filename, lineno, line=None):
'STOP_IN_PROGRESS',
'STOPPED',
'ENV_STOPPED',
'Stopped', # DW
'NOT_ENABLED' # DF
]

Expand All @@ -207,7 +218,7 @@ def _warning_format(message, category, filename, lineno, line=None):
'AVAILABLE', 'UPDATE_FAILED', 'CREATE_FAILED', 'ENABLE_SECURITY_FAILED', 'DELETE_FAILED',
'DELETE_COMPLETED', 'DELETED_ON_PROVIDER_SIDE', 'STOPPED', 'START_FAILED', 'STOP_FAILED',
'installation:failed', 'deprovision:failed', 'installation:finished', # ML
'Error', 'Running', # DW
'Error', 'Running', 'Stopped', 'Deleting', # DW
'GOOD_HEALTH', 'CONCERNING_HEALTH', 'BAD_HEALTH', # DF
]

Expand Down