chore(integration): bump cryptography to 46.0.6

Author: EhteshamSid

samcli/lib/sync/infra_sync_executor.py

@@ -72,7 +72,7 @@ class InfraSyncResult:
     _infra_sync_executed: bool
     _code_sync_resources: Set[ResourceIdentifier]
 
-    def __init__(self, executed: bool, code_sync_resources: Set[ResourceIdentifier] = set()) -> None:
+    def __init__(self, executed: bool, code_sync_resources: Set[ResourceIdentifier] = None) -> None:
         """
         Constructor
 
@@ -83,6 +83,8 @@ def __init__(self, executed: bool, code_sync_resources: Set[ResourceIdentifier]
         code_sync_resources: Set[ResourceIdentifier]
             Resources that needs a code sync
         """
+        if code_sync_resources is None:
+            code_sync_resources = set()
         self._infra_sync_executed = executed
         self._code_sync_resources = code_sync_resources
 

samcli/local/lambdafn/remote_files.py

@@ -31,7 +31,7 @@ def unzip_from_uri(uri, layer_zip_path, unzip_output_dir, progressbar_label, mou
         Label to use in the Progressbar
     """
     try:
-        get_request = requests.get(uri, stream=True, verify=os.environ.get("AWS_CA_BUNDLE") or True)
+        get_request = requests.get(uri, stream=True, verify=os.environ.get("AWS_CA_BUNDLE") or True, timeout=10.0)
 
         with open(layer_zip_path, "wb") as local_layer_file:
             file_length = int(get_request.headers["Content-length"])

tests/integration/durable_integ_base.py

@@ -143,11 +143,13 @@ def log_output():
     def assert_invoke_output(
         self,
         stdout: str,
-        input_data: Dict[str, Any] = {},
+        input_data: Dict[str, Any] = None,
         execution_name: Optional[str] = None,
         expected_status: str = "SUCCEEDED",
     ) -> str:
         """Assert invoke output contains expected fields and return execution ARN."""
+        if input_data is None:
+            input_data = {}
         stdout_str = stdout.strip()
 
         self.assertIn("Execution Summary:", stdout_str, f"Expected execution summary in output: {stdout_str}")

tests/integration/local/start_api/test_start_api.py

@@ -1626,7 +1626,7 @@ def test_cors_swagger_options(self, origin):
         """
         This tests that the Cors headers are added to OPTIONS responses
         """
-        response = requests.options(self.url + "/echobase64eventbody", **_create_request_params(origin))
+        response = requests.options(self.url + "/echobase64eventbody", **_create_request_params(origin), timeout=10.0)
         self.assert_cors(response)
 
     @parameterized.expand(["https://abc", None])
@@ -1636,7 +1636,7 @@ def test_cors_swagger_get(self, origin):
         """
         This tests that the Cors headers are added to _other_ method responses
         """
-        response = requests.get(self.url + "/echobase64eventbody", **_create_request_params(origin))
+        response = requests.get(self.url + "/echobase64eventbody", **_create_request_params(origin), timeout=10.0)
         self.assert_cors(response)
 
 
@@ -1762,7 +1762,7 @@ def test_cors_global(self, origin):
         """
         This tests that the Cors headers are added to OPTIONS response when the global property is set
         """
-        response = requests.options(self.url + "/echobase64eventbody", **_create_request_params(origin))
+        response = requests.options(self.url + "/echobase64eventbody", **_create_request_params(origin), timeout=10.0)
 
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.headers.get("Access-Control-Allow-Origin"), "*")

tests/integration/logs/test_logs_command.py

@@ -121,7 +121,7 @@ def _test_apigw_logs(self, apigw_name, path):
         apigw_url = f"{self._get_output_value(apigw_name_from_output)}{path}"
         # make couple of requests to warm-up APIGW to write its logs to CW
         for i in range(APIGW_REQUESTS_TO_WARM_UP):
-            apigw_result = requests.get(apigw_url)
+            apigw_result = requests.get(apigw_url, timeout=10.0)
             LOG.info("APIGW result %s", apigw_result)
         cmd_list = self.get_logs_command_list(self.stack_name, name=apigw_name)
         self._check_logs(cmd_list, [f"HTTP Method: GET, Resource Path: /{path}"])
@@ -138,7 +138,7 @@ def _test_end_to_end_apigw(self, apigw_name, path):
         # apigw name in output section doesn't have forward slashes
         apigw_name_from_output = apigw_name.replace("/", "")
         apigw_url = f"{self._get_output_value(apigw_name_from_output)}{path}"
-        apigw_result = requests.get(apigw_url)
+        apigw_result = requests.get(apigw_url, timeout=10.0)
         LOG.info("APIGW result %s", apigw_result)
         cmd_list = self.get_logs_command_list(self.stack_name)
         self._check_logs(
@@ -154,7 +154,7 @@ def _test_end_to_end_sfn(self, apigw_name, path):
         # apigw name in output section doesn't have forward slashes
         apigw_name_from_output = apigw_name.replace("/", "")
         apigw_url = f"{self._get_output_value(apigw_name_from_output)}{path}"
-        apigw_result = requests.get(apigw_url)
+        apigw_result = requests.get(apigw_url, timeout=10.0)
         LOG.info("APIGW result %s", apigw_result)
         cmd_list = self.get_logs_command_list(self.stack_name)
         self._check_logs(

tests/integration/sync/sync_integ_base.py

@@ -204,7 +204,7 @@ def _extract_contents_from_layer_zip(dep_dir, zipped_layer):
     def get_layer_contents(self, arn, dep_dir):
         layer = self.lambda_client.get_layer_version_by_arn(Arn=arn)
         layer_location = layer.get("Content", {}).get("Location", "")
-        zipped_layer = requests.get(layer_location)
+        zipped_layer = requests.get(layer_location, timeout=10.0)
         return SyncIntegBase._extract_contents_from_layer_zip(dep_dir, zipped_layer)
 
     def get_dependency_layer_contents_from_arn(self, stack_resources, dep_dir, version):

tests/integration/testdata/buildcmd/asset.b998895901bf33127f2c9dce715854f8b35aa73fb7eb5245ba9721580bbe5837/requirements.txt

@@ -1,3 +1,3 @@
 numpy<1.20.3; python_version < '3.10'
 numpy==1.26.4; python_version >= '3.10'
-cryptography==3.3.2
+cryptography==46.0.6

tests/integration/testdata/sync/nested/after/root_function/root_function.py

@@ -3,11 +3,12 @@
 
 import requests
 
+
 def lambda_handler(event, context):
     """Sample pure Lambda function that returns a message and a location"""
 
     try:
-        ip = requests.get("http://checkip.amazonaws.com/")
+        ip = requests.get("http://checkip.amazonaws.com/", timeout=10.0)
     except requests.RequestException as e:
         # Send some context about this error to Lambda Logs
         print(e)
@@ -16,8 +17,5 @@ def lambda_handler(event, context):
 
     return {
         "statusCode": 200,
-        "body": json.dumps({
-            "message": f"{layer_method()+6}",
-            "location": ip.text.replace("\n", "")
-        }),
-    }
+        "body": json.dumps({"message": f"{layer_method()+6}", "location": ip.text.replace("\n", "")}),
+    }

tests/integration/testdata/sync/nested/before/root_function/root_function.py

@@ -3,11 +3,12 @@
 
 import requests
 
+
 def lambda_handler(event, context):
     """Sample pure Lambda function that returns a message and a location"""
 
     try:
-        ip = requests.get("http://checkip.amazonaws.com/")
+        ip = requests.get("http://checkip.amazonaws.com/", timeout=10.0)
     except requests.RequestException as e:
         # Send some context about this error to Lambda Logs
         print(e)
@@ -16,8 +17,5 @@ def lambda_handler(event, context):
 
     return {
         "statusCode": 200,
-        "body": json.dumps({
-            "message": f"{layer_method()+6}",
-            "location": ip.text.replace("\n", "")
-        }),
-    }
+        "body": json.dumps({"message": f"{layer_method()+6}", "location": ip.text.replace("\n", "")}),
+    }

tests/integration/testdata/sync/nested_intrinsics/before/child_stack/child_function/function/function.py

@@ -4,11 +4,12 @@
 # import numpy as np
 import requests
 
+
 def lambda_handler(event, context):
     """Sample pure Lambda function that returns a message and a location"""
 
     try:
-        ip = requests.get("http://checkip.amazonaws.com/")
+        ip = requests.get("http://checkip.amazonaws.com/", timeout=10.0)
     except requests.RequestException as e:
         # Send some context about this error to Lambda Logs
         print(e)
@@ -17,9 +18,11 @@ def lambda_handler(event, context):
 
     return {
         "statusCode": 200,
-        "body": json.dumps({
-            "message": f"{layer_method()+1}",
-            "location": ip.text.replace("\n", "")
-            # "extra_message": np.array([1, 2, 3, 4, 5, 6]).tolist() # checking external library call will succeed
-        }),
-    }
+        "body": json.dumps(
+            {
+                "message": f"{layer_method()+1}",
+                "location": ip.text.replace("\n", ""),
+                # "extra_message": np.array([1, 2, 3, 4, 5, 6]).tolist() # checking external library call will succeed
+            }
+        ),
+    }