Remove build dependency on jq and apk (#193)

Author: nhinsch

Dockerfile

@@ -2,8 +2,6 @@ ARG image
 FROM $image
 
 # Create the directory structure required for AWS Lambda Layer
-RUN apk update
-RUN apk add jq
 RUN mkdir -p /nodejs/node_modules/
 
 # Install dev dependencies
@@ -16,13 +14,12 @@ RUN yarn build
 RUN cp -r dist /nodejs/node_modules/datadog-lambda-js
 RUN rm -rf node_modules
 
-# Move dd-trace devDependency to dependencies
-# This adds dd-trace to our layer, while keeping it an optional dependency for npm.
-RUN jq '. +{"dependencies": (.dependencies + {"dd-trace": .devDependencies."dd-trace"})}' package.json > package.json-temp && \
-    mv package.json-temp package.json
-
-# Copy the production dependencies to the modules folder
+# Move dd-trace from devDependencies to production dependencies
+# That way it is included in our layer, while keeping it an optional dependency for npm
+RUN node ./scripts/move_ddtrace_dependency.js "$(cat package.json)" > package.json
+# Install dependencies
 RUN yarn install --production=true
+# Copy the dependencies to the modules folder
 RUN cp -rf node_modules/* /nodejs/node_modules
 
 # Remove the AWS SDK, which is installed in the lambda by default

scripts/move_ddtrace_dependency.js

@@ -0,0 +1,10 @@
+// Moves the dd-trace dependency from devDependencies to dependencies within package.json.
+// This is used when building the Layer
+
+// USAGE: ./move_dd_trace_dependency.js "$(cat package.json)" > package.json
+
+const file = JSON.parse(process.argv[2]);
+const ddTraceVersion = file.devDependencies["dd-trace"];
+delete file.devDependencies["dd-trace"];
+file.dependencies["dd-trace"] = ddTraceVersion;
+console.log(JSON.stringify(file, null, 2));

scripts/publish_prod.sh

@@ -31,7 +31,7 @@ else
     NEW_VERSION=$1
 fi
 
-echo "Ensure you have access to the dataodg NPM service account"
+echo "Ensure you have access to the datadog NPM service account"
 yarn login
 
 echo "Ensure you have access to the AWS GovCloud account"

scripts/update_dist_version.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 echo "Updating version constants"
-DATADOG_LAMBDA_VERSION=$(cat package.json | jq -r ".version")
-DD_TRACE_VERSION=$(sed -n -E "s/dd-trace@([0-9]*.[0-9]*.[0-9]*):/\1/p" yarn.lock)
+DATADOG_LAMBDA_VERSION=$(node -pe "require('./package.json').version")
+DD_TRACE_VERSION=$(sed -n -E "s/dd-trace@([0-9]*\.[0-9]*\.[0-9]*):/\1/p" yarn.lock)
 echo "Datadog Lambda Library Version ${DATADOG_LAMBDA_VERSION}"
 echo "Datadog Trace Library Version ${DD_TRACE_VERSION}"