Merge pull request #138 from solarwinds/lambda-build-with-checkout

Lambda build with checkout
solarwinds · Jul 31, 2024 · d77ad9b · d77ad9b
2 parents 86de3f7 + 663d4b7
commit d77ad9b
Show file tree

Hide file tree

Showing 6 changed files with 61 additions and 11 deletions.
diff --git a/.github/workflows/build_publish_lambda_layer.yml b/.github/workflows/build_publish_lambda_layer.yml
@@ -5,13 +5,23 @@ name: Build publish lambda layer
 
 on:
   workflow_dispatch:
+    inputs:
+      solarwinds-source:
+        required: true
+        description: 'solarwinds_apm source for build layers, e.g. RubyGem, Local'
+        type: choice
+        default: 'RubyGem'
+        options:
+          - RubyGem
+          - Local
 
 permissions:
   id-token: write   # This is required for requesting the JWT
   contents: read    # This is required for actions/checkout
 
 jobs:
   # build layer on arm64 and amd64, then upload to artifacts
+  # act -j build_layer --container-architecture linux/arm64
   build_layer:
     strategy:
       fail-fast: false
@@ -34,6 +44,7 @@ jobs:
         env:
           GITHUB_RUBY_TOKEN: ${{ secrets.PACKAGE_GITHUB_TOKEN }}
           MATRIX_ARCH: ${{ matrix.arch }}
+          SOLARWINDS_SOURCE: ${{ github.event.inputs.solarwinds-source }}
 
       - name: Show directory contents
         run: |

diff --git a/.github/workflows/verify_install.yml b/.github/workflows/verify_install.yml
@@ -12,8 +12,8 @@ on:
         type: choice
         default: 'RubyGem'
         options:
-        - RubyGem
-        - GitHub
+          - RubyGem
+          - GitHub
 
       solarwinds-version:
         required: true

diff --git a/lambda/build.sh b/lambda/build.sh
@@ -1,16 +1,31 @@
 #!/bin/sh
 set -e
 
+if [ $SOLARWINDS_SOURCE = 'Local' ]; then
+    cd ../
+    sudo apt-get update && sudo apt-get install -y --no-install-recommends ruby ruby-dev g++ make swig bison
+    sudo gem install bundler
+    sudo echo 'gem: --no-document' >> ~/.gemrc
+    sudo bundle install --without development --without test
+    sudo bundle exec rake fetch_oboe_file["prod"]
+    sudo gem build solarwinds_apm.gemspec
+    CURRENT_GEM=$(ls | grep solarwinds_apm-*.gem)
+    mv $CURRENT_GEM lambda/otel/layer/
+    cd -
+fi
+
 mkdir -p build
 
-docker build --build-arg BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${GITHUB_RUBY_TOKEN} \
+docker build --no-cache \
+             --build-arg BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${GITHUB_RUBY_TOKEN} \
              --progress plain \
              -f otel/Dockerfile_3_2 \
              -t sw-lambda-ruby-layer-3-2 otel
 
 docker run --rm -v "$(pwd)/build:/out" sw-lambda-ruby-layer-3-2
 
-docker build --build-arg BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${GITHUB_RUBY_TOKEN} \
+docker build --no-cache \
+             --build-arg BUNDLE_RUBYGEMS__PKG__GITHUB__COM=${GITHUB_RUBY_TOKEN} \
              --progress plain \
              -f otel/Dockerfile_3_3 \
              -t sw-lambda-ruby-layer-3-3 otel
@@ -19,6 +34,6 @@ docker run --rm -v "$(pwd)/build:/out" sw-lambda-ruby-layer-3-3
 
 cd build/
 mkdir solarwinds-apm && mkdir ruby && mkdir ruby/gems
-unzip gems-3.2.0.zip -d ruby/gems/ && unzip gems-3.3.0.zip -d ruby/gems/
+unzip -q gems-3.2.0.zip -d ruby/gems/ && unzip -q gems-3.3.0.zip -d ruby/gems/
 cp ../otel/layer/otel_wrapper.rb . && cp ../otel/layer/wrapper solarwinds-apm/
-zip -r ruby-layer-$MATRIX_ARCH.zip ruby/ solarwinds-apm/ otel_wrapper.rb
+zip -qr ruby-layer-$MATRIX_ARCH.zip ruby/ solarwinds-apm/ otel_wrapper.rb
diff --git a/lambda/otel/Dockerfile_3_2 b/lambda/otel/Dockerfile_3_2
@@ -8,9 +8,21 @@ COPY . /build
 
 WORKDIR /build/layer
 RUN bundle config set --local path 'ruby'
-RUN bundle update
+
+RUN ls | grep solarwinds_apm-*.gem > gem_file.txt 2>/dev/null || true
+RUN export gem_file=$(cat gem_file.txt) && \
+    if [ -f "$gem_file" ]; then \
+        echo "$gem_file exists."; \
+        sed -i '$ s/^/#/' /build/layer/Gemfile; \
+        bundle update; \
+        bundle exec gem install $gem_file; \
+    else \
+        bundle update; \
+    fi
+
+RUN rm /build/layer/ruby/ruby/3.2.0/cache/*
 
 WORKDIR /build/layer/ruby/ruby
-RUN zip -r gems-3.2.0.zip 3.2.0/
+RUN zip -qr gems-3.2.0.zip 3.2.0/
 
 CMD cp /build/layer/ruby/ruby/gems-3.2.0.zip /out/gems-3.2.0.zip
diff --git a/lambda/otel/Dockerfile_3_3 b/lambda/otel/Dockerfile_3_3
@@ -8,9 +8,21 @@ COPY . /build
 
 WORKDIR /build/layer
 RUN bundle config set --local path 'ruby'
-RUN bundle update
+
+RUN ls | grep solarwinds_apm-*.gem > gem_file.txt 2>/dev/null || true
+RUN export gem_file=$(cat gem_file.txt) && \
+    if [ -f "$gem_file" ]; then \
+        echo "$gem_file exists."; \
+        sed -i '$ s/^/#/' /build/layer/Gemfile; \
+        bundle update; \
+        bundle exec gem install $gem_file; \
+    else \
+        bundle update; \
+    fi
+
+RUN rm /build/layer/ruby/ruby/3.3.0/cache/*
 
 WORKDIR /build/layer/ruby/ruby
-RUN zip -r gems-3.3.0.zip 3.3.0/
+RUN zip -qr gems-3.3.0.zip 3.3.0/
 
 CMD cp /build/layer/ruby/ruby/gems-3.3.0.zip /out/gems-3.3.0.zip
diff --git a/lambda/otel/layer/Gemfile b/lambda/otel/layer/Gemfile
@@ -8,4 +8,4 @@ source 'https://rubygems.pkg.github.com/solarwinds' do
   gem 'opentelemetry-metrics-sdk', '0.0.1'
 end
 
-gem 'solarwinds_apm', '6.0.1'
+gem 'solarwinds_apm', '6.0.2'