Merge pull request #145 from aws-solutions/develop

Update to version v2.3.0

CHANGELOG.md

@@ -5,6 +5,21 @@ 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).
 
+## [2.3.0] - 2024-03-12
+
+### Updated
+- Updated Python Lambda function runtime to Python 3.11
+- Updated Node Lambda function runtime to NodeJS 20
+- Patch security vulnerabilities
+- Updated outdated libraries and dependencies
+- Replaced deprecated url.parse with URL constructor
+- Updated AppRegistry Resource logical Id creation logic to generate consistent Ids
+- Updated QuickSight template to remove Twitter references
+
+### Fixed
+- Updated QuickSight template to fix issue with platform menu on Topic Analysis page
+- Fixed connection timeout issue when uploading images on S3
+
 ## [2.2.1] - 2023-10-18
 
 ### Security

NOTICE.txt

@@ -26,6 +26,17 @@ attrs under MIT License
 aws-cdk-lib under Apache License 2.0
 aws-sdk-client-mock under MIT License
 aws-solutions-constructs under Apache License 2.0
+@aws-sdk/client-firehose under Apache License Version 2.0
+@aws-sdk/client-sfn under Apache License Version 2.0
+@aws-sdk/client-dynamodb under Apache License Version 2.0
+@aws-sdk/client-eventbridge under Apache License Version 2.0
+@aws-sdk/client-kinesis under Apache License Version 2.0
+@aws-sdk/client-ssm under Apache License Version 2.0
+@aws-sdk/client-comprehend under Apache License Version 2.0
+@aws-sdk/client-rekognition under Apache License Version 2.0
+@aws-sdk/client-s3 under Apache License Version 2.0
+@aws-sdk/lib-storage under Apache License Version 2.0
+@aws-sdk/client-translate under Apache License Version 2.0
 boolean.py under BSD-2-Clause
 boto3 under Apache License 2.0
 botocore under Apache License 2.0
@@ -36,7 +47,6 @@ chai under MIT license
 constructs under Apache License 2.0
 coverage under Apache License 2.0
 crhelper under Apache License 2.0
-crypto under ISC
 cryptography under Apache Software License, BSD License (Apache License 2.0 OR BSD-3-Clause)
 et-xmlfile under MIT License
 exceptiongroup under MIT License
@@ -94,4 +104,6 @@ uritemplate under Apache Software License, BSD License (BSD 3-Clause License or
 websocket-client under Apache License 2.0
 Werkzeug under BSD License
 xmltodict under MIT License
-
+colorama under BSD License
+docutils under BSD License
+awscli under Apache License 2.0

deployment/build-s3-dist.sh

@@ -122,7 +122,7 @@ echo "--------------------------------------------------------------------------
 echo "[Install] Installing CDK $cdk_version"
 echo "------------------------------------------------------------------------------"
 
-npm install aws-cdk@$cdk_version
+npm install -g aws-cdk@$cdk_version
 
 ## Option to suppress the Override Warning messages while synthesizing using CDK
 export overrideWarningsEnabled=false
@@ -180,6 +180,14 @@ do
     sed -i -e $replace $file
 done
 
+## Replacing logical id of ServiceCatalogAppRegistry::ResourceAssociation resource to previous values to allow stack upgrades
+template_file=$template_dist_dir/discovering-hot-topics-using-machine-learning.template
+sed -i -e "s/AppRegistryResourceAssociationb45d1e4178a976D755C8/AppRegistryResourceAssociationcc06d03324874db1a6662e1611406807903F5030/1" $template_file
+sed -i -e "s/AppRegistryResourceAssociationc490c813979fC5E92A98/AppRegistryResourceAssociationd4f559e6fc5240f3bc3592f30e56951f0AE36CD8/1" $template_file
+sed -i -e "s/AppRegistryResourceAssociation666daa84115cEE166A87/AppRegistryResourceAssociation8e08b310e72540d5946fc04ccdda0abc66C36D1C/1" $template_file
+sed -i -e "s/AppRegistryResourceAssociationac1ddf3fb67759A3BEE9/AppRegistryResourceAssociationa01d8973655b4b9db7b61a97d80e97a4A72685A3/1" $template_file
+sed -i -e "s/AppRegistryResourceAssociationd047beaf2b8e83CF3FB5/AppRegistryResourceAssociationc4eb0c6a4488492999f9a7a6c8818dbcEC354414/1" $template_file
+
 echo "------------------------------------------------------------------------------"
 echo "[Packing] Source code artifacts"
 echo "------------------------------------------------------------------------------"

source/bin/discovering-hot-topics-app.ts

@@ -29,7 +29,7 @@ const dht = new DiscoveringHotTopicsStack(app, 'discovering-hot-topics-using-mac
 });
 
 NagSuppressions.addStackSuppressions(dht, [
-    { id: 'AwsSolutions-L1', reason: 'Lambda running on Node are already on latest runtime (NodeJs18). Python lambda runtime is planned to be upgraded in future release' },
+    { id: 'AwsSolutions-L1', reason: 'Lambda running on Node are already on latest runtime (NodeJs20). Python lambda runtime is Python 3.11' },
     { id: 'AwsSolutions-IAM5', reason: 'All IAM policies defined in this solution grant only least-privilege permissions. Wild card for resources is used only for services which do not have a resource arn (Comprehend, Xray, Regoknition, Translate, State Machine) ' }
 ], true);
 

source/lambda/capture_news_feed/requirements-dev.txt

@@ -1,7 +1,7 @@
-moto==4.1.10
-pytest==7.3.1
-pytest-cov==4.1.0
+moto==4.2.13
+pytest~=7.4.2
+pytest-cov~=4.1.0
 botocore
-mock==5.0.2
-responses==0.23.1
+mock~=5.1.0
+responses~=0.23.3
 -e ../layers/python_lambda_layer

source/lambda/capture_news_feed/requirements.txt

@@ -1,3 +1,3 @@
-feedparser
-tldextract
+feedparser~=6.0.10
+tldextract~=5.0.0
 urllib3<2