From ae2e3e6a3d4ce82ac0d3c9faad713c57e3190d6f Mon Sep 17 00:00:00 2001 From: matt-lumer <4656758+matt-lumer@users.noreply.github.com> Date: Tue, 9 Jul 2019 11:27:11 -0400 Subject: [PATCH 1/5] Ignore .git files This causes issues on Windows machines due to file handles not being released --- aws_lambda_builders/workflows/java_maven/workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws_lambda_builders/workflows/java_maven/workflow.py b/aws_lambda_builders/workflows/java_maven/workflow.py index 9960fb938..f26b02d12 100644 --- a/aws_lambda_builders/workflows/java_maven/workflow.py +++ b/aws_lambda_builders/workflows/java_maven/workflow.py @@ -20,7 +20,7 @@ class JavaMavenWorkflow(BaseWorkflow): dependency_manager="maven", application_framework=None) - EXCLUDED_FILES = (".aws-sam") + EXCLUDED_FILES = (".aws-sam", ".git") def __init__(self, source_dir, From 432481c3f7392effe9321bf29d3465a118a0da3b Mon Sep 17 00:00:00 2001 From: matt-lumer <4656758+matt-lumer@users.noreply.github.com> Date: Tue, 3 Sep 2019 13:28:43 -0400 Subject: [PATCH 2/5] unit test for excluded files --- tests/unit/workflows/java_maven/test_workflow.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/unit/workflows/java_maven/test_workflow.py b/tests/unit/workflows/java_maven/test_workflow.py index b4f89fbfc..6897c075d 100644 --- a/tests/unit/workflows/java_maven/test_workflow.py +++ b/tests/unit/workflows/java_maven/test_workflow.py @@ -20,7 +20,7 @@ def test_workflow_sets_up_maven_actions(self): self.assertEqual(len(workflow.actions), 4) self.assertIsInstance(workflow.actions[0], CopySourceAction) - + self.assertIsInstance(workflow.actions[1], JavaMavenBuildAction) self.assertIsInstance(workflow.actions[2], JavaMavenCopyDependencyAction) @@ -42,3 +42,12 @@ def test_workflow_sets_up_validators(self): self.assertEqual(len(validators), 1) self.assertIsInstance(validators[0], MavenValidator) + + def test_workflow_excluded_files(self): + workflow = JavaMavenWorkflow("source", "artifacts", "scratch_dir", "manifest") + + self.assertIsInstance(workflow.actions[0], CopySourceAction) + + self.assertEqual(".aws_sam", workflow.actions[0].excludes[0]) + + self.assertEqual(".git", workflow.actions[0].excludes[0]) From d3d3b15b3cad839579908c414b5adb1d0268275a Mon Sep 17 00:00:00 2001 From: matt-lumer <4656758+matt-lumer@users.noreply.github.com> Date: Tue, 3 Sep 2019 13:35:17 -0400 Subject: [PATCH 3/5] fixed .aws-sam name --- tests/unit/workflows/java_maven/test_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/workflows/java_maven/test_workflow.py b/tests/unit/workflows/java_maven/test_workflow.py index 6897c075d..08d28321e 100644 --- a/tests/unit/workflows/java_maven/test_workflow.py +++ b/tests/unit/workflows/java_maven/test_workflow.py @@ -48,6 +48,6 @@ def test_workflow_excluded_files(self): self.assertIsInstance(workflow.actions[0], CopySourceAction) - self.assertEqual(".aws_sam", workflow.actions[0].excludes[0]) + self.assertEqual(".aws-sam", workflow.actions[0].excludes[0]) self.assertEqual(".git", workflow.actions[0].excludes[0]) From 4d4ae8f5a0abb738ad9fae3cf4b3bbb9103a9383 Mon Sep 17 00:00:00 2001 From: matt-lumer <4656758+matt-lumer@users.noreply.github.com> Date: Tue, 3 Sep 2019 13:41:45 -0400 Subject: [PATCH 4/5] white spaces --- tests/unit/workflows/java_maven/test_workflow.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/unit/workflows/java_maven/test_workflow.py b/tests/unit/workflows/java_maven/test_workflow.py index 08d28321e..b6de98fc8 100644 --- a/tests/unit/workflows/java_maven/test_workflow.py +++ b/tests/unit/workflows/java_maven/test_workflow.py @@ -20,7 +20,7 @@ def test_workflow_sets_up_maven_actions(self): self.assertEqual(len(workflow.actions), 4) self.assertIsInstance(workflow.actions[0], CopySourceAction) - + self.assertIsInstance(workflow.actions[1], JavaMavenBuildAction) self.assertIsInstance(workflow.actions[2], JavaMavenCopyDependencyAction) @@ -47,7 +47,7 @@ def test_workflow_excluded_files(self): workflow = JavaMavenWorkflow("source", "artifacts", "scratch_dir", "manifest") self.assertIsInstance(workflow.actions[0], CopySourceAction) - + self.assertEqual(".aws-sam", workflow.actions[0].excludes[0]) - + self.assertEqual(".git", workflow.actions[0].excludes[0]) From 5fa54d780a0597a8d46ca9e2845d108f959cb07f Mon Sep 17 00:00:00 2001 From: matt-lumer <4656758+matt-lumer@users.noreply.github.com> Date: Tue, 3 Sep 2019 13:47:44 -0400 Subject: [PATCH 5/5] typo --- tests/unit/workflows/java_maven/test_workflow.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/unit/workflows/java_maven/test_workflow.py b/tests/unit/workflows/java_maven/test_workflow.py index b6de98fc8..e2cdacc52 100644 --- a/tests/unit/workflows/java_maven/test_workflow.py +++ b/tests/unit/workflows/java_maven/test_workflow.py @@ -50,4 +50,4 @@ def test_workflow_excluded_files(self): self.assertEqual(".aws-sam", workflow.actions[0].excludes[0]) - self.assertEqual(".git", workflow.actions[0].excludes[0]) + self.assertEqual(".git", workflow.actions[0].excludes[1])