From 754fa22752596d0e7b33cda4767a5298f4ad926d Mon Sep 17 00:00:00 2001 From: Connor Adams Date: Tue, 19 Sep 2023 10:23:31 +0100 Subject: [PATCH 1/3] docs: SAM Terraform support is now GA (#499) --- README.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/README.md b/README.md index 54af9e60..c3514c78 100644 --- a/README.md +++ b/README.md @@ -559,8 +559,7 @@ module "lambda_function_existing_package_from_remote_url" { ## How to use AWS SAM CLI to test Lambda Function? [AWS SAM CLI](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/serverless-sam-cli-command-reference.html) is an open source tool that help the developers to initiate, build, test, and deploy serverless -applications. Currently, SAM CLI tool only supports CFN applications, but SAM CLI team is working on a feature to extend the testing capabilities to support terraform applications (check this [Github issue](https://github.com/aws/aws-sam-cli/issues/3154) -to be updated about the incoming releases, and features included in each release for the Terraform support feature). +applications. SAM CLI tool [supports Terraform applications](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/what-is-terraform-support.html). SAM CLI provides two ways of testing: local testing and testing on-cloud (Accelerate). From ffa56e896d7c5e5c8cbc851f0c453b70e4ec100f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Eickvonder?= Date: Thu, 5 Oct 2023 17:21:40 +0200 Subject: [PATCH 2/3] fix: Fixed npm install on Windows without having to use wsl (#502) --- package.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package.py b/package.py index e2bdadfd..20ba4fdf 100644 --- a/package.py +++ b/package.py @@ -1240,12 +1240,16 @@ def install_npm_requirements(query, requirements_file, tmp_dir): shutil.copyfile(requirements_file, target_file) subproc_env = None - if not docker and OSX: - subproc_env = os.environ.copy() + npm_exec = 'npm' + if not docker: + if WINDOWS: + npm_exec = 'npm.cmd' + elif OSX: + subproc_env = os.environ.copy() # Install dependencies into the temporary directory. with cd(temp_dir): - npm_command = ['npm', 'install'] + npm_command = [npm_exec, 'install'] if docker: with_ssh_agent = docker.with_ssh_agent chown_mask = '{}:{}'.format(os.getuid(), os.getgid()) From e2500c0d4698bc81801ecf18c2cfa41d6bf8e087 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Thu, 5 Oct 2023 15:22:21 +0000 Subject: [PATCH 3/3] chore(release): version 6.0.1 [skip ci] ### [6.0.1](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v6.0.0...v6.0.1) (2023-10-05) ### Bug Fixes * Fixed npm install on Windows without having to use wsl ([#502](https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/502)) ([ffa56e8](https://github.com/terraform-aws-modules/terraform-aws-lambda/commit/ffa56e896d7c5e5c8cbc851f0c453b70e4ec100f)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ddeae12..c59a789e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +### [6.0.1](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v6.0.0...v6.0.1) (2023-10-05) + + +### Bug Fixes + +* Fixed npm install on Windows without having to use wsl ([#502](https://github.com/terraform-aws-modules/terraform-aws-lambda/issues/502)) ([ffa56e8](https://github.com/terraform-aws-modules/terraform-aws-lambda/commit/ffa56e896d7c5e5c8cbc851f0c453b70e4ec100f)) + ## [6.0.0](https://github.com/terraform-aws-modules/terraform-aws-lambda/compare/v5.3.0...v6.0.0) (2023-08-09)