fix serverExceptions

Author: wallisyan

aliyun-python-sdk-core/alibabacloud/endpoint/chained_endpoint_resolver.py

@@ -18,7 +18,6 @@
 from alibabacloud.exceptions import ClientException
 from alibabacloud.endpoint import EndpointResolver
 
-import aliyunsdkcore.acs_exception.error_code as error_code
 import aliyunsdkcore.acs_exception.error_msg as error_msg
 
 

aliyun-python-sdk-core/alibabacloud/exceptions.py

@@ -12,21 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SDK_INVALID_REGION_ID = 'SDK.InvalidRegionId'
-SDK_SERVER_UNREACHABLE = 'SDK.ServerUnreachable'
-SDK_INVALID_REQUEST = 'SDK.InvalidRequest'
-SDK_MISSING_ENDPOINTS_FILER = 'SDK.MissingEndpointsFiler'
-SDK_UNKNOWN_SERVER_ERROR = 'SDK.UnknownServerError'
-SDK_INVALID_CREDENTIAL = 'SDK.InvalidCredential'
-SDK_INVALID_SESSION_EXPIRATION = 'SDK.InvalidSessionExpiration'
-SDK_GET_SESSION_CREDENTIAL_FAILED = 'SDK.GetSessionCredentialFailed'
-SDK_INVALID_PARAMS = 'SDK.InvalidParams'
-SDK_NOT_SUPPORT = 'SDK.NotSupport'
-SDK_ENDPOINT_RESOLVING_ERROR = 'SDK.EndpointResolvingError'
-SDK_ENDPOINT_TESTABILITY = 'SDK.EndpointTestability'
-SDK_HTTP_ERROR = 'SDK.HttpError'
-SDK_INVALID_PARAMETER = "SDK.InvalidParameter"
-
 
 class ClientException(Exception):
     """client exception"""
@@ -49,19 +34,21 @@ def __str__(self):
 
 class ServerException(Exception):
 
-    def __init__(self, error_code, error_message, endpoint=None,
-                 http_status=None, request_id=None, service_name= None):
+    def __init__(self, error_code, error_message, endpoint=None, service_name=None,
+                 http_status=None, request_id=None):
         self.error_code = error_code
         self.error_message = error_message
         self.endpoint = endpoint
-        self.http_status = http_status
-        self.request_id = request_id
         # TODO service_name
         self.service_name = service_name
+        self.http_status = http_status
+        self.request_id = request_id
 
     def __str__(self):
-        return "HTTP Status: %s Error:%s %s RequestID: %s" % (
+        return "HTTP Status: %s Product:%s Endpoint:%s Error:%s %s RequestID: %s" % (
             str(self.http_status),
+            self.service_name,
+            self.endpoint,
             self.error_code,
             self.error_message,
             self.request_id

aliyun-python-sdk-core/alibabacloud/handlers/server_error_handler.py

@@ -17,6 +17,8 @@
 from alibabacloud.handlers import RequestHandler
 from alibabacloud.vendored.requests import codes
 
+SDK_UNKNOWN_SERVER_ERROR = 'SDK.UnknownServerError'
+
 
 class ServerErrorHandler(RequestHandler):
 
@@ -39,11 +41,6 @@ def handle_response(self, context):
 
                 server_error_code, server_error_message = self._parse_error_info_from_response_body(
                     response.text)
-                # with open('a', 'w') as f:
-                #     f.write(http_request.signature)
-                # with open('b', 'w') as f:
-                #     f.write(server_error_message.split(':', 1)[1])
-
                 special_error_codes = ['IncompleteSignature', 'SignatureDoesNotMatch']
                 if response.status_code == codes.BAD_REQUEST and \
                         server_error_code in special_error_codes:
@@ -53,13 +50,13 @@ def handle_response(self, context):
                                                'Please check your AccessKeyId and AccessKeySecret.'
                 from alibabacloud.exceptions import ServerException
                 exception = ServerException(server_error_code, server_error_message,
-                                            context.endpoint, response.status_code, request_id)
+                                            context.endpoint, context.client.product_code,
+                                            response.status_code, request_id)
                 context.exception = exception
 
     @staticmethod
     def _parse_error_info_from_response_body(response_body):
-        from aliyunsdkcore.acs_exception import error_code
-        error_code_to_return = error_code.SDK_UNKNOWN_SERVER_ERROR
+        error_code_to_return = SDK_UNKNOWN_SERVER_ERROR
         # TODO handle if response_body is too big
         error_message_to_return = "ServerResponseBody: " + str(response_body)
         try:

aliyun-python-sdk-core/alibabacloud/retry/retry_condition.py

@@ -18,7 +18,6 @@
 from alibabacloud.utils.load_json_from_data_dir import _load_json_from_data_dir
 import alibabacloud.utils.validation as validation
 from alibabacloud.exceptions import ServerException, ClientException
-import aliyunsdkcore.acs_exception.error_code as error_code
 
 logger = logging.getLogger(__name__)
 

aliyun-python-sdk-core/alibabacloud/utils/validation.py

@@ -14,8 +14,6 @@
 
 from alibabacloud.exceptions import ClientException
 
-import aliyunsdkcore.acs_exception.error_code as error_code
-
 
 def assert_integer_positive(integer, name):
     if isinstance(integer, int) and integer > 0:

aliyun-python-sdk-core/aliyunsdkcore/acs_exception/error_code.py

@@ -36,4 +36,4 @@
 SDK_ENDPOINT_RESOLVING_ERROR = 'SDK.EndpointResolvingError'
 SDK_ENDPOINT_TESTABILITY = 'SDK.EndpointTestability'
 SDK_HTTP_ERROR = 'SDK.HttpError'
-SDK_INVALID_PARAMETER = "SDK.InvalidParameter"
+SDK_INVALID_PARAMETER = "SDK.InvalidParameter"

aliyun-python-sdk-core/aliyunsdkcore/acs_exception/error_msg.py

@@ -47,4 +47,4 @@
 
 
 def get_msg(code):
-    return __dict.get(code)
+    return __dict.get(code)

aliyun-python-sdk-core/aliyunsdkcore/acs_exception/error_type.py

@@ -2,9 +2,10 @@
 
 import logging
 import os
-from aliyunsdkcore.acs_exception import error_msg
-from aliyunsdkcore.acs_exception import error_code
-from aliyunsdkcore.acs_exception import exceptions
+# from aliyunsdkcore.acs_exception import error_msg
+# from aliyunsdkcore.acs_exception import error_code
+# from aliyunsdkcore.acs_exception import exceptions
+from alibabacloud.exceptions import ClientException
 from aliyunsdkcore.auth import credentials
 from aliyunsdkcore.auth.signers import access_key_signer
 from aliyunsdkcore.auth.signers import sts_token_signer
@@ -46,5 +47,4 @@ def get_signer(cred, region_id, do_action_api, debug=False):
                                                                        cred['session_period'])
             return rsa_key_pair_signer.RsaKeyPairSigner(rsa_key_pair_credential, region_id, debug)
         else:
-            raise exceptions.ClientException(error_code.SDK_INVALID_CREDENTIAL,
-                                             error_msg.get_msg('SDK_INVALID_CREDENTIAL'))
+            raise ClientException(error_msg.get_msg('SDK_INVALID_CREDENTIAL'))