Removed Exception msg from InternalFailure (#150)

Author: ammokhov

src/cloudformation_cli_python_lib/interface.py

@@ -119,7 +119,7 @@ def _serialize(self) -> MutableMapping[str, Any]:
 
     @classmethod
     def failed(
-        cls: Type["ProgressEvent"], error_code: HandlerErrorCode, message: str
+        cls: Type["ProgressEvent"], error_code: HandlerErrorCode, message: str = ""
     ) -> "ProgressEvent":
         return cls(status=OperationStatus.FAILED, errorCode=error_code, message=message)
 

src/cloudformation_cli_python_lib/resource.py

@@ -46,9 +46,9 @@ def wrapper(self: Any, event: MutableMapping[str, Any], context: Any) -> Any:
         try:
             response = entrypoint(self, event, context)
             serialized = json.dumps(response, cls=KitchenSinkEncoder)
-        except Exception as e:  # pylint: disable=broad-except
+        except Exception:  # pylint: disable=broad-except
             return ProgressEvent.failed(  # pylint: disable=protected-access
-                HandlerErrorCode.InternalFailure, str(e)
+                HandlerErrorCode.InternalFailure
             )._serialize()
         return json.loads(serialized)
 
@@ -121,12 +121,10 @@ def test_entrypoint(
         except _HandlerError as e:
             LOG.exception("Handler error")
             return e.to_progress_event()
-        except Exception as e:  # pylint: disable=broad-except
+        except Exception:  # pylint: disable=broad-except
             LOG.exception("Exception caught")
-            msg = str(e)
-        except BaseException as e:  # pylint: disable=broad-except
+        except BaseException:  # pylint: disable=broad-except
             LOG.critical("Base exception caught (this is usually bad)", exc_info=True)
-            msg = str(e)
         return ProgressEvent.failed(HandlerErrorCode.InternalFailure, msg)
 
     @staticmethod
@@ -214,11 +212,11 @@ def print_or_log(message: str) -> None:
             print_or_log("Handler error")
             progress = e.to_progress_event()
         except Exception as e:  # pylint: disable=broad-except
-            print_or_log("Exception caught")
-            progress = ProgressEvent.failed(HandlerErrorCode.InternalFailure, str(e))
+            print_or_log("Exception caught {0}".format(e))
+            progress = ProgressEvent.failed(HandlerErrorCode.InternalFailure)
         except BaseException as e:  # pylint: disable=broad-except
-            print_or_log("Base exception caught (this is usually bad)")
-            progress = ProgressEvent.failed(HandlerErrorCode.InternalFailure, str(e))
+            print_or_log("Base exception caught (this is usually bad) {0}".format(e))
+            progress = ProgressEvent.failed(HandlerErrorCode.InternalFailure)
 
         # use the raw event_data as a last-ditch attempt to call back if the
         # request is invalid

tests/lib/resource_test.py

@@ -255,7 +255,6 @@ def test_entrypoint_uncaught_exception(resource, exc_cls):
         event = patch_and_raise(resource, "_parse_request", exc_cls, resource.__call__)
     assert event["status"] == OperationStatus.FAILED
     assert event["errorCode"] == HandlerErrorCode.InternalFailure
-    assert event["message"] == "hahaha"
 
 
 def test__ensure_serialize_uses_custom_encoder():
@@ -278,16 +277,12 @@ class Unserializable:
         return {"foo": Unserializable()}
 
     serialized = wrapped(None, None, None)
-    event = ProgressEvent.failed(
-        HandlerErrorCode.InternalFailure,
-        "Object of type Unserializable is not JSON serializable",
-    )
+    event = ProgressEvent.failed(HandlerErrorCode.InternalFailure)
     try:
         # Python 3.7/3.8
         assert serialized == event._serialize()
     except AssertionError:
         # Python 3.6
-        event.message = "Object of type 'Unserializable' is not JSON serializable"
         assert serialized == event._serialize()
 
 
@@ -393,7 +388,6 @@ def test_test_entrypoint_uncaught_exception(resource, exc_cls):
     )
     assert event.status == OperationStatus.FAILED
     assert event.errorCode == HandlerErrorCode.InternalFailure
-    assert event.message == "hahaha"
 
 
 def test_test_entrypoint_success():