Merge pull request #16 from aws-solutions/release/v3.1.4

owen-brady · web-flow · commit 80bccdb0fbe4 · 2025-10-24T17:24:20.000-04:00
Publish v3.1.4 Patch Release
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,7 +19,7 @@ A clear and concise description of what you expected to happen.
 **Please complete the following information about the solution:**
 - [ ] Version: [e.g. v1.0.0]
 
-To get the version of the solution, you can look at the description of the created CloudFormation stack. For example, "_(SO0193) - Amazon Marketing Cloud Insights. Version **v1.0.0**_". If you have not yet installed the stack, or are unable to install due to a problem, you can find the version and solution ID in the template with a text editor. Open the .template file and search for `SOLUTION_VERSION` in the content. You will find several matches and they will all be the same value:
+To get the version of the solution, you can look at the description of the created CloudFormation stack. For example, "_(SO0193) - Amazon Marketing Cloud Insights on AWS. Version **v1.0.0**_". If you have not yet installed the stack, or are unable to install due to a problem, you can find the version and solution ID in the template with a text editor. Open the .template file and search for `SOLUTION_VERSION` in the content. You will find several matches and they will all be the same value:
 
 ```json
     "Environment": {
diff --git a/.gitignore b/.gitignore
@@ -36,3 +36,6 @@ source/cdk_solution_helper_py/helpers_cdk/build/*
 # local sonarqube
 .scannerwork/*
 
+# Builder tools
+build/*
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ 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.1.4] - 2025-10-24
+
+### Changed
+
+- Upgrade Python Lambda runtimes from 3.9 to 3.11
+
 ## [3.1.3] - 2025-07-02
 
 ### Changed
diff --git a/README.md b/README.md
@@ -191,4 +191,4 @@ This solution collects anonymized operational metrics to help AWS improve the qu
 
 ## License
 
-This project is licensed under the Apache-2.0 License.
+This project is licensed under the Apache-2.0 License.
diff --git a/solution-manifest.yaml b/solution-manifest.yaml
@@ -1,6 +1,6 @@
 id: SO0193
 name: amazon-marketing-cloud-insights-on-aws
-version: v3.1.3
+version: v3.1.4
 cloudformation_templates:
   - template: amazon-marketing-cloud-insights.template
     main_template: true
diff --git a/source/cdk_solution_helper_py/README.md b/source/cdk_solution_helper_py/README.md
@@ -1,6 +1,6 @@
 ## Prerequisites
 
-- [Python 3.9](https://www.python.org/downloads/)
+- [Python 3.11](https://www.python.org/downloads/)
 - [AWS CDK](https://aws.amazon.com/cdk/) version 2.45.0 or higher
 
 ## Build the solution for deployment
diff --git a/source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/aws_lambda/cfn_custom_resources/solutions_metrics/metrics.py b/source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/aws_lambda/cfn_custom_resources/solutions_metrics/metrics.py
@@ -40,7 +40,7 @@ def __init__(
             / "custom_resources"
             / "metrics.py",
             function="handler",
-            runtime=lambda_.Runtime.PYTHON_3_9,
+            runtime=lambda_.Runtime.PYTHON_3_11,
         )
         add_cfn_nag_suppressions(
             resource=self._metrics_function.node.default_child,
diff --git a/source/cdk_solution_helper_py/helpers_cdk/setup.py b/source/cdk_solution_helper_py/helpers_cdk/setup.py
@@ -43,14 +43,14 @@ def get_version():
         "aws_cdk_lib>=2.7.0",
         "Click>=7.1.2",
         "boto3>=1.17.52",
-        "requests>=2.32.0",
+        "requests==2.32.4",
         "crhelper>=2.0.6",
     ],
     entry_points="""
         [console_scripts]
         build-s3-cdk-dist=aws_solutions.cdk.scripts.build_s3_cdk_dist:cli
     """,
-    python_requires=">=3.7",
+    python_requires=">=3.11",
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
@@ -60,6 +60,7 @@ def get_version():
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Utilities",
         "Typing :: Typed",
diff --git a/source/cdk_solution_helper_py/helpers_common/setup.py b/source/cdk_solution_helper_py/helpers_common/setup.py
@@ -32,8 +32,8 @@ def get_version():
     license="Apache License 2.0",
     packages=setuptools.find_namespace_packages(exclude=("build",)),
     install_requires=[
-        "boto3>=1.17.52",
-        "pip>=22.3",
+        "boto3>=1.40.3",
+        "pip>=25.2",
     ],
     python_requires=">=3.7",
     classifiers=[
@@ -45,6 +45,7 @@ def get_version():
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Utilities",
         "Typing :: Typed",
diff --git a/source/cdk_solution_helper_py/requirements-dev.txt b/source/cdk_solution_helper_py/requirements-dev.txt
@@ -1,7 +1,7 @@
 aws_cdk_lib>=2.45.0
 black
 boto3>=1.17.49
-requests>=2.32.0
+requests==2.32.4
 crhelper>=2.0.6
 Click
 moto
diff --git a/source/infrastructure/amc_insights/amc_insights_stack.py b/source/infrastructure/amc_insights/amc_insights_stack.py
@@ -20,7 +20,6 @@
 from data_lake.utils.datasets_config import DatasetsConfigs
 from amc_insights.solution_buckets.solution_buckets import SolutionBuckets
 from amc_insights.integration.integration_construct import IntegrationConstruct
-from amc_insights.app_registry import AppRegistry
 from amc_insights.custom_resource.user_scripts.user_scripts_construct import UserScriptsCustomResource
 from amc_insights.admin_policy.admin_policy_construct import AdminPolicy
 from amc_insights.custom_resource.lakeformation_settings.lakeformation_settings import LakeformationSettings
@@ -91,7 +90,6 @@ def __init__(self, scope: Construct, id: str, *args: Any, **kwargs: Any) -> None
 
         # Aspects
         self._suppress_cfn_nag_warnings_on_stack()
-        Aspects.of(self).add(AppRegistry(self, f'AppRegistry-{id}'))
 
         self._environment_id = "dev"
         self._team = "adtech"
diff --git a/source/infrastructure/amc_insights/app_registry.py b/source/infrastructure/amc_insights/app_registry.py
diff --git a/source/infrastructure/amc_insights/custom_resource/cloudwatch_metrics/lambdas/requirements.txt b/source/infrastructure/amc_insights/custom_resource/cloudwatch_metrics/lambdas/requirements.txt
@@ -1 +1 @@
-requests
+requests==2.32.4
diff --git a/source/infrastructure/cdk.json b/source/infrastructure/cdk.json
@@ -29,7 +29,7 @@
         "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
         "SOLUTION_NAME": "Amazon Marketing Cloud Insights on AWS",
         "SOLUTION_ID": "SO0193",
-        "SOLUTION_VERSION": "v3.1.3",
+        "SOLUTION_VERSION": "v3.1.4",
         "METRICS_NAMESPACE": "amcinsights",
         "BUCKET_NAME": "BUCKET_NAME"
     }
diff --git a/source/infrastructure/data_lake/README.md b/source/infrastructure/data_lake/README.md
@@ -31,7 +31,7 @@ The Purpose of the AMC Insights Data Lake Framework is to shorten the deployment
 ## Prerequisites
 
 * [AWS Command Line Interface](https://aws.amazon.com/cli/)
-* [Python](https://www.python.org/) 3.9 or newer
+* [Python](https://www.python.org/) 3.11 or newer
 * [Node.js](https://nodejs.org/en/) 16.x or newer
 * [AWS CDK](https://aws.amazon.com/cdk/) 2.60.0 or newer
 * IDE for e.g. [Pycharm](https://www.jetbrains.com/pycharm/) or [AWS Cloud9](https://aws.amazon.com/cloud9/)
diff --git a/source/infrastructure/data_lake/lambda_layers/data_lake_library/python/setup.py b/source/infrastructure/data_lake/lambda_layers/data_lake_library/python/setup.py
@@ -31,13 +31,14 @@ def get_version():
     url="https://aws.amazon.com/solutions/implementations",
     license="Apache License 2.0",
     packages=setuptools.find_namespace_packages(),
-    python_requires=">=3.9",
+    python_requires=">=3.11",
     classifiers=[
         "Intended Audience :: Developers",
         "License :: OSI Approved :: Apache Software License",
         "Programming Language :: Python :: 3 :: Only",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.11",
     ],
 )
diff --git a/source/infrastructure/setup.py b/source/infrastructure/setup.py
@@ -22,10 +22,10 @@
     author="AWS Solutions Builders",
     packages=setuptools.find_packages(),
     install_requires=[
-        "aws-cdk-lib>=2.7.0",
-        "pip>=22.3",
+        "aws-cdk-lib>=2.209.1",
+        "pip>=25.2",
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.11",
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
@@ -35,6 +35,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Utilities",
         "Typing :: Typed",
diff --git a/source/tests/functional_tests/test_extended_dataset/run-test.sh b/source/tests/functional_tests/test_extended_dataset/run-test.sh
@@ -150,7 +150,7 @@ echo "-----------------------------------------"
 
 cd $deployment_dir
 
-version_code="v3.1.3"
+version_code="v3.1.4"
 
 build-s3-cdk-dist deploy \
   --source-bucket-name $template_bucket_name \
diff --git a/source/tests/functional_tests/test_stack_deploy/run-test.sh b/source/tests/functional_tests/test_stack_deploy/run-test.sh
@@ -140,7 +140,7 @@ echo "TEST STACK SYNTHESIZE & DEPLOY"
 echo "-----------------------------------------"
 
 cd $deployment_dir
-version_code="v3.1.3"
+version_code="v3.1.4"
 build-s3-cdk-dist deploy \
   --source-bucket-name $template_bucket_name \
   --solution-name amcinsights \
diff --git a/source/tests/setup.py b/source/tests/setup.py
@@ -22,10 +22,10 @@
     author="AWS Solutions Builders",
     packages=setuptools.find_packages(),
     install_requires=[
-        "aws-cdk-lib>=2.7.0",
-        "pip>=22.3",
+        "aws-cdk-lib>=2.209.1",
+        "pip>=25.2",
     ],
-    python_requires=">=3.7",
+    python_requires=">=3.11",
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",
@@ -35,6 +35,7 @@
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Code Generators",
         "Topic :: Utilities",
         "Typing :: Typed",
diff --git a/source/tests/unit_tests/amc_insights_tests/test_app_registry.py b/source/tests/unit_tests/amc_insights_tests/test_app_registry.py
diff --git a/source/tests/unit_tests/lambda_layer_tests/metrics_layer/__init__.py b/source/tests/unit_tests/lambda_layer_tests/metrics_layer/__init__.py
diff --git a/source/tests/unit_tests/lambda_layer_tests/metrics_layer/test_cloudwatch_metrics.py b/source/tests/unit_tests/lambda_layer_tests/metrics_layer/test_cloudwatch_metrics.py

Original file line number	Diff line number	Diff line change
`@@ -191,4 +191,4 @@ This solution collects anonymized operational metrics to help AWS improve the qu`
`191`	`191`
`192`	`192`	`## License`
`193`	`193`
`194`		`-This project is licensed under the Apache-2.0 License.`
	`194`	`+This project is licensed under the Apache-2.0 License.`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ def __init__(`
`40`	`40`	`/ "custom_resources"`
`41`	`41`	`/ "metrics.py",`
`42`	`42`	`function="handler",`
`43`		`- runtime=lambda_.Runtime.PYTHON_3_9,`
	`43`	`+ runtime=lambda_.Runtime.PYTHON_3_11,`
`44`	`44`	`)`
`45`	`45`	`add_cfn_nag_suppressions(`
`46`	`46`	`resource=self._metrics_function.node.default_child,`