Merge pull request #44 from sanjay-reddy-kandi/main

release/v1.8.13

Author: groverlalit

.gitignore

@@ -8,7 +8,6 @@
 !source/lambda/**/*.js
 !**/cdk-solution-helper/index.js
 
-package-lock.json
 node_modules
 **/__pycache__/*
 *.venv-test/

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.8.13] - 2024-11-27
+### Changed
+- Upgraded cross-spawn to mitigate CVE-2024-21538
+- Added Locked Dependency Versions
+
 ## [1.8.12] - 2024-09-18
 ### Changed
 - Upgraded path-to-regexp to mitigate CVE-2024-45296

deployment/build-s3-dist.sh

@@ -157,18 +157,12 @@ for folder in */ ; do
         fi
     done
 
-    if [ -e "requirements.txt" ]; then
-        echo "Installing python lambda using virtual environment"
-        python3 -m venv .venv-test
-        echo "Activating virtual environment"
-        source .venv-test/bin/activate
-        python3 -m pip install -U pip setuptools
-        echo "Executing pip3 install -q -r requirements.txt --target ./"
-        python3 -m pip install -q -r requirements.txt --target ./
-        echo "Deactivating virtual environment"
-        deactivate
-        echo "Deleting python virtual environment"
-        rm -fr .venv-test
+    if [ -e "pyproject.toml" ]; then
+        echo "Installing python lambda using Poetry"
+        "$POETRY_HOME"/bin/poetry install --no-dev
+        "$POETRY_HOME"/bin/poetry export -f requirements.txt --output requirements.txt --without-hashes
+        pip3 install -r requirements.txt --target ./
+        rm requirements.txt
     elif [ -e "package.json" ]; then
         echo "Installing node dependencies"
         echo "Executing do_cmd npm install --omit=dev"

deployment/run-unit-tests.sh

@@ -55,23 +55,6 @@ else
     export SOLUTION_TRADEMARKEDNAME
 fi
 
-setup_python_env() {
-	if [ -d "./.venv-test" ]; then
-		echo "Reusing already setup python venv in ./.venv-test. Delete ./.venv-test if you want a fresh one created."
-		return
-	fi
-	echo "Setting up python venv"
-	python3 -m venv .venv-test
-	echo "Initiating virtual environment"
-	source .venv-test/bin/activate
-	echo "Installing python packages"
-	pip3 install -U pip setuptools
-	pip3 install -r requirements.txt --target .
-	pip3 install -r requirements-dev.txt
-	echo "deactivate virtual environment"
-	deactivate
-}
-
 run_python_lambda_test() {
 	lambda_name=$1
 	lambda_description=$2
@@ -80,12 +63,12 @@ run_python_lambda_test() {
 	echo "------------------------------------------------------------------------------"
 	cd $source_dir/lambda/$lambda_name
 
-	[ "${CLEAN:-true}" = "true" ] && rm -fr .venv-test
-
-	setup_python_env
+	echo "Installing python packages"
+	# This creates a virtual environment based on the project name in pyproject.toml.
+	"$POETRY_HOME"/bin/poetry install
 
 	echo "Initiating virtual environment"
-	source .venv-test/bin/activate
+  	source $("$POETRY_HOME"/bin/poetry env info --path)/bin/activate
 
 	# setup coverage report path
 	mkdir -p $source_dir/test/coverage-reports
@@ -103,7 +86,6 @@ run_python_lambda_test() {
 	deactivate
 
 	if [ "${CLEAN:-true}" = "true" ]; then
-		rm -fr .venv-test
 		# Note: leaving $source_dir/test/coverage-reports to allow further processing of coverage reports
 		rm -fr coverage
 		rm .coverage

solution-manifest.yaml

@@ -2,7 +2,7 @@
 id: SO0143 # Solution Id
 name: devops-monitoring-dashboard-on-aws # trademarked name
 opensource_archive: aws-devops-monitoring-dashboard.zip
-version: v1.8.12 # current version of the solution. Used to verify template headers
+version: v1.8.13 # current version of the solution. Used to verify template headers
 cloudformation_templates: # This list should match with AWS CloudFormation templates section of IG
   - template: aws-devops-monitoring-dashboard.template
     main_template: true

source/bin/aws_devops_monitoring_dashboard.ts

@@ -19,7 +19,7 @@ const SOLUTION_NAME = process.env['SOLUTION_NAME'] || 'undefined';
 const DIST_VERSION = process.env['DIST_VERSION'] || '%%VERSION%%';
 const DIST_OUTPUT_BUCKET = process.env['DIST_OUTPUT_BUCKET'] || '%%BUCKET%%';
 const DIST_SOLUTION_NAME = process.env['DIST_SOLUTION_NAME'] || '%%SOLUTION%%';
-const LAMBDA_RUNTIME_NODEJS = lambda.Runtime.NODEJS_20_X;
+const LAMBDA_RUNTIME_NODEJS = lambda.Runtime.NODEJS_22_X;
 const TEMPLATE_FORMAT_VERSION = '2010-09-09';
 
 const app = new cdk.App();