diff --git a/ibm_cloud_sdk_core/base_service.py b/ibm_cloud_sdk_core/base_service.py index d9fc742b..0d0b7289 100644 --- a/ibm_cloud_sdk_core/base_service.py +++ b/ibm_cloud_sdk_core/base_service.py @@ -40,6 +40,9 @@ # http_client.HTTPConnection.debuglevel = 1 +logger = logging.getLogger(__name__) + + #pylint: disable=too-many-instance-attributes #pylint: disable=too-many-locals class BaseService: @@ -295,7 +298,7 @@ def send(self, request: requests.Request, **kwargs) -> DetailedResponse: for key in reserved_keys: if key in kwargs: del kwargs[key] - logging.warning('"%s" has been removed from the request', key) + logger.warning('"%s" has been removed from the request', key) try: response = self.http_client.request(**request, cookies=self.jar, @@ -320,7 +323,7 @@ def send(self, request: requests.Request, **kwargs) -> DetailedResponse: raise ApiException(response.status_code, http_response=response) except requests.exceptions.SSLError: - logging.exception(self.ERROR_MSG_DISABLE_SSL) + logger.exception(self.ERROR_MSG_DISABLE_SSL) raise def set_enable_gzip_compression(self, diff --git a/ibm_cloud_sdk_core/token_managers/container_token_manager.py b/ibm_cloud_sdk_core/token_managers/container_token_manager.py index da4d26d3..ec81bbeb 100644 --- a/ibm_cloud_sdk_core/token_managers/container_token_manager.py +++ b/ibm_cloud_sdk_core/token_managers/container_token_manager.py @@ -20,6 +20,9 @@ from .iam_request_based_token_manager import IAMRequestBasedTokenManager +logger = logging.getLogger(__name__) + + class ContainerTokenManager(IAMRequestBasedTokenManager): """The ContainerTokenManager takes a compute resource token and performs the necessary interactions with the IAM token service to obtain and store a suitable bearer token. Additionally, the ContainerTokenManager @@ -110,7 +113,7 @@ def retrieve_cr_token(self) -> str: """ cr_token_filename = self.cr_token_filename if self.cr_token_filename else self.DEFAULT_CR_TOKEN_FILENAME - logging.debug('Attempting to read CR token from file: %s', + logger.debug('Attempting to read CR token from file: %s', cr_token_filename) try: diff --git a/ibm_cloud_sdk_core/token_managers/vpc_instance_token_manager.py b/ibm_cloud_sdk_core/token_managers/vpc_instance_token_manager.py index 7bb8300c..865e5000 100644 --- a/ibm_cloud_sdk_core/token_managers/vpc_instance_token_manager.py +++ b/ibm_cloud_sdk_core/token_managers/vpc_instance_token_manager.py @@ -21,6 +21,9 @@ from .jwt_token_manager import JWTTokenManager +logger = logging.getLogger(__name__) + + class VPCInstanceTokenManager(JWTTokenManager): """The VPCInstanceTokenManager retrieves an "instance identity token" and exchanges that for an IAM access token using the VPC Instance Metadata Service API which is available @@ -91,7 +94,7 @@ def request_token(self) -> dict: 'Authorization': 'Bearer ' + instance_identity_token } - logging.debug( + logger.debug( 'Invoking VPC \'create_iam_token\' operation: %s', url) response = self._request( method='POST', @@ -99,7 +102,7 @@ def request_token(self) -> dict: headers=headers, params={'version': self.METADATA_SERVICE_VERSION}, data=json.dumps(request_payload) if request_payload else None) - logging.debug('Returned from VPC \'create_iam_token\' operation."') + logger.debug('Returned from VPC \'create_iam_token\' operation."') return response @@ -139,7 +142,7 @@ def retrieve_instance_identity_token(self) -> str: request_body = {'expires_in': 300} - logging.debug( + logger.debug( 'Invoking VPC \'create_access_token\' operation: %s', url) response = self._request( method='PUT', @@ -147,6 +150,6 @@ def retrieve_instance_identity_token(self) -> str: headers=headers, params={'version': self.METADATA_SERVICE_VERSION}, data=json.dumps(request_body)) - logging.debug('Returned from VPC \'create_access_token\' operation."') + logger.debug('Returned from VPC \'create_access_token\' operation."') return response['access_token']