v2.7.3

Author: AWS

.gitignore

@@ -18,6 +18,7 @@ __pycache__
 venv
 .venv
 testing-venv
+myenv
 
 # Ignore installed dependencies
 dist

CHANGELOG.md

@@ -4,6 +4,20 @@ 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.7.3] - 2024-09-13
+- Update dependencies
+  - `PyYAML` 5.4.1 ([#154](https://github.com/aws-solutions/aws-control-tower-customizations/issues/154), [#169](https://github.com/aws-solutions/aws-control-tower-customizations/issues/169))
+  - `Jinja2` 3.1.4 ([#169](https://github.com/aws-solutions/aws-control-tower-customizations/issues/169))
+  - `requests` 2.32.2
+
+## [2.7.2] - 2024-07-18
+- Add support for AWS Regions: Asia Pacific (Hyderabad, Jakarta, and Osaka), Israel (Tel Aviv), Middle East (UAE), 
+  and AWS GovCloud (US-East). Customers with these Regions as their AWS Control Tower home Region can now deploy 
+  account customizations using the CfCT framework.
+- Enable lifecycle configuration, enable access logging and add versioning on S3 buckets 
+- Enhance security and robustness through improved handling of file paths and highly compressed data 
+- Upgrade botocore to version 1.31.17 and boto3 to version 1.28.17
+
 ## [2.7.1] - 2024-05-30
 * Update dependencies & runtimes ([#186]((https://github.com/aws-solutions/aws-control-tower-customizations/issues/186)), [#193]((https://github.com/aws-solutions/aws-control-tower-customizations/issues/193)))
   * Building the solution from source now requires Python 3.11 or higher

VERSION

@@ -1 +1 @@
-v2.7.2
+v2.7.3

customizations-for-aws-control-tower.template

@@ -61,6 +61,12 @@ fi
  echo "mkdir -p $build_dist_dir"
  mkdir -p "$build_dist_dir"
 
+# Upgrade setuptools, wheel
+# Install cython<3.0.0 and pyyaml 5.4.1 with build isolation
+# Ref: https://github.com/yaml/pyyaml/issues/724
+pip3 install --upgrade setuptools wheel
+pip3 install 'cython<3.0.0' && pip3 install --no-build-isolation pyyaml==5.4.1
+
 # Create zip file for AWS Lambda functions
 echo -e "\n Creating all lambda functions for Custom Control Tower Solution"
 python3 deployment/lambda_build.py state_machine_lambda deployment_lambda build_scripts lifecycle_event_handler state_machine_trigger

deployment/build-s3-dist.sh

@@ -49,6 +49,14 @@ def install_dependencies(
         ["pip", "install", "--quiet", lib_path, "--target", dist_folder], check=True
     )
 
+    # Capture all installed package versions into requirements.txt
+    requirements_path = os.path.join(dist_folder, "requirements.txt")
+    subprocess.run(
+        ["pip", "freeze", "--path", dist_folder],
+        check=True,
+        stdout=open(requirements_path, "w")
+    )
+
     # Include lambda handlers in distributables
     for file in glob.glob(f"{handlers_path}/*.py"):
         shutil.copy(src=file, dst=dist_folder)

deployment/lambda_build.py

@@ -16,7 +16,12 @@ echo "Python version: `python3 --version`"
 echo "Installing pip"
 pip3 install --quiet -U pip
 echo "Installing CFCT library"
-pip3 install --quiet "./source/src[test, dev]"
+# Upgrade setuptools, wheel
+# Install cython<3.0.0 and pyyaml 5.4.1 with build isolation
+# Ref: https://github.com/yaml/pyyaml/issues/724
+pip3 install --upgrade setuptools wheel
+pip3 install 'cython<3.0.0' && pip3 install --no-build-isolation pyyaml==5.4.1
+pip3 install "./source/src[test, dev]"
 echo "Running tests..."
 python3 -m pytest -m unit
 

deployment/run-unit-tests.sh

@@ -17,8 +17,9 @@ install_common_pip_packages () {
     # install pip packages
     pip install --quiet --upgrade pip==21.0.1
     pip install --quiet --upgrade setuptools
+    pip install --quiet --upgrade wheel
     pip install --quiet --upgrade virtualenv==20.4.2
-    pip install --quiet --upgrade PyYAML==5.3.1
+    pip install --quiet "cython<3.0.0" && pip install --quiet --no-build-isolation pyyaml==5.4.1
     pip install --quiet --upgrade yorm==1.6.2
     pip install --quiet --upgrade jinja2==2.11.3
     pip install --quiet --upgrade requests==2.25.1

source/codebuild_scripts/install_stage_dependencies.sh

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=70.0.0"]
+build-backend = "setuptools.build_meta"

source/src/pyproject.toml

@@ -28,10 +28,10 @@
     python_requires=">=3.11",
     install_requires=[
         "yorm==1.6.2",
-        "PyYAML==5.3.1",
-        "Jinja2==2.11.3",
+        "pyyaml>=5.4.1",
+        "Jinja2==3.1.4",
         "MarkupSafe==2.0.1",  # https://github.com/pallets/jinja/issues/1585
-        "requests==2.25.1",
+        "requests==2.32.2",
         "markdown_to_json==1.0.0",
         "python-dateutil==2.8.1",
         "boto3==1.28.17",
@@ -59,5 +59,5 @@
             "setuptools",
             "virtualenv",
         ],
-    },
+    }
 )