Release v1.0.2 (#4)

thyagram-aws · web-flow · commit 6149c261bb8c · 2024-09-23T10:37:39.000-07:00
* changes for v1.0.2

* Update CHANGELOG.md
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -25,7 +25,7 @@ To get the version of the solution, you can look at the description of the creat
     "Environment": {
       "Variables": {
         "SOLUTION_ID": "SO0248",
-        "SOLUTION_VERSION": "v1.0.1"
+        "SOLUTION_VERSION": "v1.0.2"
       }
     },
 ```
@@ -34,7 +34,7 @@ This information is also provided in `source/infrastructure/cdk.json`:
 
 ```json
     "SOLUTION_ID": "SO0248",
-    "SOLUTION_VERSION": "v1.0.1",
+    "SOLUTION_VERSION": "v1.0.2",
 ```
 
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -15,3 +15,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Remove python `setuptools` and `pip` from prebid server docker image
 - Include missing copyright header for `source/infrastructure/prebid_server/stack_constants.py`
+
+
+## [1.0.2] - 2024-09-23
+
+- Upgrade Python `requests` package to version 2.32.3 in requirements.txt
+- Bug fix for launch failure of EfsCleanupContainerStop Lambda function
diff --git a/NOTICE.txt b/NOTICE.txt
@@ -71,7 +71,7 @@ This software includes third party software subject to the following copyrights:
  pytest-mock                                      3.10.0     MIT License
  python-dateutil                                  2.8.2      Apache Software License; BSD License
  pytz                                             2022.6     MIT License
- requests                                         2.28.1     Apache Software License
+ requests                                         2.32.3     Apache Software License
  responses                                        0.17.0     Apache 2.0
  s3transfer                                       0.6.0      Apache Software License
  shared                                           0.0.0      Apache Software License
diff --git a/README.md b/README.md
@@ -153,7 +153,7 @@ If you'd like to use a different container:
 * Build and host the solution assets for installation in your account using the process described above
 * Change to the `deployment/global-s3-assets` folder on the build workstation
 * Open the file `prebid-server-deployment-on-aws.template` in an editor
-* Find the line in the template under the Task Definition resource that is `"Image": "public.ecr.aws/aws-solutions/prebid-server:v1.0.1",`
+* Find the line in the template under the Task Definition resource that is `"Image": "public.ecr.aws/aws-solutions/prebid-server:v1.0.2",`
 * Update the Image property value with your container image URI
 * Create the stack by uploading the changed template to the CloudFormation console
 
diff --git a/deployment/build-s3-dist.sh b/deployment/build-s3-dist.sh
@@ -9,7 +9,7 @@
 # Paramenters:
 #  - source-bucket-base-name: Name for the S3 bucket location where the template will source the Lambda
 #    code from. The template will append '-[region_name]' to this bucket name.
-#    For example: ./build-s3-dist.sh solutions v1.0.1
+#    For example: ./build-s3-dist.sh solutions v1.0.2
 #    The template will then expect the source code to be located in the solutions-[region_name] bucket
 #
 #  - solution-name: name of the solution for consistency
@@ -21,7 +21,7 @@
 # Check to see if input has been provided:
 if [ -z "$1" ] || [ -z "$2" ] || [ -z "$3" ]; then
     echo "Please provide the base source bucket name, trademark approved solution name and version where the lambda code will eventually reside."
-    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.1"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.2"
     exit 1
 fi
 
diff --git a/solution-manifest.yaml b/solution-manifest.yaml
@@ -1,6 +1,6 @@
 id: SO0248
 name: prebid-server-deployment-on-aws
-version: v1.0.1
+version: v1.0.2
 cloudformation_templates:
   - template: prebid-server-deployment-on-aws.template
     main_template: true
diff --git a/source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/aws_lambda/cfn_custom_resources/solutions_metrics/src/custom_resources/requirements.txt b/source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/aws_lambda/cfn_custom_resources/solutions_metrics/src/custom_resources/requirements.txt
@@ -1,3 +1,3 @@
-requests>=2.31.0
+requests>=2.32.3
 urllib3<2.0.0
 crhelper==2.0.6
diff --git a/source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/scripts/build_s3_cdk_dist.py b/source/cdk_solution_helper_py/helpers_cdk/aws_solutions/cdk/scripts/build_s3_cdk_dist.py
@@ -187,7 +187,7 @@ def validate_version_code(ctx, param, value):
         return value
     else:
         raise click.BadParameter(
-            "please specifiy major, minor and patch versions, e.g. v1.0.1"
+            "please specifiy major, minor and patch versions, e.g. v1.0.2"
         )
 
 
diff --git a/source/cdk_solution_helper_py/helpers_cdk/setup.py b/source/cdk_solution_helper_py/helpers_cdk/setup.py
@@ -43,7 +43,7 @@ def get_version():
         "aws_cdk_lib>=2.7.0",
         "Click>=7.1.2",
         "boto3>=1.17.52",
-        "requests>=2.31.0",
+        "requests>=2.32.3",
         "crhelper>=2.0.6",
     ],
     entry_points="""
diff --git a/source/infrastructure/cdk.json b/source/infrastructure/cdk.json
@@ -30,7 +30,7 @@
         "@aws-cdk/aws-s3:serverAccessLogsUseBucketPolicy": true,
         "SOLUTION_NAME": "Prebid Server Deployment on AWS",
         "SOLUTION_ID": "SO0248",
-        "SOLUTION_VERSION": "v1.0.1",
+        "SOLUTION_VERSION": "v1.0.2",
         "METRICS_NAMESPACE": "prebid-server-deployment-on-aws-metrics",
         "BUCKET_NAME": "BUCKET_NAME",
         "SEND_ANONYMIZED_DATA": null
diff --git a/source/infrastructure/prebid_server/prebid_datasync_constructs.py b/source/infrastructure/prebid_server/prebid_datasync_constructs.py
@@ -291,6 +291,7 @@ def _create_container_stop_logs_lambda_function(self):
             layers=[
                 PowertoolsLayer.get_or_create(self),
                 SolutionsLayer.get_or_create(self),
+                self.metrics_layer,
             ],
             environment={
                 "SOLUTION_ID": self.node.try_get_context("SOLUTION_ID"),
@@ -306,7 +307,24 @@ def _create_container_stop_logs_lambda_function(self):
         container_lambda_function_policy = iam.Policy(
             self,
             "ContainerLambdaPolicy",
-            statements=[VPC_NW_INTERFACE_POLICY_STATEMENT],
+            statements=[
+                VPC_NW_INTERFACE_POLICY_STATEMENT,
+                iam.PolicyStatement(
+                    actions=[
+                        "cloudwatch:PutMetricData",
+                    ],
+                    resources=[
+                        "*"  # NOSONAR
+                    ],
+                    conditions={
+                        "StringEquals": {
+                            "cloudwatch:namespace": self.node.try_get_context(
+                                "METRICS_NAMESPACE"
+                            )
+                        }
+                    },
+                ),
+            ],
         )
         container_lambda_function.role.attach_inline_policy(
             container_lambda_function_policy
diff --git a/source/tests/unit_tests/test_prebid_server_template.py b/source/tests/unit_tests/test_prebid_server_template.py
@@ -82,7 +82,7 @@ def mapping_solution(template):
         {
             'Data': {
                 'ID': "SO0248",
-                'Version': "v1.0.1",
+                'Version': "v1.0.2",
                 'SendAnonymizedData': 'Yes'
             }
         }
@@ -95,7 +95,7 @@ def mapping_source_code(template):
         {
             'General': {
                 'S3Bucket': "BUCKET_NAME",
-                'KeyPrefix': 'Prebid Server Deployment on AWS/v1.0.1'
+                'KeyPrefix': 'Prebid Server Deployment on AWS/v1.0.2'
             }
         }
     )

Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ def validate_version_code(ctx, param, value):`
`187`	`187`	`return value`
`188`	`188`	`else:`
`189`	`189`	`raise click.BadParameter(`
`190`		`- "please specifiy major, minor and patch versions, e.g. v1.0.1"`
	`190`	`+ "please specifiy major, minor and patch versions, e.g. v1.0.2"`
`191`	`191`	`)`
`192`	`192`
`193`	`193`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ def mapping_solution(template):`
`82`	`82`	`{`
`83`	`83`	`'Data': {`
`84`	`84`	`'ID': "SO0248",`
`85`		`- 'Version': "v1.0.1",`
	`85`	`+ 'Version': "v1.0.2",`
`86`	`86`	`'SendAnonymizedData': 'Yes'`
`87`	`87`	`}`
`88`	`88`	`}`
`@@ -95,7 +95,7 @@ def mapping_source_code(template):`
`95`	`95`	`{`
`96`	`96`	`'General': {`
`97`	`97`	`'S3Bucket': "BUCKET_NAME",`
`98`		`- 'KeyPrefix': 'Prebid Server Deployment on AWS/v1.0.1'`
	`98`	`+ 'KeyPrefix': 'Prebid Server Deployment on AWS/v1.0.2'`
`99`	`99`	`}`
`100`	`100`	`}`
`101`	`101`	`)`