removed package.json and implemeneted npm install of versioned proxy-…

…agent
aws · Oct 20, 2021 · 651f906 · 651f906
1 parent 1fa1876
commit 651f906
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 14 deletions.
diff --git a/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/.dockerignore b/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/.dockerignore
@@ -1,2 +1 @@
 build.sh
-.no-packagejson-validator
diff --git a/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/.no-packagejson-validator b/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/.no-packagejson-validator
diff --git a/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/Dockerfile b/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/Dockerfile
@@ -1,6 +1,8 @@
 # base lambda image
 FROM public.ecr.aws/lambda/nodejs:latest
 
+ARG PROXY_AGENT_VERSION=5.0.0
+
 USER root
 RUN mkdir -p /opt
 WORKDIR /tmp
@@ -17,8 +19,7 @@ RUN yum update -y \
 #
 
 RUN mkdir -p /opt/nodejs
-COPY package.json /opt/nodejs
-RUN cd /opt/nodejs && npm install
+RUN cd /opt/nodejs && npm install proxy-agent@${PROXY_AGENT_VERSION}
 
 #
 # create the bundle

diff --git a/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/package.json b/packages/@aws-cdk/lambda-layer-node-proxy-agent/layer/package.json
diff --git a/packages/@aws-cdk/lambda-layer-node-proxy-agent/lib/node-proxy-agent-layer.ts b/packages/@aws-cdk/lambda-layer-node-proxy-agent/lib/node-proxy-agent-layer.ts
@@ -11,8 +11,8 @@ export class NodeProxyAgentLayer extends lambda.LayerVersion {
   constructor(scope: Construct, id: string) {
     super(scope, id, {
       code: lambda.Code.fromAsset(path.join(__dirname, 'layer.zip'), {
-        // we hash the package.json (it contains the tools versions) because hashing the zip is non-deterministic
-        assetHash: hashFile(path.join(__dirname, '..', 'layer', 'package.json')),
+        // we hash the Dockerfile (it contains the tools versions) because hashing the zip is non-deterministic
+        assetHash: hashFile(path.join(__dirname, '..', 'layer', 'Dockerfile')),
       }),
       description: '/opt/nodejs/node_modules/proxy-agent',
     });