Merge branch 'develop'

Author: aws-sam-cli-bot

.appveyor.yml

@@ -90,6 +90,7 @@ for:
       - sh: "nvm install ${nodejs_version}"
       - sh: "npm install [email protected] -g"
       - sh: "npm -v"
+      - sh: "go version"
       - sh: "echo $PATH"
       - sh: "java --version"
 

aws_lambda_builders/__init__.py

@@ -4,5 +4,5 @@
 
 # Changing version will trigger a new release!
 # Please make the version change as the last step of your development.
-__version__ = "1.20.0"
+__version__ = "1.21.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/workflows/custom_make/make.py

@@ -1,8 +1,11 @@
 """
 Wrapper around calling make through a subprocess.
 """
-
+import io
 import logging
+import subprocess
+import shutil
+import threading
 
 LOG = logging.getLogger(__name__)
 
@@ -82,14 +85,26 @@ def run(self, args, env=None, cwd=None):
 
         p = self.osutils.popen(invoke_make, stdout=self.osutils.pipe, stderr=self.osutils.pipe, cwd=cwd, env=env)
 
-        out, err = p.communicate()
-
-        # Typically this type of information is logged to DEBUG, however, since the Make builder
-        # can be different per customer's use case, it is helpful to always log the output so
-        # developers can diagnose any issues.
-        LOG.info(out.decode("utf8").strip())
-
-        if p.returncode != 0:
-            raise MakeExecutionError(message=err.decode("utf8").strip())
-
-        return out.decode("utf8").strip()
+        # Create a stdout variable that will contain the final stitched stdout result
+        stdout = ""
+        # Create a buffer and use a thread to gather the stderr stream into the buffer
+        stderr_buf = io.BytesIO()
+        stderr_thread = threading.Thread(target=shutil.copyfileobj, args=(p.stderr, stderr_buf), daemon=True)
+        stderr_thread.start()
+
+        # Log every stdout line by iterating
+        for line in p.stdout:
+            decoded_line = line.decode("utf-8").strip()
+            LOG.info(decoded_line)
+            # Gather total stdout
+            stdout += decoded_line
+
+        # Wait for the process to exit and stderr thread to end.
+        return_code = p.wait()
+        stderr_thread.join()
+
+        if return_code != 0:
+            # Raise an Error with the appropriate value from the stderr buffer.
+            raise MakeExecutionError(message=stderr_buf.getvalue().decode("utf8").strip())
+
+        return stdout

aws_lambda_builders/workflows/go_modules/validator.py

@@ -52,15 +52,14 @@ def validate(self, runtime_path):
 
         runtime_path = super(GoRuntimeValidator, self).validate(runtime_path)
 
-        expected_major_version = int(self.runtime.replace(self.LANGUAGE, "").split(".")[0])
-        min_expected_minor_version = 11 if expected_major_version == 1 else 0
-
         p = subprocess.Popen([runtime_path, "version"], cwd=os.getcwd(), stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         version_string, _ = p.communicate()
 
         if p.returncode == 0:
             major_version, minor_version = GoRuntimeValidator.get_go_versions(version_string.decode())
-            if major_version == expected_major_version and minor_version >= min_expected_minor_version:
+            min_expected_major_version = 1
+            min_expected_minor_version = 11 if major_version == 1 else 0
+            if major_version >= min_expected_major_version and minor_version >= min_expected_minor_version:
                 self._valid_runtime_path = runtime_path
                 return self._valid_runtime_path
 

tests/unit/workflows/custom_make/test_make.py

@@ -1,3 +1,4 @@
+import io
 from unittest import TestCase
 from mock import patch
 
@@ -8,11 +9,16 @@ class FakePopen:
     def __init__(self, out=b"out", err=b"err", retcode=0):
         self.out = out
         self.err = err
+        self.stderr = io.BytesIO(err)
+        self.stdout = [out]
         self.returncode = retcode
 
     def communicate(self):
         return self.out, self.err
 
+    def wait(self):
+        return self.returncode
+
 
 class TestSubprocessMake(TestCase):
     @patch("aws_lambda_builders.workflows.custom_make.utils.OSUtils")
@@ -67,15 +73,15 @@ def test_uses_env_and_cwd_if_supplied(self):
         )
 
     def test_returns_popen_out_decoded_if_retcode_is_0(self):
-        self.popen.out = b"some encoded text\n\n"
+        self.popen.stdout = [b"some encoded text\n\n"]
 
         result = self.under_test.run(["build_logical_id"])
 
         self.assertEqual(result, "some encoded text")
 
     def test_raises_MakeExecutionError_with_err_text_if_retcode_is_not_0(self):
         self.popen.returncode = 1
-        self.popen.err = b"some error text\n\n"
+        self.popen.stderr = io.BytesIO(b"some error text\n\n")
 
         with self.assertRaises(MakeExecutionError) as raised:
             self.under_test.run(["build-logical_id"])