Merge branch 'develop'

Author: aws-sam-cli-bot

.github/dependabot.yml

@@ -0,0 +1,28 @@
+version: 2
+updates:
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    commit-message:
+      prefix: chore
+      include: scope
+    reviewers:
+      - aws/serverless-application-experience-sbt
+
+  - package-ecosystem: "pip"
+    directory: "/requirements"
+    schedule:
+      interval: "weekly"
+    target-branch: "develop"
+    commit-message:
+      prefix: chore
+      include: scope
+    reviewers:
+      -  aws/serverless-application-experience-sbt
+    ignore:
+      # The dependencies are intentionally pinned to certain
+      # version ranges for specific Python versions
+      - dependency-name: "flake8"
+      - dependency-name: "isort"

.github/workflows/build.yml

@@ -21,6 +21,7 @@ jobs:
       - python-integration
       - ruby-integration
       - dotnet-integration
+      - rust-cargo-lambda-integration
     steps:
       - name: report-failure
         if: |
@@ -33,7 +34,8 @@ jobs:
           needs.custom-make-integration.result != 'success' ||
           needs.python-integration.result != 'success' ||
           needs.ruby-integration.result != 'success' ||
-          needs.dotnet-integration.result != 'success'
+          needs.dotnet-integration.result != 'success' ||
+          needs.rust-cargo-lambda-integration.result != 'success'
         run: exit 1
       - name: report-success
         run: exit 0
@@ -296,3 +298,57 @@ jobs:
           python-version: ${{ matrix.python }}
       - run: make init
       - run: pytest -vv tests/integration/workflows/dotnet_clipackage
+
+  rust-cargo-lambda-integration:
+    name: ${{ matrix.os }} / ${{ matrix.python }} / rust-cargo-lambda
+    if: github.repository_owner == 'aws'
+    runs-on: ${{ matrix.os }}
+    env:
+      CARGO_LAMBDA_VERSION: 0.15.0
+    defaults:
+      run:
+        shell: bash
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+        python:
+          - "3.9"
+          - "3.8"
+          - "3.7"
+        rust:
+          - stable
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+
+      # Install and configure Rust
+      - name: Install rustup
+        run: |
+          : install rustup if needed
+          if ! command -v rustup &> /dev/null ; then
+            curl --proto '=https' --tlsv1.2 --retry 10 --retry-connrefused -fsSL "https://sh.rustup.rs" | sh -s -- --default-toolchain none -y
+            echo "${CARGO_HOME:-$HOME/.cargo}/bin" >> $GITHUB_PATH
+          fi
+        if: ${{ matrix.os }} == 'ubuntu-latest'
+      - name: rustup toolchain install ${{ matrix.rust }}
+        run: rustup toolchain install ${{ matrix.rust }} --profile minimal --no-self-update
+      - run: rustup default ${{ matrix.rust }}
+      - run: |
+          : disable incremental compilation
+          echo CARGO_INCREMENTAL=0 >> $GITHUB_ENV
+      - run: |
+          : enable colors in Cargo output
+          echo CARGO_TERM_COLOR=always >> $GITHUB_ENV
+
+      # Install and configure Cargo Lambda
+      - name: Install Cargo Lambda
+        run: pip install cargo-lambda==$CARGO_LAMBDA_VERSION
+      - run: echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - run: make init
+      - run: pytest -vv tests/integration/workflows/rust_cargo

.github/workflows/pr-labeler.yml

@@ -17,7 +17,7 @@ jobs:
       pull-requests: write
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v5
+      - uses: actions/github-script@v6
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

Makefile

@@ -2,10 +2,13 @@ init:
 	LAMBDA_BUILDERS_DEV=1 pip install -e '.[dev]'
 
 test:
-	# Run unit tests
+	# Run unit and functional tests
 	# Fail if coverage falls below 94%
 	LAMBDA_BUILDERS_DEV=1 pytest -vv --cov aws_lambda_builders --cov-report term-missing --cov-fail-under 94 tests/unit tests/functional
 
+unit-test:
+	LAMBDA_BUILDERS_DEV=1 pytest tests/unit
+
 func-test:
 	LAMBDA_BUILDERS_DEV=1 pytest tests/functional
 

README.md

@@ -18,6 +18,7 @@ Lambda Builders currently contains the following workflows
 * Typescript with esbuild
 * Ruby with Bundler
 * Go with Mod
+* Rust with Cargo
 
 In Addition to above workflows, AWS Lambda Builders also supports *Custom Workflows* through a Makefile.
 

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.26.0"
+__version__ = "1.27.0"
 RPC_PROTOCOL_VERSION = "0.3"

aws_lambda_builders/__main__.py

@@ -6,16 +6,16 @@
 Read the design document for explanation of the JSON-RPC interface
 """
 
-import sys
 import json
-import os
 import logging
+import os
 import re
+import sys
 
+from aws_lambda_builders import RPC_PROTOCOL_VERSION as lambda_builders_protocol_version
 from aws_lambda_builders.architecture import X86_64
 from aws_lambda_builders.builder import LambdaBuilder
-from aws_lambda_builders.exceptions import WorkflowNotFoundError, WorkflowUnknownError, WorkflowFailedError
-from aws_lambda_builders import RPC_PROTOCOL_VERSION as lambda_builders_protocol_version
+from aws_lambda_builders.exceptions import WorkflowFailedError, WorkflowNotFoundError, WorkflowUnknownError
 
 log_level = int(os.environ.get("LAMBDA_BUILDERS_LOG_LEVEL", logging.INFO))
 

aws_lambda_builders/actions.py

@@ -6,7 +6,7 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Set, Iterator, Tuple
+from typing import Iterator, Set, Tuple
 
 from aws_lambda_builders import utils
 from aws_lambda_builders.utils import copytree

aws_lambda_builders/builder.py

@@ -3,11 +3,11 @@
 """
 
 import importlib
-import os
 import logging
+import os
 
 from aws_lambda_builders.architecture import X86_64
-from aws_lambda_builders.registry import get_workflow, DEFAULT_REGISTRY
+from aws_lambda_builders.registry import DEFAULT_REGISTRY, get_workflow
 from aws_lambda_builders.workflow import Capability
 
 LOG = logging.getLogger(__name__)

aws_lambda_builders/utils.py

@@ -2,10 +2,10 @@
 Common utilities for the library
 """
 
+import logging
+import os
 import shutil
 import sys
-import os
-import logging
 from pathlib import Path
 from typing import Union