Merge pull request #770 from aws-solutions/release/v5.1.11

Release v5.1.11

Author: amzn-gaod

CHANGELOG.md

@@ -5,6 +5,18 @@ 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).
 
+## [5.1.11] - 2025-06-04
+
+### Fixed
+
+- Broken build process fixed (missing deps)
+- Upgraded setuptools
+- Added ServiceTimeout to Workflow custom resource
+
+### Security
+
+- Upgraded npm packages
+
 ## [5.1.10] - 2025-02-06
 
 ### Fixed

deployment/build-s3-dist.sh

@@ -315,12 +315,20 @@ else
   fi
   cd "$build_dir"/lambda_layer_factory/ || exit 1
   rm -rf MediaInsightsEngineLambdaHelper/
-  file=$(ls Media_Insights_Engine*.whl)
+  wheel=$(find . -maxdepth 1 -type f \
+        -iname 'media_insights_engine_lambda_helper*.whl' \
+        | head -n 1)
+
+  if [[ -z "$wheel" ]]; then
+    echo "ERROR: media_insights_engine_lambda_helper wheel not found." >&2
+    exit 1
+  fi
   # Note, $(pwd) will be mapped to /packages/ in the Docker container used for building the Lambda zip files. We reference /packages/ in requirements.txt for that reason.
   # Add the whl file to requirements.txt if it is not already there
   mv requirements.txt requirements.txt.old
-  cat requirements.txt.old | grep -v "Media_Insights_Engine_Lambda_Helper" > requirements.txt
-  echo "/packages/$file" >> requirements.txt;
+  grep -v -Ei 'media[_-]insights[_-]engine[_-]lambda[_-]helper' requirements.txt.old \
+    > requirements.txt
+  echo "/packages/$(basename "$wheel")" >> requirements.txt
   # Build Lambda layer zip files and rename them to the filenames expected by the stack. The Lambda layer build script runs in Docker.
   # If Docker is not installed, then we'll use prebuilt Lambda layer zip files.
   echo "Running build-lambda-layer.sh:"

deployment/lambda_layer_factory/docker-entrypoint.sh

@@ -1,16 +1,20 @@
 #!/bin/bash
+set -euo pipefail
 
 echo "================================================================================"
 echo "Installing the packages listed in requirements.txt:"
 echo "================================================================================"
 
 cat /packages/requirements.txt
 
-for i in "$@"
-do
-    echo "Installing for Python version $i"
-    mkdir -p /packages/lambda_layer-python-$i/python/lib/python$i/site-packages
-    pip$i install -q -r /packages/requirements.txt -t /packages/lambda_layer-python-$i/python/lib/python$i/site-packages    
+for pyver in "$@"; do
+  echo "🔧 Bootstrapping pip for Python ${pyver}"
+  python${pyver} -m ensurepip --upgrade
+  python${pyver} -m pip install --no-cache-dir --upgrade pip
+
+  echo "📦 Installing requirements for Python ${pyver}"
+  python${pyver} -m pip install --no-cache-dir -r /packages/requirements.txt \
+      -t "/packages/lambda_layer-python-${pyver}/python/lib/python${pyver}/site-packages"
 done
 
 echo "================================================================================"

deployment/lambda_layer_factory/requirements.txt

@@ -1,4 +1,4 @@
 pymediainfo==6.0.1
 jsonpickle==3.0.0
 aws-xray-sdk==2.12.0
-/packages/Media_Insights_Engine_Lambda_Helper-1.0.0-py3-none-any.whl
+/packages/Media_Insights_Engine_Lambda_Helper-1.0.0-py3-none-any.whl

solution-manifest.yaml

@@ -1,6 +1,6 @@
 id: SO0163
 name: media-insights-on-aws
-version: 5.1.10
+version: 5.1.11
 cloudformation_templates:
   - template: media-insights-on-aws-stack.template
     main_template: true

source/cdk/lib/operator-library.ts

@@ -1295,6 +1295,7 @@ export class OperatorLibraryStack extends NestedStack {
             const custom = new CustomResource(scope, id === outputName ? `CustomResource${id}` : id, {
                 resourceType: "Custom::CustomResource",
                 serviceToken: workflowCustomResourceArn.valueAsString,
+                serviceTimeout: Duration.minutes(10),
                 properties,
             });
 

source/cdk/package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "media-insights-on-aws",
-    "version": "5.1.10",
+    "version": "5.1.11",
     "description": "Synthesize templates for Media Insights on AWS using AWS Cloud Development Kit (CDK).",
     "license": "Apache-2.0",
     "private": true,

source/cdk/package.json

@@ -2076,7 +2076,7 @@ exports[`Snapshot media-insights root stack test 1`] = `
                     "CodeKeyPrefix",
                   ],
                 },
-                "media_insights_on_aws_lambda_layer_python3.10-v5.1.10.zip",
+                "media_insights_on_aws_lambda_layer_python3.10-v5.1.11.zip",
               ],
             ],
           },
@@ -2123,7 +2123,7 @@ exports[`Snapshot media-insights root stack test 1`] = `
                     "CodeKeyPrefix",
                   ],
                 },
-                "media_insights_on_aws_lambda_layer_python3.11-v5.1.10.zip",
+                "media_insights_on_aws_lambda_layer_python3.11-v5.1.11.zip",
               ],
             ],
           },
@@ -2170,7 +2170,7 @@ exports[`Snapshot media-insights root stack test 1`] = `
                     "CodeKeyPrefix",
                   ],
                 },
-                "media_insights_on_aws_lambda_layer_python3.9-v5.1.10.zip",
+                "media_insights_on_aws_lambda_layer_python3.9-v5.1.11.zip",
               ],
             ],
           },