fix: set environment variables in addition to current

Why is this change necessary?

* On Windows, certain env variables are required for functioning of
binaries within the Makefile

How does it address the issue?

* pass current environmental variables along with new ones over to the
subprocess runner.

What side effects does this change have?

* None

Author: sriram-mv

aws_lambda_builders/workflows/provided_make/actions.py

@@ -2,6 +2,7 @@
 Action to build a specific Makefile target
 """
 
+import os
 import logging
 
 from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
@@ -57,10 +58,10 @@ def execute(self):
             self.osutils.makedirs(self.artifacts_dir)
 
         try:
+            current_env = os.environ.copy()
+            current_env.update({"ARTIFACTS_DIR": self.artifacts_dir})
             self.subprocess_make.run(
-                ["build-{logical_id}".format(logical_id=self.build_logical_id)],
-                env={"ARTIFACTS_DIR": self.artifacts_dir},
-                cwd=self.scratch_dir,
+                ["build-{logical_id}".format(logical_id=self.build_logical_id)], env=current_env, cwd=self.scratch_dir,
             )
         except MakeExecutionError as ex:
             raise ActionFailedError(str(ex))

aws_lambda_builders/workflows/provided_make/make.py

@@ -40,7 +40,7 @@ def __init__(self, osutils, make_exe=None):
 
         if make_exe is None:
             if osutils.is_windows():
-                make_exe = "make.cmd"
+                make_exe = "make.exe"
             else:
                 make_exe = "make"
 

tests/functional/workflows/provided_make/test_utils.py

@@ -26,13 +26,11 @@ def test_popen_runs_a_process_and_returns_outcome(self):
     def test_popen_can_accept_cwd_and_env(self):
 
         testdata_dir = os.path.join(os.path.dirname(__file__), "..", "..", "testdata")
+        env = os.environ.copy()
+        env.update({"SOME_ENV": "SOME_VALUE"})
 
         p = self.osutils.popen(
-            [sys.executable, "cwd.py"],
-            stdout=self.osutils.pipe,
-            stderr=self.osutils.pipe,
-            env=os.environ.copy().update({"SOME_ENV": "SOME_VALUE"}),
-            cwd=testdata_dir,
+            [sys.executable, "cwd.py"], stdout=self.osutils.pipe, stderr=self.osutils.pipe, env=env, cwd=testdata_dir,
         )
 
         out, err = p.communicate()

tests/integration/workflows/provided_make/test_provided_make.py

@@ -6,14 +6,16 @@
 
 from aws_lambda_builders.builder import LambdaBuilder
 from aws_lambda_builders.exceptions import WorkflowFailedError
+from aws_lambda_builders.workflows.provided_make.utils import OSUtils
 
 
 class TestProvidedMakeWorkflow(TestCase):
     """
     Verifies that `provided_make` workflow works by building a Lambda that requires Numpy
     """
 
-    TEST_DATA_FOLDER = os.path.join(os.path.dirname(__file__), "testdata", "makefile-present")
+    MAKEFILE_DIRECTORY = "makefile-windows" if OSUtils().is_windows() else "makefile-unix"
+    TEST_DATA_FOLDER = os.path.join(os.path.dirname(__file__), "testdata", MAKEFILE_DIRECTORY)
 
     def setUp(self):
         self.source_dir = self.TEST_DATA_FOLDER

tests/integration/workflows/provided_make/testdata/makefile-present/Makefile renamed to tests/integration/workflows/provided_make/testdata/makefile-unix/Makefile

@@ -0,0 +1,5 @@
+build-HelloWorldFunction:
+	copy *.py $(ARTIFACTS_DIR)
+	copy requirements-requests.txt $(ARTIFACTS_DIR)
+	python -m pip install -r requirements-requests.txt -t $(ARTIFACTS_DIR)
+	rmdir $(ARTIFACTS_DIR)\\bin /s /q

tests/integration/workflows/provided_make/testdata/makefile-present/__init__.py renamed to tests/integration/workflows/provided_make/testdata/makefile-unix/__init__.py

@@ -0,0 +1,6 @@
+import requests
+
+
+def lambda_handler(event, context):
+    # Just return the requests version.
+    return "{}".format(requests.__version__)

tests/integration/workflows/provided_make/testdata/makefile-present/main.py renamed to tests/integration/workflows/provided_make/testdata/makefile-unix/main.py

@@ -0,0 +1 @@
+requests==2.23.0

tests/integration/workflows/provided_make/testdata/makefile-present/requirements-requests.txt renamed to tests/integration/workflows/provided_make/testdata/makefile-unix/requirements-requests.txt

@@ -1,3 +1,5 @@
+import os
+
 from unittest import TestCase
 from mock import patch
 
@@ -7,6 +9,13 @@
 
 
 class TestProvidedMakeAction(TestCase):
+    def setUp(self):
+        self.original_env = os.environ
+        os.environ = {}
+
+    def tearDown(self):
+        os.environ = self.original_env
+
     @patch("aws_lambda_builders.workflows.provided_make.utils.OSUtils")
     @patch("aws_lambda_builders.workflows.provided_make.make.SubProcessMake")
     def test_call_makefile_target(self, OSUtilMock, SubprocessMakeMock):