fix: loop through all possible executable paths.

Author: sriram-mv

aws_lambda_builders/binary_path.py

@@ -8,6 +8,7 @@ class BinaryPath(object):
     def __init__(self, resolver, validator, binary, binary_path=None):
         self.resolver = resolver
         self.validator = validator
+        self.binary = binary
         setattr(self, binary, binary)
         self._binary_path = binary_path
         self.path_provided = True if self._binary_path else False

aws_lambda_builders/workflow.py

@@ -12,7 +12,7 @@
 from aws_lambda_builders.path_resolver import PathResolver
 from aws_lambda_builders.validator import RuntimeValidator
 from aws_lambda_builders.registry import DEFAULT_REGISTRY
-from aws_lambda_builders.exceptions import WorkflowFailedError, WorkflowUnknownError
+from aws_lambda_builders.exceptions import WorkflowFailedError, WorkflowUnknownError, MisMatchRuntimeError
 from aws_lambda_builders.actions import ActionFailedError
 
 LOG = logging.getLogger(__name__)
@@ -35,15 +35,18 @@ def sanitize(func):
     @functools.wraps(func)
     def wrapper(self, *args, **kwargs):
         valid_paths = []
-        # NOTE: we need to access workflow object to get the validator.
+        # NOTE: we need to access binaries to get paths and resolvers, before validating.
         self.get_binaries()
-        # import ipdb
-        # ipdb.set_trace()
         for binary_path in self.binaries:
             validator = binary_path.validator
             exec_paths = binary_path.resolver.exec_paths if not binary_path.path_provided else binary_path.binary_path
             for executable_path in exec_paths:
-                valid_path = validator.validate(executable_path)
+                valid_path = None
+                try:
+                    valid_path = validator.validate(executable_path)
+                except MisMatchRuntimeError as ex:
+                    LOG.debug("Invalid executable for %s at %s",
+                              binary_path.binary, executable_path, exc_info=str(ex))
                 if valid_path:
                     binary_path.binary_path = valid_path
                     valid_paths.append(valid_path)

tests/integration/workflows/python_pip/test_python_pip.py

@@ -60,7 +60,7 @@ def test_mismatch_runtime_python_project(self):
         try:
             self.builder.build(self.source_dir, self.artifacts_dir, self.scratch_dir, self.manifest_path_valid,
                                runtime=self.runtime_mismatch[self.runtime])
-        except MisMatchRuntimeError:
+        except WorkflowFailedError:
             self.assertIsNone(which(self.runtime_mismatch[self.runtime]))
 
     def test_runtime_validate_python_project_fail_open_unsupported_runtime(self):