Merge pull request #160 from awslabs/develop

awood45 · web-flow · commit f7b60c756e4b · 2020-03-05T09:25:51.000-08:00
chore: Release 0.8.0
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -18,7 +18,7 @@ environment:
     NEW_FLAKE8: 0
     JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
   - PYTHON: "C:\\Python36-x64"
-    PYTHON_VERSION: '3.6.9'
+    PYTHON_VERSION: '3.6.10'
     PYTHON_ARCH: '64'
     LINE_COVERAGE: '91'
     NEW_FLAKE8: 0
@@ -30,7 +30,7 @@ environment:
     NEW_FLAKE8: 0
     JAVA_HOME: "C:\\Program Files\\Java\\jdk11"
   - PYTHON: "C:\\Python38-x64"
-    PYTHON_VERSION: '3.8.0'
+    PYTHON_VERSION: '3.8.2'
     PYTHON_ARCH: '64'
     LINE_COVERAGE: '72'
     NEW_FLAKE8: 1
diff --git a/aws_lambda_builders/__init__.py b/aws_lambda_builders/__init__.py
@@ -1,5 +1,5 @@
 """
 AWS Lambda Builder Library
 """
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 RPC_PROTOCOL_VERSION = "0.3"
diff --git a/aws_lambda_builders/workflows/go_dep/workflow.py b/aws_lambda_builders/workflows/go_dep/workflow.py
@@ -25,7 +25,7 @@ class GoDepWorkflow(BaseWorkflow):
 
     CAPABILITY = Capability(language="go", dependency_manager="dep", application_framework=None)
 
-    EXCLUDED_FILES = ".aws-sam"
+    EXCLUDED_FILES = (".aws-sam", ".git")
 
     def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs):
 
diff --git a/aws_lambda_builders/workflows/go_modules/validator.py b/aws_lambda_builders/workflows/go_modules/validator.py
@@ -47,7 +47,7 @@ def validate(self, runtime_path):
         if p.returncode == 0:
             out_parts = out.decode().split()
             if len(out_parts) >= 3:
-                version_parts = [int(x) for x in out_parts[2].replace(self.LANGUAGE, "").split(".")]
+                version_parts = [int(x.replace("rc", "")) for x in out_parts[2].replace(self.LANGUAGE, "").split(".")]
                 if len(version_parts) >= 2:
                     if version_parts[0] == expected_major_version and version_parts[1] >= min_expected_minor_version:
                         self._valid_runtime_path = runtime_path
diff --git a/aws_lambda_builders/workflows/nodejs_npm/workflow.py b/aws_lambda_builders/workflows/nodejs_npm/workflow.py
@@ -20,7 +20,7 @@ class NodejsNpmWorkflow(BaseWorkflow):
 
     CAPABILITY = Capability(language="nodejs", dependency_manager="npm", application_framework=None)
 
-    EXCLUDED_FILES = ".aws-sam"
+    EXCLUDED_FILES = (".aws-sam", ".git")
 
     def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, runtime=None, osutils=None, **kwargs):
 
diff --git a/tests/functional/workflows/python_pip/test_packager.py b/tests/functional/workflows/python_pip/test_packager.py
@@ -756,11 +756,9 @@ def test_build_into_existing_dir_with_preinstalled_packages(self, tmpdir, osutil
 class TestSubprocessPip(object):
     def test_can_invoke_pip(self):
         pip = SubprocessPip(python_exe=sys.executable)
-        rc, out, err = pip.main(["--version"])
-        # Simple assertion that we can execute pip and it gives us some output
-        # and nothing on stderr.
+        rc, _, _ = pip.main(["--version"])
+        # Simple assertion that we can execute pip
         assert rc == 0
-        assert err == b""
 
     def test_does_error_code_propagate(self):
         pip = SubprocessPip(python_exe=sys.executable)
diff --git a/tests/integration/workflows/go_dep/data/src/excluded-files/.aws-sam/.keep b/tests/integration/workflows/go_dep/data/src/excluded-files/.aws-sam/.keep
diff --git a/tests/integration/workflows/go_dep/data/src/excluded-files/Gopkg.lock b/tests/integration/workflows/go_dep/data/src/excluded-files/Gopkg.lock
diff --git a/tests/integration/workflows/go_dep/data/src/excluded-files/Gopkg.toml b/tests/integration/workflows/go_dep/data/src/excluded-files/Gopkg.toml
@@ -0,0 +1,3 @@
+[prune]
+  go-tests = true
+  unused-packages = true
diff --git a/tests/integration/workflows/go_dep/data/src/excluded-files/main.go b/tests/integration/workflows/go_dep/data/src/excluded-files/main.go
@@ -0,0 +1,7 @@
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("hello, world")
+}
diff --git a/tests/integration/workflows/go_dep/test_go_dep.py b/tests/integration/workflows/go_dep/test_go_dep.py
@@ -44,6 +44,23 @@ def test_builds_project_with_no_deps(self):
 
         self.assertEquals(expected_files, output_files)
 
+    def test_builds_project_and_excludes_hidden_aws_sam(self):
+        source_dir = os.path.join(self.TEST_DATA_FOLDER, "src", "excluded-files")
+
+        self.builder.build(
+            source_dir,
+            self.artifacts_dir,
+            self.scratch_dir,
+            os.path.join(source_dir, "Gopkg.toml"),
+            runtime=self.runtime,
+            options={"artifact_executable_name": "main"},
+        )
+
+        expected_files = {"main"}
+        output_files = set(os.listdir(self.artifacts_dir))
+
+        self.assertEquals(expected_files, output_files)
+
     def test_builds_project_with_no_gopkg_file(self):
         source_dir = os.path.join(self.TEST_DATA_FOLDER, "src", "no-gopkg")
 
diff --git a/tests/integration/workflows/nodejs_npm/test_nodejs_npm.py b/tests/integration/workflows/nodejs_npm/test_nodejs_npm.py
@@ -43,6 +43,21 @@ def test_builds_project_without_dependencies(self):
         output_files = set(os.listdir(self.artifacts_dir))
         self.assertEquals(expected_files, output_files)
 
+    def test_builds_project_and_excludes_hidden_aws_sam(self):
+        source_dir = os.path.join(self.TEST_DATA_FOLDER, "excluded-files")
+
+        self.builder.build(
+            source_dir,
+            self.artifacts_dir,
+            self.scratch_dir,
+            os.path.join(source_dir, "package.json"),
+            runtime=self.runtime,
+        )
+
+        expected_files = {"package.json", "included.js"}
+        output_files = set(os.listdir(self.artifacts_dir))
+        self.assertEquals(expected_files, output_files)
+
     def test_builds_project_with_remote_dependencies(self):
         source_dir = os.path.join(self.TEST_DATA_FOLDER, "npm-deps")
 
diff --git a/tests/integration/workflows/nodejs_npm/testdata/excluded-files/.aws-sam/.keep b/tests/integration/workflows/nodejs_npm/testdata/excluded-files/.aws-sam/.keep
diff --git a/tests/integration/workflows/nodejs_npm/testdata/excluded-files/included.js b/tests/integration/workflows/nodejs_npm/testdata/excluded-files/included.js
@@ -0,0 +1,2 @@
+//included
+const x = 1;
diff --git a/tests/integration/workflows/nodejs_npm/testdata/excluded-files/package.json b/tests/integration/workflows/nodejs_npm/testdata/excluded-files/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "nodeps",
+  "version": "1.0.0",
+  "description": "",
+  "files": ["included.js"],
+  "keywords": [],
+  "author": "",
+  "license": "APACHE2.0"
+}
diff --git a/tests/unit/workflows/go_modules/test_validator.py b/tests/unit/workflows/go_modules/test_validator.py
@@ -30,9 +30,10 @@ def test_runtime_validate_unsupported_language_fail_open(self):
         validator = GoRuntimeValidator(runtime="go2.x")
         validator.validate(runtime_path="/usr/bin/go2")
 
-    def test_runtime_validate_supported_version_runtime(self):
+    @parameterized.expand([(b"go version go1.11.2 test",), (b"go version go1.11rc.2 test",)])
+    def test_runtime_validate_supported_version_runtime(self, go_version_output):
         with mock.patch("subprocess.Popen") as mock_subprocess:
-            mock_subprocess.return_value = MockSubProcess(0, out=b"go version go1.11.2 test")
+            mock_subprocess.return_value = MockSubProcess(0, out=go_version_output)
             self.validator.validate(runtime_path="/usr/bin/go")
             self.assertTrue(mock_subprocess.call_count, 1)
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+[prune]`
	`2`	`+ go-tests = true`
	`3`	`+ unused-packages = true`