Merge pull request #366 from aws/develop

chore: merge develop to master

Author: mndeveci

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,39 @@
+---
+name: Bug report
+about: Create an issue to report a bug for AWS Lambda Builders
+title: "Bug: TITLE"
+labels: ['type/bug', 'stage/needs-triage']
+assignees: ''
+
+---
+
+<!-- Make sure we don't have an existing Issue that reports the bug you are seeing (both open and closed). 
+If you do find an existing Issue, re-open or add a comment to that Issue instead of creating a new one. -->
+
+### Description:
+<!-- Briefly describe the bug you are facing.-->
+
+
+
+### Steps to reproduce:
+<!-- Provide detailed steps to replicate the bug, including steps from third party tools (CDK, etc.) -->
+
+
+
+### Observed result:
+<!-- Please provide command output with `--debug` flag set.-->
+
+
+
+### Expected result:
+<!-- Describe what you expected.-->
+
+
+
+### Additional environment details (Ex: Windows, Mac, Amazon Linux etc)
+
+1. OS:
+2. If using SAM CLI, `sam --version`:
+3. AWS region:
+
+`Add --debug flag to any SAM CLI commands you are running`

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1 @@
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1,22 @@
+---
+name: Feature request
+about: Suggest an idea/feature/enhancement for AWS Lambda Builders
+title: "Feature request: TITLE"
+labels: ['type/feature', 'stage/needs-triage']
+assignees: ''
+
+---
+
+<!-- Make sure we don't have an existing Issue for that feature request (open or closed). -->
+
+### Describe your idea/feature/enhancement
+
+Provide a clear description.
+
+Ex: I wish the AWS Lambda Builders would [...]
+
+### Proposal
+
+Add details on how to add this to the product.
+
+### Additional Details

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,8 @@
+---
+name: Other
+about: Choose if your issue doesn't apply to the other templates
+title: ''
+labels: ['stage/needs-triage']
+assignees: ''
+
+---

.github/ISSUE_TEMPLATE/other.md

@@ -34,6 +34,6 @@ jobs:
                 issue_number: context.issue.number,
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                labels: ['pr/external']
+                labels: ['pr/external', 'stage/needs-triage']
               })
             }

.github/workflows/pr-labeler.yml

@@ -1,5 +1,5 @@
 """
 AWS Lambda Builder Library
 """
-__version__ = "1.16.0"
+__version__ = "1.17.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/__init__.py

@@ -9,9 +9,6 @@
 from aws_lambda_builders.utils import which, copytree
 
 
-EXPERIMENTAL_MAVEN_SCOPE_AND_LAYER_FLAG = "experimentalMavenScopeAndLayer"
-
-
 class OSUtils(object):
     """
     Convenience wrapper around common system functions
@@ -63,10 +60,3 @@ def jar_file_filter(file_name):
         Name of the file that will be checked against if it ends with .jar or not
     """
     return bool(file_name) and isinstance(file_name, str) and file_name.endswith(".jar")
-
-
-def is_experimental_maven_scope_and_layers_active(experimental_flags):
-    """
-    A function which will determine if experimental maven scope and layer changes are active
-    """
-    return bool(experimental_flags) and EXPERIMENTAL_MAVEN_SCOPE_AND_LAYER_FLAG in experimental_flags

aws_lambda_builders/workflows/java/utils.py

@@ -6,7 +6,7 @@
 from aws_lambda_builders.actions import CleanUpAction
 from aws_lambda_builders.workflow import BaseWorkflow, Capability
 from aws_lambda_builders.workflows.java.actions import JavaCopyDependenciesAction, JavaMoveDependenciesAction
-from aws_lambda_builders.workflows.java.utils import OSUtils, is_experimental_maven_scope_and_layers_active
+from aws_lambda_builders.workflows.java.utils import OSUtils
 
 from .actions import JavaGradleBuildAction, JavaGradleCopyArtifactsAction, JavaGradleCopyLayerArtifactsAction
 from .gradle import SubprocessGradle
@@ -36,7 +36,7 @@ def __init__(self, source_dir, artifacts_dir, scratch_dir, manifest_path, **kwar
         copy_artifacts_action = JavaGradleCopyArtifactsAction(
             source_dir, artifacts_dir, self.build_output_dir, self.os_utils
         )
-        if self.is_building_layer and is_experimental_maven_scope_and_layers_active(self.experimental_flags):
+        if self.is_building_layer:
             copy_artifacts_action = JavaGradleCopyLayerArtifactsAction(
                 source_dir, artifacts_dir, self.build_output_dir, self.os_utils
             )

aws_lambda_builders/workflows/java_gradle/workflow.py

@@ -16,14 +16,13 @@ def __init__(self, **kwargs):
 
 
 class SubprocessMaven(object):
-    def __init__(self, maven_binary, os_utils=None, is_experimental_maven_scope_enabled=False):
+    def __init__(self, maven_binary, os_utils=None):
         if maven_binary is None:
             raise ValueError("Must provide Maven BinaryPath")
         self.maven_binary = maven_binary
         if os_utils is None:
             raise ValueError("Must provide OSUtils")
         self.os_utils = os_utils
-        self.is_experimental_maven_scope_enabled = is_experimental_maven_scope_enabled
 
     def build(self, scratch_dir):
         args = ["clean", "install"]
@@ -35,7 +34,7 @@ def build(self, scratch_dir):
             raise MavenExecutionError(message=stdout.decode("utf8").strip())
 
     def copy_dependency(self, scratch_dir):
-        include_scope = "runtime" if self.is_experimental_maven_scope_enabled else "compile"
+        include_scope = "runtime"
         LOG.debug("Running copy_dependency with scope: %s", include_scope)
         args = ["dependency:copy-dependencies", f"-DincludeScope={include_scope}", "-Dmdep.prependGroupId=true"]
         ret_code, stdout, _ = self._run(args, scratch_dir)