Add lerna command for uber zip

Author: Florian Chazal

.github/workflows/pr_lint_and_test.yml

@@ -59,7 +59,7 @@ jobs:
       - name: Packages size report
         uses: flochaz/[email protected]
         with:
-          build-command: mkdir dist && npm run lerna-package && bash -c "mv ./packages/*/dist/* dist/" && ls dist
+          build-command: mkdir dist && npm run lerna-package && npm run lerna-package-uber-zip && bash -c "mv ./packages/*/dist/* dist/" && ls dist
           dist-directory: /dist
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

examples/cdk/package.json

@@ -15,6 +15,7 @@
     "watch": "tsc -w",
     "test": "npm run test:unit",
     "package": "echo 'Not applicable'",
+    "package-uber-zip": "echo 'Not applicable'",
     "test:unit": "npm run build && jest",
     "test:e2e": "echo 'To be implemented ...'",
     "version": "npm install @aws-lambda-powertools/[email protected] @aws-lambda-powertools/[email protected] @aws-lambda-powertools/[email protected] && git add package.json",

examples/sam/package.json

@@ -11,6 +11,7 @@
     "build": "sam build --beta-features",
     "test": "npm run test:unit",
     "package": "echo 'Not applicable'",
+    "package-uber-zip": "echo 'Not applicable'",
     "test:unit": "npm run build && jest",
     "test:e2e": "echo 'To be implemented ...'",
     "version": "npm install @aws-lambda-powertools/[email protected] @aws-lambda-powertools/[email protected] @aws-lambda-powertools/[email protected] && git add package.json"

package.json

@@ -19,6 +19,7 @@
     "lerna-test:unit": "lerna exec -- npm run test:unit",
     "lerna-test:e2e": "lerna exec -- npm run test:e2e",
     "lerna-package": "lerna exec -- npm run package",
+    "lerna-package-uber-zip": "lerna exec -- npm run package-uber-zip",
     "lerna-build": "lerna exec -- tsc",
     "lerna-lint": "lerna exec -- eslint \"./{src,tests}/**/*.ts ./src/*.ts\"",
     "lerna-format": "lerna exec -- eslint --fix \"./{src,tests}/**/*.ts ./src/*.ts\"",

packages/commons/package.json

@@ -19,6 +19,7 @@
     "lint": "eslint --ext .ts --fix --no-error-on-unmatched-pattern src tests",
     "format": "eslint --fix --ext .ts --fix --no-error-on-unmatched-pattern src tests",
     "package": "mkdir -p dist/ && npm pack && mv *.tgz dist/",
+    "package-uber-zip": "../../uber-package-builder.sh ${LERNA_PACKAGE_NAME}-uber ./dist/",
     "prepare": "npm run build",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",

packages/logger/package.json

@@ -21,6 +21,7 @@
     "lint": "eslint --ext .ts --fix --no-error-on-unmatched-pattern src tests",
     "format": "eslint --fix --ext .ts --fix --no-error-on-unmatched-pattern src tests",
     "package": "mkdir -p dist/ && npm pack && mv *.tgz dist/",
+    "package-uber-zip": "../../uber-package-builder.sh ${LERNA_PACKAGE_NAME}-uber ./dist/",
     "prepare": "npm run build",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",

packages/metrics/package.json

@@ -21,6 +21,7 @@
     "lint": "eslint --ext .ts --fix --no-error-on-unmatched-pattern src tests",
     "format": "eslint --fix --ext .ts --fix --no-error-on-unmatched-pattern src tests",
     "package": "mkdir -p dist/ && npm pack && mv *.tgz dist/",
+    "package-uber-zip": "../../uber-package-builder.sh ${LERNA_PACKAGE_NAME}-uber ./dist/",
     "prepare": "npm run build",
     "prepublishOnly": "npm test && npm run lint",
     "preversion": "npm run lint",

packages/tracer/package.json

@@ -25,7 +25,8 @@
     "preversion": "npm run lint",
     "version": "npm run format && git add -A src",
     "postversion": "git push && git push --tags",
-    "package": "mkdir -p dist/ && npm pack && mv *.tgz dist/"
+    "package": "mkdir -p dist/ && npm pack && mv *.tgz dist/",
+    "package-uber-zip": "../../uber-package-builder.sh ${LERNA_PACKAGE_NAME}-uber ./dist/"
   },
   "homepage": "https://github.com/awslabs/aws-lambda-powertools-typescript/tree/master/packages/tracer#readme",
   "license": "MIT-0",

uber-package-builder.sh

@@ -2,73 +2,45 @@
 set -e
 
 
-usage() {
-  echo "Uber package Builder"
-  echo "------------------------"
-  echo "./uber-pacakge-builder.sh NAME LOCAL_NPM_PACKAGE_LOCATION"
-  echo ""}
+# usage() {
+#   echo "Uber package Builder"
+#   echo "------------------------"
+#   echo "./uber-pacakge-builder.sh NAME LOCAL_NPM_PACKAGE_LOCATION"
+#   echo ""}
 
 
-if [[ "$#" -lt 3 ]]; then
-   usage
-   exit 1
-fi
+# if [[ "$#" -lt 2 ]]; then
+#    usage
+#    exit 1
+# fi
 
-name="${1}"
-runtime="${2}"
-dist_folder="${3}"
-
-if test -d "$dist_folder"; then
-  packages="${@:4}"
-else
-  dist_folder=""
-  packages="${@:3}"
-fi
+name=$(basename ${1})
+dist_folder="${2}"
 
+echo "Will bundle $(ls ${dist_folder}) into ${dist_folder}/${name}.tgz from ${PWD}"
 
 output_folder="$(mktemp -d)"
 
 echo "$output_folder is the output folder"
 
-docker_image="public.ecr.aws/sam/build-$runtime:latest"
-volume_params="-v $output_folder:/layer"
-
-if [[ $runtime == node* ]]; then
-
-  package_folder="nodejs/"
-  mkdir -p "$output_folder/$package_folder"
-  if [[ -n "$dist_folder" ]]; then
-    cp -r "$dist_folder" "$output_folder/$package_folder/"
-  fi
-  install_command="pushd $package_folder; npm install; npm install --save $packages; popd"
-  volume_params="$volume_params -v $HOME/.npmrc:/root/.npmrc"
-
-elif [[ $runtime == python* ]]; then
-
-  package_folder="python/lib/$runtime/site-packages/"
-  if [[ -n "$dist_folder" ]]; then
-    cp "$dist_folder" "$output_folder/requirements.txt"
-  else
-    touch "$output_folder/requirements.txt"
-  fi
-
-  install_command="pip install -r requirements.txt -t $package_folder $packages"
-  volume_params="$volume_params -v $HOME/.config/pip:/root/.config/pip"
-
-else
-
-  usage
-  exit 1
+docker_image="public.ecr.aws/sam/build-nodejs14.x:latest"
+volume_params="-v $output_folder:/bundle"
 
-fi
+package_folder="nodejs/"
+mkdir -p "$output_folder/$package_folder"
 
+cp -r "${2}" "$output_folder/$package_folder/"
+ 
+install_command="pushd $package_folder; npm install --save ./*.tgz; popd"
+volume_params="$volume_params -v $HOME/.npmrc:/root/.npmrc"
 
-echo "Building layer"
-zip_command="zip -r layer.zip * && rm -rf $package_folder"
+# echo "Building bundle: docker run --rm $volume_params -w "/bundle" "$docker_image" /bin/bash -c "$install_command && $zip_command""
+zip_command="zip -r bundle.zip * && rm -rf $package_folder"
 
-docker run --rm $volume_params -w "/layer" "$docker_image" /bin/bash -c "$install_command && $zip_command"
+docker run --rm $volume_params -w "/bundle" "$docker_image" /bin/bash -c "$install_command && $zip_command"
 
+mv "$output_folder/bundle.zip" "$dist_folder/$name.zip"
 
-mv "$output_folder/layer.zip" "$dist_folder/$name.zip"
+rm -rf $output_folder
 
-echo "All done. Enjoy your shiny new Lambda layer in $output_folder !"
+echo "All done"