ref(serverless): Use GitHub action to zip lambda layer (second try)

.github/workflows/build.yml

@@ -31,7 +31,8 @@ env:
     ${{ github.workspace }}/packages/ember/*.d.ts
     ${{ github.workspace }}/packages/ember/instance-initializers
     ${{ github.workspace }}/packages/gatsby/*.d.ts
-    ${{ github.workspace }}/packages/serverless/dist-awslambda-layer/*.zip
+    ${{ github.workspace }}/packages/core/src/version.ts
+    ${{ github.workspace }}/dist-serverless
 
   BUILD_CACHE_KEY: ${{ github.event.inputs.commit || github.sha }}
 
@@ -99,6 +100,11 @@ jobs:
         # this file) to a constant and skip rebuilding all of the packages each time CI runs.
         if: steps.cache_built_packages.outputs.cache-hit == ''
         run: yarn build
+      - name: Save SDK version for later
+        run: |
+          echo "Saving SDK_VERSION for later"
+          export SDK_VERSION=$(cat packages/core/src/version.ts | cut -f5 -d' ' | tr -d "'" | tr -d ";")
+          echo $SDK_VERSION > dist-serverless/version
     outputs:
       # this needs to be passed on, because the `needs` context only looks at direct ancestors (so steps which depend on
       # `job_build` can't see `job_install_deps` and what it returned)
@@ -228,7 +234,6 @@ jobs:
             ${{ github.workspace }}/packages/integrations/build/bundles/**
             ${{ github.workspace }}/packages/tracing/build/bundles/**
             ${{ github.workspace }}/packages/**/*.tgz
-            ${{ github.workspace }}/packages/serverless/dist-awslambda-layer/*.zip
 
   job_unit_test:
     name: Test (Node ${{ matrix.node }})
@@ -315,10 +320,10 @@ jobs:
         uses: actions/checkout@v2
         with:
           ref: ${{ env.HEAD_COMMIT }}
-        # TODO: removing `fetch-depth` below seems to have no effect, and the commit which added it had no description,
-        # so it's not clear why it's necessary. That said, right now ember tests are xfail, so it's a little hard to
-        # tell if it's safe to remove. Once ember tests are fixed, let's try again with it turned off, and if all goes
-        # well, we can pull it out.
+          # TODO: removing `fetch-depth` below seems to have no effect, and the commit which added it had no description,
+          # so it's not clear why it's necessary. That said, right now ember tests are xfail, so it's a little hard to
+          # tell if it's safe to remove. Once ember tests are fixed, let's try again with it turned off, and if all goes
+          # well, we can pull it out.
           fetch-depth: 0
       - name: Set up Node
         uses: actions/setup-node@v1
@@ -501,3 +506,41 @@ jobs:
         run: |
           cd packages/node-integration-tests
           yarn test
+
+  job_build_aws_lambda_layer:
+    name: Build AWS Lambda Layer
+    needs: job_build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out current commit (${{ env.HEAD_COMMIT }})
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ env.HEAD_COMMIT }}
+      - name: Set up Node
+        uses: actions/setup-node@v1
+        with:
+          node-version: ${{ env.DEFAULT_NODE_VERSION }}
+      - name: Check dependency cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_DEPENDENCY_PATHS }}
+          key: ${{ needs.job_build.outputs.dependency_cache_key }}
+      - name: Check build cache
+        uses: actions/cache@v2
+        with:
+          path: ${{ env.CACHED_BUILD_PATHS }}
+          key: ${{ env.BUILD_CACHE_KEY }}
+      - name: Get SDK version
+        run: |
+          export SDK_VERSION=$(cat dist-serverless/version)
+          echo "SDK_VERSION=$SDK_VERSION"
+          echo "SDK_VERSION=$SDK_VERSION" >> $GITHUB_ENV
+      - uses: actions/upload-artifact@v3
+        with:
+          name: ${{ env.HEAD_COMMIT }}
+          path: |
+            dist-serverless/*
+      - uses: getsentry/action-build-aws-lambda-extension@v1
+        with:
+          artifact_name: ${{ env.HEAD_COMMIT }}
+          zip_file_name: sentry-node-serverless-${{ env.SDK_VERSION }}.zip

.gitignore

@@ -12,6 +12,7 @@ scratch/
 *.pyc
 *.tsbuildinfo
 scenarios/*/dist/
+dist-serverless/
 # transpiled transformers
 jest/transformers/*.js
 # node tarballs

packages/serverless/scripts/build-awslambda-layer.js

@@ -2,7 +2,6 @@
 const path = require('path');
 const process = require('process');
 const fs = require('fs');
-const childProcess = require('child_process');
 
 const findUp = require('find-up');
 const packList = require('npm-packlist');
@@ -75,6 +74,7 @@ async function collectPackages(cwd, packages = {}) {
 }
 
 async function main() {
+  const baseDir = path.resolve(__dirname, '../../../')
   const serverlessDir = path.resolve(__dirname, '..'); // packages/serverless directory
 
   const cjsBuildDir = path.resolve(serverlessDir, 'build', 'cjs');
@@ -86,7 +86,7 @@ async function main() {
   const packages = await collectPackages(serverlessDir);
 
   // the build directory of the Lambda layer
-  const layerBuildDir = path.resolve(serverlessDir, 'dist-awslambda-layer');
+  const layerBuildDir = path.resolve(baseDir, 'dist-serverless');
 
   // the root directory in which the Lambda layer files + dependencies are copied to
   // this structure resembles the structure where Lambda expects to find @sentry/serverless
@@ -170,9 +170,6 @@ async function main() {
     }),
   );
 
-  const version = serverlessPackageJson.version;
-  const zipFilename = `sentry-node-serverless-${version}.zip`;
-
   // link from `./build/cjs` to `./dist`
   // This needs to be done to satisfy the NODE_OPTIONS environment variable path that is set in
   // AWS lambda functions when connecting them to Sentry. On initialization, the layer preloads a js
@@ -184,23 +181,6 @@ async function main() {
   } catch (error) {
     console.error(error);
   }
-
-  // remove previously created layer zip
-  try {
-    fs.unlinkSync(path.resolve(layerBuildDir, zipFilename));
-  } catch (error) {
-    // If the ZIP file hasn't been previously created (e.g. running this script for the first time),
-    // `unlinkSync` will try to delete a non-existing file. This error is ignored.
-  }
-
-  // create new layer zip
-  try {
-    childProcess.execSync(`zip -r ${zipFilename} ${destRootRelative}`, { cwd: layerBuildDir });
-  } catch (error) {
-    // The child process timed out or had non-zero exit code.
-    // The error contains the entire result from `childProcess.spawnSync`.
-    console.log(error);
-  }
 }
 
 main().then(