Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
aws-sam-cli-bot committed Feb 21, 2024
2 parents 4861691 + 9115992 commit f81fc29
Show file tree
Hide file tree
Showing 60 changed files with 228 additions and 181 deletions.
14 changes: 0 additions & 14 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand All @@ -88,7 +87,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -120,7 +118,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -154,7 +151,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -182,7 +178,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -213,7 +208,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -242,7 +236,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand All @@ -267,7 +260,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -296,7 +288,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand All @@ -310,9 +301,6 @@ jobs:
- uses: ruby/setup-ruby@v1
with:
ruby-version: "3.2"
- uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7"
- run: make init
- run: pytest -vv tests/integration/workflows/ruby_bundler

Expand All @@ -327,7 +315,6 @@ jobs:
- ubuntu-latest
- windows-latest
python:
- "3.7"
- "3.8"
- "3.9"
- "3.10"
Expand Down Expand Up @@ -359,7 +346,6 @@ jobs:
python:
- "3.9"
- "3.8"
- "3.7"
rust:
- stable
steps:
Expand Down
2 changes: 1 addition & 1 deletion aws_lambda_builders/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
# Changing version will trigger a new release!
# Please make the version change as the last step of your development.

__version__ = "1.45.0"
__version__ = "1.46.0"
RPC_PROTOCOL_VERSION = "0.3"
1 change: 1 addition & 0 deletions aws_lambda_builders/architecture.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""
Enum for determining type of architectures for Lambda Function.
"""

X86_64 = "x86_64"
ARM64 = "arm64"
1 change: 1 addition & 0 deletions aws_lambda_builders/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Common utilities for the library
"""

import locale
import logging
import os
Expand Down
5 changes: 1 addition & 4 deletions aws_lambda_builders/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,22 @@
LOG = logging.getLogger(__name__)

SUPPORTED_RUNTIMES = {
"nodejs12.x": [ARM64, X86_64],
"nodejs14.x": [ARM64, X86_64],
"nodejs16.x": [ARM64, X86_64],
"nodejs18.x": [ARM64, X86_64],
"nodejs20.x": [ARM64, X86_64],
"python3.7": [X86_64],
"python3.8": [ARM64, X86_64],
"python3.9": [ARM64, X86_64],
"python3.10": [ARM64, X86_64],
"python3.11": [ARM64, X86_64],
"python3.12": [ARM64, X86_64],
"ruby2.7": [ARM64, X86_64],
"ruby3.2": [ARM64, X86_64],
"java8": [ARM64, X86_64],
"java11": [ARM64, X86_64],
"java17": [ARM64, X86_64],
"java21": [ARM64, X86_64],
"go1.x": [ARM64, X86_64],
"dotnet6": [ARM64, X86_64],
"dotnet8": [ARM64, X86_64],
"provided": [ARM64, X86_64],
}

Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/workflow.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Implementation of a base workflow
"""

import functools
import logging
import os
Expand Down
1 change: 0 additions & 1 deletion aws_lambda_builders/workflows/custom_make/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@


class CustomMakeAction(BaseAction):

"""
A Lambda Builder Action that builds and packages a provided runtime project using Make.
"""
Expand Down
3 changes: 1 addition & 2 deletions aws_lambda_builders/workflows/custom_make/make.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Wrapper around calling make through a subprocess.
"""

import io
import logging
import shutil
Expand All @@ -11,7 +12,6 @@


class MakeExecutionError(Exception):

"""
Exception raised in case Make execution fails.
It will pass on the standard error output from the Make console.
Expand All @@ -24,7 +24,6 @@ def __init__(self, **kwargs):


class SubProcessMake(object):

"""
Wrapper around the Make command line utility, making it
easy to consume execution results.
Expand Down
1 change: 0 additions & 1 deletion aws_lambda_builders/workflows/custom_make/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@


class OSUtils(object):

"""
Wrapper around file system functions, to make it easy to
unit test actions in memory
Expand Down
2 changes: 1 addition & 1 deletion aws_lambda_builders/workflows/custom_make/workflow.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
ProvidedMakeWorkflow
"""

from aws_lambda_builders.actions import CopySourceAction
from aws_lambda_builders.path_resolver import PathResolver
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
Expand All @@ -13,7 +14,6 @@


class CustomMakeWorkflow(BaseWorkflow):

"""
A Lambda builder workflow for provided runtimes based on make.
"""
Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/workflows/dotnet_clipackage/utils.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Commonly used utilities
"""

import logging
import os
import platform
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
.NET Core CLI Package Workflow
"""

from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability

from .actions import GlobalToolInstallAction, RunPackageAction
Expand All @@ -10,7 +11,6 @@


class DotnetCliPackageWorkflow(BaseWorkflow):

"""
A Lambda builder workflow that knows to build and package .NET Core Lambda functions
"""
Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/workflows/go_modules/builder.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Build a Go project using standard Go tooling
"""

import logging
from pathlib import Path

Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/workflows/go_modules/workflow.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Go Modules Workflow
"""

from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability

from .actions import GoModulesBuildAction
Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/workflows/java_gradle/workflow.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Java Gradle Workflow
"""

import hashlib
import os

Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/workflows/java_maven/workflow.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Java Maven Workflow
"""

from aws_lambda_builders.actions import CleanUpAction, CopySourceAction
from aws_lambda_builders.workflow import BaseWorkflow, BuildDirectory, BuildInSourceSupport, Capability
from aws_lambda_builders.workflows.java.actions import JavaCopyDependenciesAction, JavaMoveDependenciesAction
Expand Down
5 changes: 0 additions & 5 deletions aws_lambda_builders/workflows/nodejs_npm/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@


class NodejsNpmPackAction(BaseAction):

"""
A Lambda Builder Action that packages a Node.js package using NPM to extract the source and remove test resources
"""
Expand Down Expand Up @@ -151,7 +150,6 @@ def execute(self):


class NodejsNpmCIAction(BaseAction):

"""
A Lambda Builder Action that installs NPM project dependencies
using the CI method - which is faster and better reproducible
Expand Down Expand Up @@ -201,7 +199,6 @@ def execute(self):


class NodejsNpmrcAndLockfileCopyAction(BaseAction):

"""
A Lambda Builder Action that copies lockfile and NPM config file .npmrc
"""
Expand Down Expand Up @@ -247,7 +244,6 @@ def execute(self):


class NodejsNpmrcCleanUpAction(BaseAction):

"""
A Lambda Builder Action that cleans NPM config file .npmrc
"""
Expand Down Expand Up @@ -288,7 +284,6 @@ def execute(self):


class NodejsNpmLockFileCleanUpAction(BaseAction):

"""
A Lambda Builder Action that cleans up garbage lockfile left by 7 in node_modules
"""
Expand Down
1 change: 0 additions & 1 deletion aws_lambda_builders/workflows/nodejs_npm/exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
Exceptions for the Node.js workflow
"""


from aws_lambda_builders.exceptions import LambdaBuilderError


Expand Down
1 change: 0 additions & 1 deletion aws_lambda_builders/workflows/nodejs_npm/npm.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@


class SubprocessNpm(object):

"""
Wrapper around the NPM command line utility, making it
easy to consume execution results.
Expand Down
1 change: 0 additions & 1 deletion aws_lambda_builders/workflows/nodejs_npm/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@


class OSUtils(object):

"""
Wrapper around file system functions, to make it easy to
unit test actions in memory
Expand Down
1 change: 0 additions & 1 deletion aws_lambda_builders/workflows/nodejs_npm/workflow.py
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@


class NodejsNpmWorkflow(BaseWorkflow):

"""
A Lambda builder workflow that knows how to pack
NodeJS projects using NPM.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Actions specific to the esbuild bundler
"""

import logging
from typing import Any, Dict

Expand All @@ -17,7 +18,6 @@


class EsbuildBundleAction(BaseAction):

"""
A Lambda Builder Action that packages a Node.js package using esbuild into a single file
optionally transpiling TypeScript
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Wrapper around calling esbuild through a subprocess.
"""

import logging
from pathlib import Path
from typing import Any, Callable, Dict, List, Union
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Esbuild specific exceptions
"""

from aws_lambda_builders.actions import ActionFailedError
from aws_lambda_builders.exceptions import LambdaBuilderError

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@


class NodejsNpmEsbuildWorkflow(BaseWorkflow):

"""
A Lambda builder workflow that uses esbuild to bundle Node.js and transpile TS
NodeJS projects using NPM with esbuild.
Expand Down
2 changes: 1 addition & 1 deletion aws_lambda_builders/workflows/python_pip/DESIGN.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def build_dependencies(artifacts_dir_path,
:type runtime: str
:param runtime: Python version to build dependencies for. This can
either be python3.7, python3.8, python3.9, python3.10, python3.11 or python3.12. These are
either be python3.8, python3.9, python3.10, python3.11 or python3.12. These are
currently the only supported values.
:type ui: :class:`lambda_builders.actions.python_pip.utils.UI`
Expand Down
1 change: 1 addition & 0 deletions aws_lambda_builders/workflows/python_pip/exceptions.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
"""
Python pip specific workflow exceptions.
"""

from aws_lambda_builders.exceptions import LambdaBuilderError


Expand Down
Loading

0 comments on commit f81fc29

Please sign in to comment.