Fix error where cdpy reports missing credentials when used with CDPCLI 0.9.42 (#29)

cdpcli 0.9.42 introduced the mandatory 'region' argument to the client_builder in release 0.9.42. Our client builder was using implicit argument ordering.
Change client builder to use explicit argument names.
Change client builder to prefer new method of client creation, and fall back to legacy if 'region' causes a TypeError.

Signed-off-by: Daniel Chaffelson <[email protected]>

Author: Chaffelson

src/cdpy/common.py

@@ -112,7 +112,7 @@ def __init__(self, access_key_id, private_key, access_token='', method='static')
 
 class CdpcliWrapper(object):
     def __init__(self, debug=False, tls_verify=False, strict_errors=False, tls_warnings=False, client_endpoint=None,
-                 cdp_credentials=None, error_handler=None, warning_handler=None, scrub_inputs=True):
+                 cdp_credentials=None, error_handler=None, warning_handler=None, scrub_inputs=True, cp_region='default'):
         # Init Params
         self.debug = debug
         self.tls_verify = tls_verify
@@ -121,6 +121,7 @@ def __init__(self, debug=False, tls_verify=False, strict_errors=False, tls_warni
         self.client_endpoint = client_endpoint
         self.cdp_credentials = cdp_credentials
         self.scrub_inputs = scrub_inputs
+        self.cp_region = cp_region
 
         # Setup
         self.throw_error = error_handler if error_handler else self._default_throw_error
@@ -260,12 +261,23 @@ def _setup_logger(self, log_level, log_format):
     def _build_client(self, service):
         if not self.cdp_credentials:
             self.cdp_credentials = self._client_creator.context.get_credentials()
-        return self._client_creator.create_client(
-            service,
-            self.client_endpoint,
-            self.tls_verify,
-            self.cdp_credentials
-        )
+        try:
+            # region introduced in client version 0.9.42
+            client = self._client_creator.create_client(
+                service_name=service,
+                region=self.cp_region,
+                explicit_endpoint_url=self.client_endpoint,
+                tls_verification=self.tls_verify,
+                credentials=self.cdp_credentials
+            )
+        except TypeError:
+            client = self._client_creator.create_client(
+                service_name=service,
+                explicit_endpoint_url=self.client_endpoint,
+                tls_verification=self.tls_verify,
+                credentials=self.cdp_credentials
+            )
+        return client
 
     @staticmethod
     def _default_throw_error(error: 'CdpError'):