Merge pull request #3 from cloudera-labs/devel

Fix Error messages not always containing standard fields and strings.

Author: Chaffelson

README.rst

@@ -16,6 +16,10 @@ For General usage, installed from cmdline ::
 
     pip install cdpy
 
+To install the development branch instead of main ::
+
+    git+git://github.com/cloudera-labs/cdpy@devel#egg=cdpy
+
 Usage
 =====
 Note that this readme covers usage of this wrapper library only, for details of CDPCLI and underlying commands please see the CDPCLI documentation.
@@ -100,8 +104,8 @@ This example also demonstrates bypassing the Squelch error handler to implement
     )
     if isinstance(resp, CdpError):
         if resp.error_code == 'INVALID_ARGUMENT':
-            if 'constraintViolations' not in resp.violations:
-                resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(resp.violations))
+            if 'constraintViolations' not in str(resp.violations):
+                resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(str(resp.violations)))
                 self.sdk.throw_warning(resp)
         self.sdk.throw_error(resp)
     return resp

src/cdpy/common.py

@@ -55,8 +55,14 @@ def __init__(self, base_error, *args):
             try:
                 _violations = json.loads(html.unescape(self.base_error.response['error']['message']))
             except JSONDecodeError:
-                _violations = self.base_error.response['error']['message']
-            self.error_code = self.base_error.response['error']['code']
+                try:
+                    _violations = self.base_error.response['error']['message']
+                except KeyError:
+                    _violations = self.base_error.args[0]
+            try:
+                self.error_code = self.base_error.response['error']['code']
+            except KeyError:
+                self.error_code = ''
             self.violations = _violations
             self.status_code = _payload.group(1)
             self.rc = 1

src/cdpy/environments.py

@@ -61,7 +61,7 @@ def describe_environment(self, name):
                 # Describe will fail in certain fault scenarios early in Environment creation
                 # We helpfully provide the summary listing as a backup set of information
                 # If the environment truly does not exist, then this will give the same response
-                self.sdk.throw_warning(CdpWarning(resp.violations))
+                self.sdk.throw_warning(CdpWarning(str(resp.violations)))
                 return self.summarize_environment(name)
             self.sdk.throw_error(resp)
         return resp
@@ -105,9 +105,9 @@ def create_aws_environment(self, **kwargs):
         )
         if isinstance(resp, CdpError):
             if resp.error_code == 'INVALID_ARGUMENT':
-                if 'constraintViolations' not in resp.violations:
-                    resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(resp.violations))
-                    self.sdk.throw_warning(CdpWarning(resp.violations))
+                if 'constraintViolations' not in str(resp.violations):
+                    resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(str(resp.violations)))
+                    self.sdk.throw_warning(CdpWarning(str(resp.violations)))
             self.sdk.throw_error(resp)
         return resp
 
@@ -119,9 +119,9 @@ def create_azure_environment(self, **kwargs):
         )
         if isinstance(resp, CdpError):
             if resp.error_code == 'INVALID_ARGUMENT':
-                if 'constraintViolations' not in resp.violations:
-                    resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(resp.violations))
-                    self.sdk.throw_warning(CdpWarning(resp.violations))
+                if 'constraintViolations' not in str(resp.violations):
+                    resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(str(resp.violations)))
+                    self.sdk.throw_warning(CdpWarning(str(resp.violations)))
             self.sdk.throw_error(resp)
         return resp
 
@@ -133,9 +133,9 @@ def create_gcp_environment(self, **kwargs):
         )
         if isinstance(resp, CdpError):
             if resp.error_code == 'INVALID_ARGUMENT':
-                if 'constraintViolations' not in resp.violations:
-                    resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(resp.violations))
-                    self.sdk.throw_warning(CdpWarning(resp.violations))
+                if 'constraintViolations' not in str(resp.violations):
+                    resp.update(message="Received violation warning:\n%s" % self.sdk.dumps(str(resp.violations)))
+                    self.sdk.throw_warning(CdpWarning(str(resp.violations)))
             self.sdk.throw_error(resp)
         return resp
 
@@ -205,7 +205,7 @@ def sync_users(self, environments=None):
         )
         if isinstance(resp, CdpError):
             if resp.error_code == 'CONFLICT':
-                operation_match = self.sdk.regex_search(self.sdk.OPERATION_REGEX, resp.violations)
+                operation_match = self.sdk.regex_search(self.sdk.OPERATION_REGEX, str(resp.violations))
                 if operation_match is not None:
                     existing_op_id = operation_match.group(1)
                     if not self.sdk.strict_errors:
@@ -264,11 +264,11 @@ def create_aws_credential(self, name, role, description, retries=3, delay=2):
                 consistency_violations = [
                     'Unable to verify credential', 'sts:AssumeRole', 'You are not authorized'
                 ]
-                if any(x in resp.violations for x in consistency_violations):
+                if any(x in str(resp.violations) for x in consistency_violations):
                     retries = retries - 1
                     self.sdk.throw_warning(
                         CdpWarning('Got likely AWS IAM eventual consistency error [%s], %d retries left...'
-                                   % (resp.violations, retries))
+                                   % (str(resp.violations), retries))
                     )
                     self.sdk.sleep(delay)
                     return self.create_aws_credential(name, role, description, retries, delay)