update for v1.0.1 (#3)

aws-solutions · Aug 2, 2024 · bad5aef · bad5aef
1 parent 16bda86
commit bad5aef
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 13 deletions.
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.0"
+        "SOLUTION_VERSION": "v1.0.1"
       }
     },
 ```
@@ -34,7 +34,7 @@ This information is also provided in `source/infrastructure/cdk.json`:
 
 ```json
     "SOLUTION_ID": "SO0248",
-    "SOLUTION_VERSION": "v1.0.0",
+    "SOLUTION_VERSION": "v1.0.1",
 ```
 
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,3 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - All files, initial version
+
+## [1.0.1] - 2024-08-02
+
+- Remove python `setuptools` and `pip` from prebid server docker image
+- Include missing copyright header for `source/infrastructure/prebid_server/stack_constants.py`
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.0",`
+* Find the line in the template under the Task Definition resource that is `"Image": "public.ecr.aws/aws-solutions/prebid-server:v1.0.1",`
 * 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.0
+#    For example: ./build-s3-dist.sh solutions v1.0.1
 #    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.0"
+    echo "For example: ./build-s3-dist.sh solutions trademarked-solution-name v1.0.1"
     exit 1
 fi
 

diff --git a/deployment/ecr/prebid-server/Dockerfile b/deployment/ecr/prebid-server/Dockerfile
@@ -5,6 +5,11 @@ FROM public.ecr.aws/amazonlinux/amazonlinux:2023
 
 # Setup environment for building prebid-server-java
 RUN yum -y install maven-amazon-corretto17
+
+# Remove python setuptools and package installer
+RUN yum -y remove python-setuptools
+RUN yum -y remove python-pip 
+
 RUN yum -y install git
 RUN yum -y install jq
 RUN git clone https://github.com/prebid/prebid-server-java.git

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.0
+version: v1.0.1
 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/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.0"
+            "please specifiy major, minor and patch versions, e.g. v1.0.1"
         )
 
 

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.0",
+        "SOLUTION_VERSION": "v1.0.1",
         "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
@@ -477,7 +477,7 @@ def _create_del_vpc_eni_custom_resource(self):
                     statements=[
                         iam.PolicyStatement(
                             actions=["ec2:DeleteNetworkInterface"],
-                            resources=["*"],
+                            resources=["*"], #NOSONAR
                             conditions={
                                 "StringEquals": {"ec2:Vpc": f"{self.vpc.vpc_arn}"}
                             },
@@ -487,7 +487,7 @@ def _create_del_vpc_eni_custom_resource(self):
                                 "ec2:DescribeNetworkInterfaces",
                                 "ec2:DetachNetworkInterface",
                             ],
-                            resources=["*"],
+                            resources=["*"], #NOSONAR
                             conditions={
                                 "StringEquals": {
                                     globals.RESOURCE_NAMESPACE: [Aws.ACCOUNT_ID]

diff --git a/source/infrastructure/prebid_server/prebid_server_stack.py b/source/infrastructure/prebid_server/prebid_server_stack.py
@@ -296,7 +296,7 @@ def __init__(self, scope: Construct, construct_id: str, **kwargs) -> None:
                     "ecr-public:GetRepositoryCatalogData",
                     "ecr-public:GetRegistryCatalogData",
                 ],
-                resources=["*"],
+                resources=["*"], #NOSONAR
             )
         )
 

diff --git a/source/infrastructure/prebid_server/stack_constants.py b/source/infrastructure/prebid_server/stack_constants.py
@@ -1,3 +1,6 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+# SPDX-License-Identifier: Apache-2.0
+
 from pathlib import Path
 
 CUSTOM_RESOURCES_PATH = Path(__file__).absolute().parents[1] / "custom_resources"

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.0",
+                'Version': "v1.0.1",
                 'SendAnonymizedData': 'Yes'
             }
         }
@@ -95,7 +95,7 @@ def mapping_source_code(template):
         {
             'General': {
                 'S3Bucket': "BUCKET_NAME",
-                'KeyPrefix': 'Prebid Server Deployment on AWS/v1.0.0'
+                'KeyPrefix': 'Prebid Server Deployment on AWS/v1.0.1'
             }
         }
     )