Skip to content

Commit

Permalink
Merge pull request #102 from aws-solutions/release/v3.3.3
Browse files Browse the repository at this point in the history 
Update to version v3.3.3
  • Loading branch information
@groverlalit
groverlalit authored Oct 25, 2023
2 parents 1f8f861 + d6b2e8a commit 3d875ce
Show file tree
Hide file tree
Showing 72 changed files with 13,771 additions and 32,630 deletions.
2 changes: 1 addition & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ open-source
# Generated ouputs
console-manifest.json
dist
.coverage
source/**/coverage
coverage.xml
*pycache*
npm-debug.log
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ 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).

## [3.3.3] - 2023-10

### Changed
- Updated Lambda Function runtime to Python 3.11 and Node.js 18
- Tags for Application in AppRegistry

### Fixed
- Upgrade @babel/traverse to mitigate CVE-2023-45133
- Upgrade urllib3 to mitigate CVE-2023-45803

## [3.3.2] - 2023-10

### Added
Expand Down
190 changes: 95 additions & 95 deletions NOTICE.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,98 +55,98 @@ ts-node under MIT
typescript under Apache-2.0

pip packages:
winston MIT
decode-uri-component MIT
jest MIT
ts-jest MIT
ts-node MIT
typescript Apache-2.0
aws-sdk-client-mock MIT
Jinja2 3.0.3 BSD License
MarkupSafe 2.1.3 BSD License
PTable 0.9.2 BSD License
PyYAML 6.0 MIT License
Werkzeug 2.2.3 BSD License
astroid 2.15.5 GNU Lesser General Public License v2 (LGPLv2)
attrs 21.4.0 MIT License
aws-lambda-typing 2.17.0 MIT License
aws-lambda-powertools 2.14.1 MIT License
aws-sam-translator 1.68.0 Apache Software License
aws-xray-sdk 2.12.0 Apache Software License
black 23.3.0 MIT License
boto3 1.26.147 Apache Software License
boto3-stubs 1.26.147 MIT License
botocore 1.29.147 Apache Software License
botocore-stubs 1.29.147 MIT License
certifi 2022.12.7 Mozilla Public License 2.0 (MPL 2.0)
cffi 1.15.1 MIT License
cfn-lint 0.77.6 MIT License
charset-normalizer 2.0.12 MIT License
click 8.0.4 BSD License
coverage 7.2.7 Apache Software License
cryptography 41.0.1 Apache Software License, BSD License
docker 6.0.1 Apache Software License
dill 0.3.6 BSD License (BSD-3-Clause)
ecdsa 0.17.0 MIT License
exceptiongroup 1.1.1 MIT License
filelock 3.12.0 The Unlicense
freezegun 1.2.2 Apache Software License
future 0.18.2 MIT License
idna 3.4 BSD License
iniconfig 1.1.1 MIT License
isort 5.10.1 MIT License
jmespath 0.10.0 MIT License
jschema-to-python 1.2.3 MIT License
jsondiff 2.0.0 MIT License
jsonpatch 1.32 BSD License
jsonpickle 2.1.0 BSD License
jsonpointer 2.3 BSD License
jsonschema 3.2.0 MIT License
junit-xml 1.9 Freely Distributable, MIT License
lazy-object-proxy 1.7.1 BSD License
mccabe 0.6.1 MIT License
mpmath 1.3.0 BSD License
mock 4.0.3 BSD License
moto 4.1.11 Apache Software License
mypy-boto3-organizations 1.24.83 MIT License
mypy-boto3-ram 1.26.0.post1 MIT License
mypy-extensions 0.4.4 MIT License
networkx 2.6.3 BSD License
packaging 22.0 Apache Software License, BSD License
pathspec 0.9.0 Mozilla Public License 2.0 (MPL 2.0)
pbr 5.8.1 Apache Software License
pipdeptree 2.7.1 MIT License
platformdirs 2.5.4 MIT License
pluggy 1.0.0 MIT License
py 1.11.0 MIT License
pyasn1 0.4.8 BSD License
pycparser 2.21 BSD License
pydantic 1.10.8 MIT License
pylint 2.17.4 GNU General Public License v2 (GPLv2)
pyparsing 3.0.9 MIT License
pyrsistent 0.18.1 MIT License
pytest 7.2.2 MIT License
pytest-mock 3.10.0 MIT License
python-dateutil 2.8.2 Apache Software License, BSD License
python-jose 3.3.0 MIT License
pytz 2023.3.0 MIT License
regex 2023.6.3 Apache Software License
requests 2.31.0 Apache Software License
responses 0.18.0 Apache 2.0
rsa 4.9 Apache Software License
s3transfer 0.6.1 Apache Software License
sarif-om 1.0.4 MIT License
six 1.16.0 MIT License
sshpubkeys 3.3.1 BSD License
sympy 1.12 BSD License
sure 2.0.1 GNU General Public License v3 or later (GPLv3+)
tomlkit 0.11.8 MIT License
toml 0.10.2 MIT License
tomli 1.2.3 MIT License
types-awscrt 0.16.19 MIT License
types-s3transfer 0.6.1 MIT License
typing_extensions 4.6.3 Python Software Foundation License
urllib3 1.26.16 MIT License
websocket-client 1.3.3 Apache Software License
wrapt 1.13.3 BSD License
xmltodict 0.12.0 MIT License
winston MIT
decode-uri-component MIT
jest MIT
ts-jest MIT
ts-node MIT
typescript Apache-2.0
aws-sdk-client-mock MIT
Jinja2 BSD License
MarkupSafe BSD License
PTable BSD License
PyYAML MIT License
Werkzeug BSD License
astroid GNU Lesser General Public License v2 (LGPLv2)
attrs MIT License
aws-lambda-typing MIT License
aws-lambda-powertools MIT License
aws-sam-translator Apache Software License
aws-xray-sdk Apache Software License
black MIT License
boto3 Apache Software License
boto3-stubs MIT License
botocore Apache Software License
botocore-stubs MIT License
certifi Mozilla Public License 2.0 (MPL 2.0)
cffi MIT License
cfn-lint MIT License
charset-normalizer MIT License
click BSD License
coverage Apache Software License
cryptography Apache Software License, BSD License
docker Apache Software License
dill BSD License (BSD-3-Clause)
ecdsa MIT License
exceptiongroup MIT License
filelock The Unlicense
freezegun Apache Software License
future MIT License
idna BSD License
iniconfig MIT License
isort MIT License
jmespath MIT License
jschema-to-python MIT License
jsondiff MIT License
jsonpatch BSD License
jsonpickle BSD License
jsonpointer BSD License
jsonschema MIT License
junit-xml Freely Distributable, MIT License
lazy-object-proxy BSD License
mccabe MIT License
mpmath BSD License
mock BSD License
moto Apache Software License
mypy-boto3-organizations MIT License
mypy-boto3-ram MIT License
mypy-extensions MIT License
networkx BSD License
packaging Apache Software License, BSD License
pathspec Mozilla Public License 2.0 (MPL 2.0)
pbr Apache Software License
pipdeptree MIT License
platformdirs MIT License
pluggy MIT License
py MIT License
pyasn1 BSD License
pycparser BSD License
pydantic MIT License
pylint GNU General Public License v2 (GPLv2)
pyparsing MIT License
pyrsistent MIT License
pytest MIT License
pytest-mock MIT License
python-dateutil Apache Software License, BSD License
python-jose MIT License
pytz MIT License
regex Apache Software License
requests Apache Software License
responses Apache 2.0
rsa Apache Software License
s3transfer Apache Software License
sarif-om MIT License
six MIT License
sshpubkeys BSD License
sympy BSD License
sure GNU General Public License v3 or later (GPLv3+)
tomlkit MIT License
toml MIT License
tomli MIT License
types-awscrt MIT License
types-s3transfer MIT License
typing_extensions Python Software Foundation License
urllib3 MIT License
websocket-client Apache Software License
wrapt BSD License
xmltodict MIT License
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ Use the following steps if you want to customize the solution or extend the solu

### Setup

- Python Prerequisite: python=3.9 | pip3=21.3.1
- Javascript Prerequisite: node=v16.4.50 | npm=8.19.2
- Python Prerequisite: python=3.11 | pip3=23.2.1
- Javascript Prerequisite: node=v18.16.0 | npm=9.5.1

Clone the repository and make desired code changes.

Expand Down
2 changes: 1 addition & 1 deletion deployment/build-s3-dist.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ for microservices in */ ; do
microservice_name=$(basename $microservices)
cd $lambda_dir/$microservice_name
mkdir -p dist/$microservice_name
rsync -aq $lambda_dir/.venv/lib/python3.10/site-packages/ ./dist/
rsync -aq $lambda_dir/.venv/lib/python3.11/site-packages/ ./dist/
cp -R lib __init__.py main.py ./dist/$microservice_name/
cd dist
zip -rq "$microservice_name.zip" .
Expand Down
20 changes: 9 additions & 11 deletions deployment/network-orchestration-hub.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ Conditions:
FrontEndCognitoSAMLCondition: !And
- !Not [ !Equals [ !Ref CognitoSAMLProviderNameParameter, '' ] ]
- !Not [ !Equals [ !Ref CognitoSAMLProviderMetadataUrlParameter, '' ] ]
- !Condition DeployGlobalNetworkCondition
- !Condition DeployWebUiCondition
AllowExternalPrincipals:
Fn::Equals:
- Ref: AllowExternalPrincipals
Expand Down Expand Up @@ -799,7 +799,7 @@ Resources:
Handler: custom_resource.main.lambda_handler
MemorySize: 1536
Role: !Sub ${CustomResourceLambdaFunctionRole.Arn}
Runtime: python3.9
Runtime: python3.11
Timeout: 900


Expand Down Expand Up @@ -1021,7 +1021,7 @@ Resources:
Handler: tgw_vpc_attachment.main.lambda_handler
MemorySize: 1536
Role: !GetAtt 'StateMachineLambdaFunctionRole.Arn'
Runtime: python3.9
Runtime: python3.11
Timeout: 900

StateMachineRole:
Expand Down Expand Up @@ -2091,7 +2091,7 @@ Resources:
Handler: tgw_peering_attachment.main.lambda_handler
MemorySize: 1536
Role: !Sub ${TgwPeeringLambdaFunctionRole.Arn}
Runtime: python3.9
Runtime: python3.11
Timeout: 900


Expand Down Expand Up @@ -2476,7 +2476,7 @@ Resources:
SOLUTION_ID: !FindInMap [Solution, Metrics, SolutionId]
SOLUTION_VERSION: !FindInMap [SourceCode, General, Version]
Handler: index.handler
Runtime: nodejs16.x
Runtime: nodejs18.x
Timeout: 60
DependsOn:
- FrontEndCognitoTriggerFunctionRole
Expand Down Expand Up @@ -3019,12 +3019,10 @@ Resources:
- !Ref AWS::Region
- !Ref AWS::AccountId
Tags: {
'SolutionID': !FindInMap [ Solution, Metrics, SolutionId ],
'SolutionName': !FindInMap [ Solution, Data, SolutionName ],
'SolutionVersion': "%VERSION%",
'ApplicationType': 'AWS-Solutions',
'SolutionDomain': 'CloudFoundations',
'CloudFoundations:CostOptimizerForWorkspaces': !Ref "AWS::StackName"
'Solutions:SolutionID': !FindInMap [ Solution, Metrics, SolutionId ],
'Solutions:SolutionName': !FindInMap [ Solution, Data, SolutionName ],
'Solutions:SolutionVersion': "%VERSION%",
'Solutions:ApplicationType': 'AWS-Solutions'
}

AppRegistryApplicationStackAssociation:
Expand Down
Loading

0 comments on commit 3d875ce

Please sign in to comment.