Merge branch 'main' into main

Author: pushkarchawda

.dockerignore

@@ -4,6 +4,6 @@
 **/node_modules/
 **/dist/
 
-test/integration/*
-!test/integration/resources/
-!test/integration/test-handlers/
+tests/integration/*
+!tests/integration/resources/
+!tests/integration/test-handlers/

.gitignore

@@ -1,6 +1,6 @@
 generated.docker-compose.*.yml
 
-test/integration/resources/init
+tests/integration/resources/init
 
 node_modules/
 *.tsbuildinfo
@@ -143,3 +143,6 @@ dmypy.json
 
 # Cython debug symbols
 cython_debug/
+
+# Test files generated
+tmp*.py

Makefile

@@ -9,31 +9,31 @@ init:
 
 .PHONY: test
 test: check-format
-	pytest --cov awslambdaric --cov-report term-missing --cov-fail-under 90 test
+	pytest --cov awslambdaric --cov-report term-missing --cov-fail-under 90 tests
 
 .PHONY: setup-codebuild-agent
 setup-codebuild-agent:
-	docker build -t codebuild-agent - < test/integration/codebuild-local/Dockerfile.agent
+	docker build -t codebuild-agent - < tests/integration/codebuild-local/Dockerfile.agent
 
 .PHONY: test-smoke
 test-smoke: setup-codebuild-agent
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.1.yml alpine 3.12 3.8
+	CODEBUILD_IMAGE_TAG=codebuild-agent tests/integration/codebuild-local/test_one.sh tests/integration/codebuild/buildspec.os.alpine.1.yml alpine 3.12 3.8
 
 .PHONY: test-integ
 test-integ: setup-codebuild-agent
-	CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh test/integration/codebuild/.
+	CODEBUILD_IMAGE_TAG=codebuild-agent tests/integration/codebuild-local/test_all.sh tests/integration/codebuild/.
 
 .PHONY: check-security
 check-security:
 	bandit -r awslambdaric
 
 .PHONY: format
 format:
-	black setup.py awslambdaric/ test/
+	black setup.py awslambdaric/ tests/
 
 .PHONY: check-format
 check-format:
-	black --check setup.py awslambdaric/ test/
+	black --check setup.py awslambdaric/ tests/
 
 # Command to run everytime you make changes to verify everything works
 .PHONY: dev

awslambdaric/__main__.py

@@ -13,7 +13,6 @@ def main(args):
     handler = args[1]
     lambda_runtime_api_addr = os.environ["AWS_LAMBDA_RUNTIME_API"]
 
-    print(f"Executing '{handler}' in function directory '{app_root}'")
     bootstrap.run(app_root, handler, lambda_runtime_api_addr)
 
 

awslambdaric/bootstrap.py

@@ -2,23 +2,19 @@
 Copyright 2018 Amazon.com, Inc. or its affiliates. All Rights Reserved.
 """
 
+import importlib
 import json
 import logging
 import os
 import sys
 import time
 import traceback
-import warnings
 
 from .lambda_context import LambdaContext
 from .lambda_runtime_client import LambdaRuntimeClient
 from .lambda_runtime_exception import FaultException
 from .lambda_runtime_marshaller import to_json
 
-with warnings.catch_warnings():
-    warnings.filterwarnings("ignore", category=DeprecationWarning)
-    import imp
-
 ERROR_LOG_LINE_TERMINATE = "\r"
 ERROR_LOG_IDENT = "\u00a0"  # NO-BREAK SPACE U+00A0
 
@@ -33,23 +29,14 @@ def _get_handler(handler):
         )
         return make_fault_handler(fault)
 
-    file_handle, pathname, desc = None, None, None
     try:
-        # Recursively loading handler in nested directories
-        for segment in modname.split("."):
-            if pathname is not None:
-                pathname = [pathname]
-            file_handle, pathname, desc = imp.find_module(segment, pathname)
-        if file_handle is None:
-            module_type = desc[2]
-            if module_type == imp.C_BUILTIN:
-                fault = FaultException(
-                    FaultException.BUILT_IN_MODULE_CONFLICT,
-                    "Cannot use built-in module {} as a handler module".format(modname),
-                )
-                request_handler = make_fault_handler(fault)
-                return request_handler
-        m = imp.load_module(modname, file_handle, pathname, desc)
+        if modname.split(".")[0] in sys.builtin_module_names:
+            fault = FaultException(
+                FaultException.BUILT_IN_MODULE_CONFLICT,
+                "Cannot use built-in module {} as a handler module".format(modname),
+            )
+            return make_fault_handler(fault)
+        m = importlib.import_module(modname.replace("/", "."))
     except ImportError as e:
         fault = FaultException(
             FaultException.IMPORT_MODULE_ERROR,
@@ -66,9 +53,6 @@ def _get_handler(handler):
         )
         request_handler = make_fault_handler(fault)
         return request_handler
-    finally:
-        if file_handle is not None:
-            file_handle.close()
 
     try:
         request_handler = getattr(m, fname)
@@ -89,14 +73,13 @@ def result(*args):
     return result
 
 
-def make_error(error_message, error_type, stack_trace):
-    result = {}
-    if error_message:
-        result["errorMessage"] = error_message
-    if error_type:
-        result["errorType"] = error_type
-    if stack_trace:
-        result["stackTrace"] = stack_trace
+def make_error(error_message, error_type, stack_trace, invoke_id=None):
+    result = {
+        "errorMessage": error_message if error_message else "",
+        "errorType": error_type if error_type else "",
+        "requestId": invoke_id if invoke_id is not None else "",
+        "stackTrace": stack_trace if stack_trace else [],
+    }
     return result
 
 
@@ -169,7 +152,7 @@ def handle_event_request(
         )
     except FaultException as e:
         xray_fault = make_xray_fault("LambdaValidationError", e.msg, os.getcwd(), [])
-        error_result = make_error(e.msg, e.exception_type, e.trace)
+        error_result = make_error(e.msg, e.exception_type, e.trace, invoke_id)
 
     except Exception:
         etype, value, tb = sys.exc_info()
@@ -181,7 +164,7 @@ def handle_event_request(
 
         xray_fault = make_xray_fault(etype.__name__, str(value), os.getcwd(), tb_tuples)
         error_result = make_error(
-            str(value), etype.__name__, traceback.format_list(tb_tuples)
+            str(value), etype.__name__, traceback.format_list(tb_tuples), invoke_id
         )
 
     if error_result is not None:
@@ -404,7 +387,7 @@ def run(app_root, handler, lambda_runtime_api_addr):
             global _GLOBAL_AWS_REQUEST_ID
 
             request_handler = _get_handler(handler)
-        except Exception as e:
+        except Exception:
             error_result = build_fault_result(sys.exc_info(), None)
 
             log_error(error_result, log_sink)

awslambdaric/runtime_client.cpp

@@ -25,18 +25,25 @@ static PyObject *method_initialize_client(PyObject *self, PyObject *args) {
 }
 
 static PyObject *method_next(PyObject *self) {
-    if (CLIENT == nullptr) {
-        PyErr_SetString(PyExc_RuntimeError, "Client not yet initalized");
-        return NULL;
-    }
+    aws::lambda_runtime::invocation_request response;
+
+    // Release GIL and save thread state
+    // ref: https://docs.python.org/3/c-api/init.html#thread-state-and-the-global-interpreter-lock
+    PyThreadState *_save;
+    _save = PyEval_SaveThread();
 
     auto outcome = CLIENT->get_next();
     if (!outcome.is_success()) {
+        // Reacquire GIL before exiting
+        PyEval_RestoreThread(_save);
         PyErr_SetString(PyExc_RuntimeError, "Failed to get next");
         return NULL;
     }
 
-    auto response = outcome.get_result();
+    response = outcome.get_result();
+    // Reacquire GIL before constructing return object
+    PyEval_RestoreThread(_save);
+
     auto payload = response.payload;
     auto request_id = response.request_id.c_str();
     auto trace_id = response.xray_trace_id.c_str();

deps/curl-7.77.0.tar.gz

@@ -2,7 +2,7 @@ coverage>=4.4.0
 flake8>=3.3.0
 tox>=2.2.1
 pytest-cov>=2.4.0
-pylint>=1.7.2,<2.0
+pylint>=1.7.2
 black>=20.8b0
 bandit>=1.6.2
 

requirements/dev.txt

@@ -32,7 +32,7 @@ def get_curl_extra_linker_flags():
 def get_runtime_client_extension():
     if platform.system() != "Linux" and os.getenv("BUILD") != "true":
         print(
-            "The native runtime_client only builds in Linux. Skiping its compilation."
+            "The native runtime_client only builds on Linux. Skipping its compilation."
         )
         return []
 
@@ -68,7 +68,7 @@ def read_requirements(req="base.txt"):
 
 setup(
     name="awslambdaric",
-    version="1.0.0",
+    version="1.2.1",
     author="Amazon Web Services",
     description="AWS Lambda Runtime Interface Client for Python",
     long_description=read("README.md"),