Merge pull request #266 from aws-solutions/release_candidate/v1.1.4

Update to version v1.1.4

.gitignore

@@ -23,3 +23,5 @@ coverage.xml*
 .coverage
 .idea
 build
+docs/behavioral-views.drawio
+docs/deployment-view.drawio

CHANGELOG.md

@@ -59,4 +59,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Expired queue positions persist in the Virtual Waiting Room size [#208](https://github.com/aws-solutions/virtual-waiting-room-on-aws/issues/208).
 - /queue_num endpoint returns outdated results even after a reset [#214](https://github.com/aws-solutions/virtual-waiting-room-on-aws/issues/214).
 - Intermittent failures in OpenID adapter's /userInfo endpoint [#231](https://github.com/aws-solutions/virtual-waiting-room-on-aws/issues/231).
-- /expired_tokens endpoint bug when LastEvaluatedKey is present in query response [#235](https://github.com/aws-solutions/virtual-waiting-room-on-aws/pull/235).
+- /expired_tokens endpoint bug when LastEvaluatedKey is present in query response [#235](https://github.com/aws-solutions/virtual-waiting-room-on-aws/pull/235).
+
+## [1.1.4] - 2024-04-09
+
+### Fixed
+- Updated webpack-dev-middleware from 5.3.3 to 5.3.4 to resolve security vulnerability [CVE-2024-29180]
+- Updated express from 4.18.1 to 4.19.2 to resolve security vulnerability [CVE-2024-29041]
+- Updated follow-redirects from 1.15.4 to 1.15.6 to resolve security vulnerability [CVE-2024-28849]

deployment/build-open-source-dist.sh

@@ -20,8 +20,10 @@ fi
 source_template_dir="$PWD"
 dist_dir="$source_template_dir/open-source"
 dist_template_dir="$dist_dir/deployment"
+dist_docs_dir="$dist_dir/docs"
 source_dir="$source_template_dir/../source"
 github_dir="$source_template_dir/../.github"
+docs_dir="$source_template_dir/../docs"
 
 echo "------------------------------------------------------------------------------"
 echo "[Init] Clean old open-source folder"
@@ -32,6 +34,8 @@ echo "mkdir -p $dist_dir"
 mkdir -p $dist_dir
 echo "mkdir -p $dist_template_dir"
 mkdir -p $dist_template_dir
+echo "mkdir -p $dist_docs_dir"
+mkdir -p $dist_docs_dir
 
 echo "------------------------------------------------------------------------------"
 echo "[Packing] Templates"
@@ -47,12 +51,36 @@ for f in *.yaml; do
 done
 
 echo "------------------------------------------------------------------------------"
-echo "[Packing] Build Script"
+echo "[Packing] Deployment Assets"
 echo "------------------------------------------------------------------------------"
 echo "cp $source_template_dir/build-s3-dist.sh $dist_template_dir"
 cp $source_template_dir/build-s3-dist.sh $dist_template_dir
 echo "cp $source_template_dir/run-unit-tests.sh $dist_template_dir"
 cp $source_template_dir/run-unit-tests.sh $dist_template_dir
+echo "cp $source_template_dir/Dockerfile $dist_template_dir"
+cp $source_template_dir/Dockerfile $dist_template_dir
+echo "cp $source_template_dir/build-open-source-dist.sh $dist_template_dir"
+cp $source_template_dir/build-open-source-dist.sh $dist_template_dir
+echo "cp $source_template_dir/deploy.sh $dist_template_dir"
+cp $source_template_dir/deploy.sh $dist_template_dir
+echo "cp $source_template_dir/docker_build.sh $dist_template_dir"
+cp $source_template_dir/docker_build.sh $dist_template_dir
+echo "cp $source_template_dir/end-workflow-notification.py $dist_template_dir"
+cp $source_template_dir/end-workflow-notification.py $dist_template_dir
+echo "cp $source_template_dir/requirements.txt $dist_template_dir"
+cp $source_template_dir/requirements.txt $dist_template_dir
+echo "cp $source_template_dir/virtual-waiting-room-on-aws*.json $dist_template_dir"
+cp $source_template_dir/virtual-waiting-room-on-aws*.json $dist_template_dir
+
+echo "------------------------------------------------------------------------------"
+echo "[Packing] Docs"
+echo "------------------------------------------------------------------------------"
+echo "cp $docs_dir/*.md $dist_docs_dir"
+cp $docs_dir/*.md $dist_docs_dir
+echo "cp $docs_dir/*.drawio $dist_docs_dir"
+cp $docs_dir/*.drawio $dist_docs_dir
+echo "cp $docs_dir/*.jpg $dist_docs_dir"
+cp $docs_dir/*.jpg $dist_docs_dir
 
 echo "------------------------------------------------------------------------------"
 echo "[Packing] GitHub templates"
@@ -95,8 +123,12 @@ echo "find $dist_dir -iname "dist" -type d -exec rm -r "{}" \; 2> /dev/null"
 find $dist_dir -iname "dist" -type d -exec rm -r "{}" \; 2> /dev/null
 echo "find $dist_dir -iname "bower_components" -type d -exec rm -r "{}" \; 2> /dev/null"
 find $dist_dir -iname "bower_components" -type d -exec rm -r "{}" \; 2> /dev/null
-echo "find ../ -type f -name 'package-lock.json' -delete"
-find $dist_dir -type f -name 'package-lock.json' -delete
+echo "find $dist_dir -iname "__pycache__" -type d -exec rm -r "{}" \; 2> /dev/null"
+find $dist_dir -iname "__pycache__" -type d -exec rm -r "{}" \; 2> /dev/null
+echo "find ../ -type f -name 'error.txt' -delete"
+find $dist_dir -type f -name 'error.txt' -delete
+echo "find ../ -type f -name '*.zip' -delete"
+find $dist_dir -type f -name '*.zip' -delete
 
 echo "------------------------------------------------------------------------------"
 echo "[Packing] Create GitHub (open-source) zip file"

deployment/build-s3-dist.sh

@@ -40,12 +40,12 @@ while getopts ':h' OPTION; do
     h)
       echo
       echo "script usage: $(basename $0) DIST_OUTPUT_BUCKET SOLUTION_NAME VERSION"
-      echo "example usage: ./$(basename $0) mybucket virtual-waiting-room-on-aws v1.1.3"
+      echo "example usage: ./$(basename $0) mybucket virtual-waiting-room-on-aws v1.1.4"
       echo
       echo "If no arguments are passed in, the following default values are used:"
       echo "DIST_OUTPUT_BUCKET=rodeolabz"
       echo "SOLUTION_NAME=virtual-waiting-room-on-aws"
-      echo "VERSION=v1.1.3"
+      echo "VERSION=v1.1.4"
       echo
       echo "You may export export these variables in your environment and call the script using those variables:"
       echo "./$(basename $0) \$DIST_OUTPUT_BUCKET \$SOLUTION_NAME \$VERSION"
@@ -79,15 +79,16 @@ fi
 
 if [ -z "$3" ]
   then
-    echo "Setting default version to v1.1.3"
-    VERSION='v1.1.3'
+    echo "Setting default version to v1.1.4"
+    VERSION='v1.1.4'
 fi
 
 template_dir="$PWD" # /deployment
 template_dist_dir="$template_dir/global-s3-assets"
 build_dist_dir="$template_dir/regional-s3-assets"
 pkg_dir="$template_dir/pkg"
 source_dir="$template_dir/../source"
+common_version=1.1.4
 
 echo "------------------------------------------------------------------------------"
 echo "[Init] Clean old dist, node_modules and bower_components folders"
@@ -170,7 +171,7 @@ echo Lambda Functions
 cd $source_dir/core-api/lambda_functions
 rm -rf error.txt package
 mkdir package
-pip install $pkg_dir/virtual_waiting_room_on_aws_common-1.1.3-py3-none-any.whl --target ./package 2> error.txt
+pip install $pkg_dir/virtual_waiting_room_on_aws_common-$common_version-py3-none-any.whl --target ./package 2> error.txt
 RETVAL=$?
 if [ "$RETVAL" -ne "0" ]; then
     echo "ERROR: System package installation failed."
@@ -221,7 +222,7 @@ mkdir -p tmp
 # install the common package into vendor
 rm -rf vendor
 mkdir -p vendor
-pip install $pkg_dir/virtual_waiting_room_on_aws_common-1.1.3-py3-none-any.whl --target vendor
+pip install $pkg_dir/virtual_waiting_room_on_aws_common-$common_version-py3-none-any.whl --target vendor
 # generate the template and zip
 chalice package --merge-template merge_template.json tmp/
 RETVAL=$?
@@ -246,7 +247,7 @@ mkdir -p tmp/
 # install the common package into vendor
 rm -rf vendor
 mkdir -p vendor
-pip install $pkg_dir/virtual_waiting_room_on_aws_common-1.1.3-py3-none-any.whl --target vendor
+pip install $pkg_dir/virtual_waiting_room_on_aws_common-$common_version-py3-none-any.whl --target vendor
 # generate the template and zip
 chalice package --merge-template merge_template.json tmp/
 RETVAL=$?

deployment/run-unit-tests.sh

@@ -14,7 +14,7 @@ python3 -m venv "$VENV"
 source "$VENV"/bin/activate
 
 # Install the common package into the virtual envronment before running
-pip install ./pkg/virtual_waiting_room_on_aws_common-1.1.3-py3-none-any.whl || pip install -e ./../source/shared/virtual-waiting-room-on-aws-common
+pip install ./pkg/virtual_waiting_room_on_aws_common-1.1.4-py3-none-any.whl || pip install -e ./../source/shared/virtual-waiting-room-on-aws-common
 cd ./../deployment
 
 # install dependencies