Merge pull request #253 from aws-solutions/release/v1.1.2

Merge changes for release v1.1.2

CHANGELOG.md

@@ -40,3 +40,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Update runtime versions for pipeline files
 - Update GitHub workflows used for push/PR
 - Dependency updates
+
+## [1.1.2] - 2023-11-01
+
+### Updated
+
+- Resolve dependabot alerts and fix critical vulnerabilities.
+- Dependency updates.

NOTICE.txt

@@ -17,7 +17,9 @@ This software includes third party software subject to the following copyrights:
 @vue/cli-plugin-router the MIT License (MIT)
 @vue/cli-service under the MIT License (MIT)
 @vue/compiler-sfc under the MIT License (MIT)
+@babel/core under the MIT License (MIT)
 async-timeout under the Apache License Version 2.0
+annotated-types under the MIT License (MIT)
 attrs under the MIT License (MIT)
 AWS SDK under the Apache License Version 2.0
 aws-requests-auth under the BSD License
@@ -56,6 +58,7 @@ inquirer under the MIT License (MIT)
 jmespath under the MIT License (MIT)
 jquery under the MIT License (MIT)
 jschema-to-python under the MIT License (MIT)
+jsonschema-specifications under the MIT License (MIT)
 jsonpatch under the BSD License
 jsonpickle under the BSD License
 jsonpointer under the BSD License
@@ -64,6 +67,7 @@ junit-xml under the MIT License (MIT)
 jwcrypto under the GNU Lesser General Public License v3.0
 lodash under the MIT License (MIT)
 moment under the MIT License (MIT)
+mpmath under the BSD License
 naive-ui under the MIT License (MIT)
 networkx under the MIT License (MIT)
 packaging under the BSD License
@@ -72,13 +76,19 @@ pep517 under the MIT License (MIT)
 piprot under the MIT License (MIT)
 pyasn1 under the MIT License (MIT)
 pycparser under the BSD License
+pydantic under the MIT License (MIT)
+pydantic_core under the MIT License (MIT)
+pyproject_hooks under the MIT License (MIT)
 pyparsing under the MIT License (MIT)
 pyrsistent under the MIT License (MIT)
 python-dateutil under the Apache License Version 2.0
 python-editor under the Apache License Version 2.0
 PyYAML under the MIT License (MIT)
+rpds-py under the MIT License (MIT)
 readchar under the MIT License (MIT)
 redis under the MIT License (MIT)
+referencing under the MIT License (MIT)
+regex under the Apache License Version 2.0
 requests under the Apache License Version 2.0
 requests-futures under the Apache License Version 2.0
 rsa under the Apache License Version 2.0
@@ -90,11 +100,13 @@ sarif-om under the MIT License (MIT)
 simple-statistics under the ISC License
 six under the MIT License (MIT)
 smmap under the BSD License
+sympy under the BSD License
 stevedore under the Apache License Version 2.0
 testresources under the BSD License
 toml under the MIT License (MIT)
 tomli under the MIT License (MIT)
 typing-extensions under the Python Software Foundation License
+typing_extensions under the Python Software Foundation License
 urllib3 under the MIT License (MIT)
 vfonts under the MIT License (MIT)
 vue under the MIT License (MIT)

README.md

@@ -46,8 +46,7 @@ aws s3 sync regional-s3-assets/ s3://<MY-BUCKET-NAME>-<AWS-REGION>/$SOLUTION_NAM
 * Install the common package into the virtual envronment before running
 ```
 cd ./deployment
-pip install ./pkg/virtual_waiting_room_on_aws_common-1.1.1-py3-none-any.whl
-chmod +x ./run-unit-tests.sh  
+chmod +x ./run-unit-tests.sh 
 ./run-unit-tests.sh 
 ```
 
@@ -95,6 +94,12 @@ chmod +x ./run-unit-tests.sh
 
 ***
 
+## Collection of operational metrics
+
+This solution collects anonymized operational metrics to help AWS improve the
+quality of features of the solution. For more information, including how to disable
+this capability, please see the [implementation guide](https://docs.aws.amazon.com/solutions/latest/virtual-waiting-room-on-aws/collection-of-operational-metrics.html).
+
 
 Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 

deployment/Dockerfile

@@ -1,7 +1,5 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2
+FROM public.ecr.aws/lambda/python:3.11
 CMD bash
-RUN mkdir -p site-packages/
-RUN amazon-linux-extras enable python3.8
-RUN yum install -y python3.8
-RUN pip3.8 install pip --upgrade
-RUN pip install -t site-packages/ jwcrypto
+WORKDIR /site-packages
+RUN pip3.11 install --upgrade pip
+RUN pip3.11 install -t . jwcrypto

deployment/build-s3-dist.sh

@@ -45,7 +45,7 @@ while getopts ':h' OPTION; do
       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.0"
+      echo "VERSION=v1.1.2"
       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,8 +79,8 @@ fi
 
 if [ -z "$3" ]
   then
-    echo "Setting default version to v1.1.0"
-    VERSION='v1.1.0'
+    echo "Setting default version to v1.1.2"
+    VERSION='v1.1.2'
 fi
 
 template_dir="$PWD" # /deployment
@@ -110,14 +110,14 @@ echo "--------------------------------------------------------------------------
 echo "virtual-waiting-room-on-aws-common package"
 echo "------------------------------------------------------------------------------"
 cd $source_dir/shared/virtual-waiting-room-on-aws-common
-python -m build -o $pkg_dir
+python3 -m build -o $pkg_dir
 
 
 echo "------------------------------------------------------------------------------"
 echo "Redis layer"
 echo "------------------------------------------------------------------------------"
 # build the redis layer Zip file
-layer_dir=$source_dir/python/lib/python3.8/site-packages/
+layer_dir=$source_dir/python/lib/python3.11/site-packages/
 mkdir -p $layer_dir
 cd $source_dir
 rm -rf error.txt
@@ -170,7 +170,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.1-py3-none-any.whl --target ./package 2> error.txt
+pip install $pkg_dir/virtual_waiting_room_on_aws_common-1.1.2-py3-none-any.whl --target ./package 2> error.txt
 RETVAL=$?
 if [ "$RETVAL" -ne "0" ]; then
     echo "ERROR: System package installation failed."
@@ -221,7 +221,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.1-py3-none-any.whl --target vendor
+pip install $pkg_dir/virtual_waiting_room_on_aws_common-1.1.2-py3-none-any.whl --target vendor
 # generate the template and zip
 chalice package --merge-template merge_template.json tmp/
 RETVAL=$?
@@ -246,7 +246,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.1-py3-none-any.whl --target vendor
+pip install $pkg_dir/virtual_waiting_room_on_aws_common-1.1.2-py3-none-any.whl --target vendor
 # generate the template and zip
 chalice package --merge-template merge_template.json tmp/
 RETVAL=$?

deployment/docker_build.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-target_dir="../source/python/lib/python3.8/"
+target_dir="../source/python/lib/python3.11/"
 
 if [ ! -f Dockerfile ]; then
     echo "*** Dockerfile is not here, are you in the right place? ***"

deployment/requirements.txt

@@ -7,11 +7,11 @@ cfn-lint
 chalice
 coverage
 crhelper
-cryptography
+cryptography>=41.0.5
 docker
 jwcrypto
 python-dateutil
 redis
 requests
 testresources
-coverage
+urllib3>=1.26.18

deployment/run-unit-tests.sh

@@ -7,12 +7,26 @@
 # ./run-unit-tests.sh
 #
 
+
+# configure the environment
+VENV=$(mktemp -d) && echo "$VENV"
+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.2-py3-none-any.whl || pip install -e ./../source/shared/virtual-waiting-room-on-aws-common
+cd ./../deployment
+
+# install dependencies
+pip install -r requirements.txt
+
 # Get reference for all important folders
 template_dir="$PWD"
 echo "template_dir" $template_dir
 source_dir="$template_dir/../source"
 echo "source_dir" $source_dir
 
+
 echo "------------------------------------------------------------------------------"
 echo " Test core API lambda functions"
 echo "------------------------------------------------------------------------------"

deployment/virtual-waiting-room-on-aws-api-gateway-cw-logs-role.json

@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "Virtual Waiting Room on AWS API Gateway CW Logs Role %%VERSION%%",
+  "Description": "(SO0166) - Virtual Waiting Room on AWS API Gateway CW Logs Role %%VERSION%%",
   "Resources": {
     "CloudWatchRole": {
       "Type": "AWS::IAM::Role",

deployment/virtual-waiting-room-on-aws-getting-started.json

@@ -1,6 +1,6 @@
 {
     "AWSTemplateFormatVersion": "2010-09-09",
-    "Description": "Virtual Waiting Room on AWS Getting Started %%VERSION%%",
+    "Description": "(SO0166) - Virtual Waiting Room on AWS Getting Started %%VERSION%%",
     "Resources": {
         "CoreModuleStack": {
             "Type": "AWS::CloudFormation::Stack",