Remove default value for subprocess_cargo_lambda

Signed-off-by: David Calavera <[email protected]>

Author: calavera

aws_lambda_builders/workflows/rust_cargo/actions.py

@@ -8,7 +8,6 @@
 from aws_lambda_builders.workflow import BuildMode
 from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
 from aws_lambda_builders.architecture import X86_64, ARM64
-from .cargo_lambda import SubprocessCargoLambda
 from .exceptions import CargoLambdaExecutionException
 from .utils import OSUtils
 
@@ -26,10 +25,10 @@ def __init__(
         source_dir,
         binaries,
         mode,
+        subprocess_cargo_lambda,
         architecture=X86_64,
         handler=None,
         flags=None,
-        subprocess_cargo_lambda=SubprocessCargoLambda,
     ):
         """
         Build the a Rust executable

aws_lambda_builders/workflows/rust_cargo/workflow.py

@@ -41,10 +41,10 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtim
                 source_dir,
                 self.binaries,
                 mode,
+                subprocess_cargo_lambda,
                 self.architecture,
                 handler,
                 flags,
-                subprocess_cargo_lambda=subprocess_cargo_lambda,
             ),
             RustCopyAndRenameAction(source_dir, artifacts_dir, handler),
         ]

tests/unit/workflows/rust_cargo/test_actions.py

@@ -39,31 +39,39 @@ def which(cmd, executable_search_paths):
 
     def test_release_build_cargo_command(self):
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
-        action = RustCargoLambdaBuildAction("source_dir", {"cargo": cargo}, BuildMode.RELEASE)
+        action = RustCargoLambdaBuildAction(
+            "source_dir", {"cargo": cargo}, BuildMode.RELEASE, self.subprocess_cargo_lambda
+        )
         self.assertEqual(
             action.build_command(),
             ["path/to/cargo", "lambda", "build", "--release"],
         )
 
     def test_release_build_cargo_command_with_target(self):
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
-        action = RustCargoLambdaBuildAction("source_dir", {"cargo": cargo}, BuildMode.RELEASE, "arm64")
+        action = RustCargoLambdaBuildAction(
+            "source_dir", {"cargo": cargo}, BuildMode.RELEASE, self.subprocess_cargo_lambda, "arm64"
+        )
         self.assertEqual(
             action.build_command(),
             ["path/to/cargo", "lambda", "build", "--release", "--arm64"],
         )
 
     def test_debug_build_cargo_command(self):
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
-        action = RustCargoLambdaBuildAction("source_dir", {"cargo": cargo}, BuildMode.DEBUG)
+        action = RustCargoLambdaBuildAction(
+            "source_dir", {"cargo": cargo}, BuildMode.DEBUG, self.subprocess_cargo_lambda
+        )
         self.assertEqual(
             action.build_command(),
             ["path/to/cargo", "lambda", "build"],
         )
 
     def test_debug_build_cargo_command_with_architecture(self):
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
-        action = RustCargoLambdaBuildAction("source_dir", {"cargo": cargo}, BuildMode.DEBUG, "arm64")
+        action = RustCargoLambdaBuildAction(
+            "source_dir", {"cargo": cargo}, BuildMode.DEBUG, self.subprocess_cargo_lambda, "arm64"
+        )
         self.assertEqual(
             action.build_command(),
             ["path/to/cargo", "lambda", "build", "--arm64"],
@@ -72,15 +80,19 @@ def test_debug_build_cargo_command_with_architecture(self):
     def test_debug_build_cargo_command_with_flags(self):
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
         flags = ["--package", "package-in-workspace"]
-        action = RustCargoLambdaBuildAction("source_dir", {"cargo": cargo}, BuildMode.DEBUG, "arm64", flags=flags)
+        action = RustCargoLambdaBuildAction(
+            "source_dir", {"cargo": cargo}, BuildMode.DEBUG, self.subprocess_cargo_lambda, "arm64", flags=flags
+        )
         self.assertEqual(
             action.build_command(),
             ["path/to/cargo", "lambda", "build", "--arm64", "--package", "package-in-workspace"],
         )
 
     def test_debug_build_cargo_command_with_handler(self):
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
-        action = RustCargoLambdaBuildAction("source_dir", {"cargo": cargo}, BuildMode.DEBUG, "arm64", handler="foo")
+        action = RustCargoLambdaBuildAction(
+            "source_dir", {"cargo": cargo}, BuildMode.DEBUG, self.subprocess_cargo_lambda, "arm64", handler="foo"
+        )
         self.assertEqual(
             action.build_command(),
             ["path/to/cargo", "lambda", "build", "--arm64", "--bin", "foo"],
@@ -89,7 +101,7 @@ def test_debug_build_cargo_command_with_handler(self):
     def test_execute_happy_path(self):
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
         action = RustCargoLambdaBuildAction(
-            "source_dir", {"cargo": cargo}, BuildMode.RELEASE, subprocess_cargo_lambda=self.subprocess_cargo_lambda
+            "source_dir", {"cargo": cargo}, BuildMode.RELEASE, self.subprocess_cargo_lambda
         )
         action.execute()
 
@@ -99,7 +111,7 @@ def test_execute_cargo_build_fail(self):
 
         cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
         action = RustCargoLambdaBuildAction(
-            "source_dir", {"cargo": cargo}, BuildMode.RELEASE, subprocess_cargo_lambda=self.subprocess_cargo_lambda
+            "source_dir", {"cargo": cargo}, BuildMode.RELEASE, self.subprocess_cargo_lambda
         )
         with self.assertRaises(ActionFailedError) as err_assert:
             action.execute()
@@ -110,7 +122,7 @@ def test_execute_happy_with_logger(self):
         with patch.object(LOG, "debug") as mock_warning:
             cargo = BinaryPath(None, None, None, binary_path="path/to/cargo")
             action = RustCargoLambdaBuildAction(
-                "source_dir", {"cargo": cargo}, BuildMode.RELEASE, subprocess_cargo_lambda=self.subprocess_cargo_lambda
+                "source_dir", {"cargo": cargo}, BuildMode.RELEASE, self.subprocess_cargo_lambda
             )
             out = action.execute()
             self.assertEqual(out, "out")

tests/unit/workflows/rust_cargo/test_workflow.py

@@ -5,7 +5,6 @@
 from aws_lambda_builders.workflows.rust_cargo.actions import (
     RustCargoLambdaBuildAction,
     RustCopyAndRenameAction,
-    CargoLambdaExecutionException,
 )
 from aws_lambda_builders.workflows.rust_cargo.feature_flag import EXPERIMENTAL_FLAG_CARGO_LAMBDA