fix(lambda-python): install rsync if necessary (aws#9763)

Fixes aws#9704. `aws-lambda-python` originally used `rsync` to move lambda code into `/asset-output`, but I switched to `cp` in aws#9355 to resolve aws#9349 as `rsync` isn't installed in the python3.8 sam docker image. This change introduces a Dockerfile derived from the `bundlingDockerImage` of the runtime which installs `rsync` if it's missing. While this feels a bit heavy-handed, I had been planning to introduce a Dockerfile to setup a working pip cache after aws#9582 lands. I'm also happy to take a different approach if you'd prefer, @eladb. ---- *By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license*
misterjoshua · Aug 19, 2020 · 30ad495 · 30ad495
1 parent d24d08a
commit 30ad495
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts b/packages/@aws-cdk/aws-lambda-python/lib/bundling.ts
@@ -87,7 +87,7 @@ function bundleLayerDependentFunction(options: BundlingOptions): lambda.AssetCod
   return lambda.Code.fromAsset(entry, {
     bundling: {
       image: getLayerBundlerImage(options),
-      command: ['sh', '-c', `cp -r ${IMAGE_FUNCTION_DIR}/. /asset-output/`],
+      command: ['sh', '-c', `rsync -r ${IMAGE_FUNCTION_DIR}/. /asset-output/`],
     },
     assetHashType: cdk.AssetHashType.BUNDLE,
     exclude: DEPENDENCY_EXCLUDES,
@@ -100,7 +100,7 @@ export function bundleLayer(options: BundlingOptions): lambda.AssetCode {
   return lambda.Code.fromAsset(entry, {
     bundling: {
       image: getLayerBundlerImage(options),
-      command: ['sh', '-c', `cp -r ${IMAGE_LAYER_DIR}/. /asset-output/`],
+      command: ['sh', '-c', `rsync -r ${IMAGE_LAYER_DIR}/. /asset-output/`],
     },
     assetHashType: cdk.AssetHashType.BUNDLE,
     exclude: DEPENDENCY_EXCLUDES,

diff --git a/packages/@aws-cdk/aws-lambda-python/lib/inline-bundler/Dockerfile b/packages/@aws-cdk/aws-lambda-python/lib/inline-bundler/Dockerfile
@@ -4,6 +4,9 @@ ARG FROM=amazon/aws-sam-cli-build-image-python3.7
 
 FROM ${FROM}
 
+# Ensure rsync is installed
+RUN yum -q list installed rsync &>/dev/null || yum install -y rsync
+
 RUN pip install pipenv
 
 WORKDIR /var/task.function

diff --git a/packages/@aws-cdk/aws-lambda-python/lib/layer-bundler/Dockerfile b/packages/@aws-cdk/aws-lambda-python/lib/layer-bundler/Dockerfile
@@ -4,6 +4,9 @@ ARG FROM=amazon/aws-sam-cli-build-image-python3.7
 
 FROM ${FROM}
 
+# Ensure rsync is installed
+RUN yum -q list installed rsync &>/dev/null || yum install -y rsync
+
 RUN pip install pipenv
 
 WORKDIR /var/task.layer

diff --git a/packages/@aws-cdk/aws-lambda-python/test/bundling.test.ts b/packages/@aws-cdk/aws-lambda-python/test/bundling.test.ts
@@ -149,7 +149,7 @@ test('Bundling dependencies into a layer', () => {
   expect(Code.fromAsset).toHaveBeenCalledWith('/project/folder', expect.objectContaining({
     bundling: expect.objectContaining({
       image: { image: MOCK_BUILD_IMAGE_ID },
-      command: ['sh', '-c', `cp -r ${IMAGE_LAYER_DIR}/. /asset-output/`],
+      command: ['sh', '-c', `rsync -r ${IMAGE_LAYER_DIR}/. /asset-output/`],
     }),
     assetHashType: cdk.AssetHashType.BUNDLE,
     exclude: expect.arrayContaining(['*.pyc']),
@@ -158,7 +158,7 @@ test('Bundling dependencies into a layer', () => {
   expect(Code.fromAsset).toHaveBeenCalledWith('/project/folder', expect.objectContaining({
     bundling: expect.objectContaining({
       image: { image: MOCK_BUILD_IMAGE_ID },
-      command: ['sh', '-c', `cp -r ${IMAGE_FUNCTION_DIR}/. /asset-output/`],
+      command: ['sh', '-c', `rsync -r ${IMAGE_FUNCTION_DIR}/. /asset-output/`],
     }),
     assetHashType: cdk.AssetHashType.BUNDLE,
     exclude: expect.arrayContaining(['*.pyc']),