fix: does this work on windows?

Author: sriram-mv

aws_lambda_builders/workflows/provided_make/actions.py

@@ -2,7 +2,6 @@
 Action to build a specific Makefile target
 """
 
-import os
 import logging
 
 from aws_lambda_builders.actions import BaseAction, Purpose, ActionFailedError
@@ -58,8 +57,10 @@ def execute(self):
             self.osutils.makedirs(self.artifacts_dir)
 
         try:
-            current_env = os.environ.copy()
-            current_env.update({"ARTIFACTS_DIR": self.artifacts_dir})
+            current_env = self.osutils.environ().copy()
+            norm_abs_artifacts_dir = self.osutils.abspath(self.osutils.normpath(self.artifacts_dir))
+            LOG.info("Current Artifacts Directory : %s", norm_abs_artifacts_dir)
+            current_env.update({"ARTIFACTS_DIR": norm_abs_artifacts_dir})
             self.subprocess_make.run(
                 ["build-{logical_id}".format(logical_id=self.build_logical_id)], env=current_env, cwd=self.scratch_dir,
             )

aws_lambda_builders/workflows/provided_make/utils.py

@@ -24,6 +24,15 @@ def popen(self, command, stdout=None, stderr=None, env=None, cwd=None):
         p = subprocess.Popen(command, stdout=stdout, stderr=stderr, env=env, cwd=cwd)
         return p
 
+    def environ(self):
+        return os.environ
+
+    def normpath(self, path):
+        return os.path.normpath(path)
+
+    def abspath(self, path):
+        return os.path.abspath(path)
+
     @property
     def pipe(self):
         return subprocess.PIPE

pytest.ini

@@ -46,7 +46,7 @@ def test_must_build_python_project_through_makefile(self):
             "chardet",
             "urllib3",
             "idna",
-            "urllib3-1.25.8.dist-info",
+            "urllib3-1.25.9.dist-info",
             "chardet-3.0.4.dist-info",
             "certifi-2020.4.5.1.dist-info",
             "certifi",

tests/integration/workflows/provided_make/test_provided_make.py

@@ -1,7 +1,8 @@
 import os
 
 from unittest import TestCase
-from mock import patch
+
+from mock import patch, ANY
 
 from aws_lambda_builders.actions import ActionFailedError
 from aws_lambda_builders.workflows.provided_make.actions import ProvidedMakeAction
@@ -37,9 +38,7 @@ def test_call_makefile_target(self, OSUtilMock, SubprocessMakeMock):
 
         action.execute()
 
-        subprocess_make.run.assert_called_with(
-            ["build-logical_id"], env={"ARTIFACTS_DIR": "artifacts"}, cwd="scratch_dir"
-        )
+        subprocess_make.run.assert_called_with(["build-logical_id"], env=ANY, cwd="scratch_dir")
 
     @patch("aws_lambda_builders.workflows.provided_make.utils.OSUtils")
     @patch("aws_lambda_builders.workflows.provided_make.make.SubProcessMake")
@@ -65,6 +64,4 @@ def test_makefile_target_fails(self, OSUtilMock, SubprocessMakeMock):
         with self.assertRaises(ActionFailedError):
             action.execute()
 
-        subprocess_make.run.assert_called_with(
-            ["build-logical_id"], env={"ARTIFACTS_DIR": "artifacts"}, cwd="scratch_dir"
-        )
+        subprocess_make.run.assert_called_with(["build-logical_id"], env=ANY, cwd="scratch_dir")