lamby 2.7.1 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 59b1550c254f18e60ca584d6387dbb859628593032b669a4c502cc9ab00058c9
-  data.tar.gz: 4e2cafe4ec8a56e951ff98100e347d98fc669559673047cc6e40ee316815a45b
+  metadata.gz: 3f07a6126778a111a18346115f2084c62e44e4911317f7dca5c5facd7f7939dc
+  data.tar.gz: e5490dcec93e2994f1334164bcde3b27b90d486879cf8e222a9ec4697df881d5
 SHA512:
-  metadata.gz: 406cc8edacadeb1dcb6a5be145699b5f27ca7c7c35ee766fb564cc9f2dc8cb00e26629922d7b4de23a9f04cd6f0410af29cfeb9b82c109f9fb441f919fe8eaae
-  data.tar.gz: 4e7fe89bb256588a6cf7effa5c6111286c99de8f20210359203d5c68b249f245fc7629fb520b67ee875adce8ed59994e82bcdcb4be33426385a97078ccbad872
+  metadata.gz: 43c26ff51d13c5451f1e2db53f501f8ea8622894b93d6755fcca20a7cca037f65b23dc8bba19f7b85f34785a87b627090f394ac621d71ee57d6dbca9f79962ca
+  data.tar.gz: 03f578c7b381bd91ff52ecca6ce17f65523a899c8333372cd6c32f937f23cafc12acb841de153c4eabc755c4babbd53aa09e832aa957698141401bcc39d4aaa3

data/CHANGELOG.md

@@ -4,6 +4,41 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v3.0.3
+
+#### Fixed
+
+- Ruby 2.7 Warnings | Logger. Thanks @jessedoyle
+
+## v3.0.2
+
+#### Added
+
+- Runner now returns STDOUT/STDERR as body.
+
+## v3.0.1
+
+#### Fixed
+
+- Fix Lambdakiq integration. Thanks #97.
+
+## v3.0.0
+
+#### Added
+
+- Automatically handle `Lambdakiq.jobs?(event)`.
+- New event for tasks like DB migrations. #80 #93
+
+#### Changed
+
+- Updated template files to latest lambda container standards.
+
+## v2.8.0
+
+#### Fixed
+
+- Perform rack body closing hooks on request #85
+
 ## v2.7.1
 
 #### Removed

data/Gemfile

@@ -3,3 +3,7 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 gemspec
 
 gem 'rails'
+
+group :test do
+  gem 'lambdakiq', require: false
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lamby (2.7.1)
+    lamby (3.0.3)
       rack
 
 GEM
@@ -73,6 +73,9 @@ GEM
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
+    aws-sdk-sqs (1.38.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
+      aws-sigv4 (~> 1.1)
     aws-sdk-ssm (1.108.0)
       aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
@@ -88,6 +91,11 @@ GEM
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
+    lambdakiq (1.0.1)
+      activejob
+      aws-sdk-sqs
+      concurrent-ruby
+      railties
     loofah (2.9.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -160,6 +168,7 @@ PLATFORMS
 DEPENDENCIES
   aws-sdk-ssm
   bundler
+  lambdakiq
   lamby!
   minitest
   minitest-focus

data/README.md

@@ -1,4 +1,3 @@
-
 # Lamby [![Actions Status](https://github.com/customink/lamby/workflows/CI/CD/badge.svg)](https://github.com/customink/lamby/actions)
 
 <h2>Simple Rails &amp; AWS Lambda Integration</h2>
@@ -11,7 +10,7 @@ The goal of this project is to provide minimal code to allow your Rails applicat
 
 ```ruby
 def handler(event:, context:)
-  Lamby.handler $app, event, context, rack: :http
+  Lamby.handler $app, event, context
 end
 ```
 
@@ -19,12 +18,10 @@ end
 
 https://lamby.custominktech.com/docs/quick_start
 
-
 ## Full Documentation
 
 https://lamby.custominktech.com/docs/installing_aws_sam
 
-
 ## Contributing
 
 After checking out the repo, run:
@@ -37,7 +34,6 @@ $ ./bin/test
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/customink/lamby. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
-
 ## Code of Conduct
 
 Everyone interacting in the Lamby project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/customink/lamby/blob/master/CODE_OF_CONDUCT.md).

data/bin/_test

@@ -4,4 +4,5 @@ set -e
 export RAILS_ENV="test"
 
 bundle exec rake test
-RACK_DEFLATE_ENABLED=1 bundle exec rake test_deflate
+LAMBY_TEST_DYNAMIC_HANDLER=1 bundle exec rake test
+LAMBY_RACK_DEFLATE_ENABLED=1 bundle exec rake test_deflate

data/lib/lamby.rb

@@ -9,6 +9,7 @@ require 'lamby/rack_alb'
 require 'lamby/rack_rest'
 require 'lamby/rack_http'
 require 'lamby/debug'
+require 'lamby/runner'
 require 'lamby/handler'
 
 if defined?(Rails)

data/lib/lamby/config.rb

@@ -43,5 +43,9 @@ module Lamby
       @event_bridge_handler = func
     end
 
+    def runner_patterns
+      Runner::PATTERNS
+    end
+
   end
 end

data/lib/lamby/handler.rb

@@ -41,6 +41,7 @@ module Lamby
     def body
       @rbody ||= ''.tap do |rbody|
         @body.each { |part| rbody << part if part }
+        @body.close if @body.respond_to? :close
       end
     end
 
@@ -67,16 +68,19 @@ module Lamby
     private
 
     def rack
-      @rack ||= case @options[:rack]
-      when :rest, :api
-        Lamby::RackRest.new @event, @context
-      when :alb
-        Lamby::RackAlb.new @event, @context
-      else
-        Lamby::RackHttp.new @event, @context
+      return @rack if defined?(@rack)
+      @rack = begin
+        type = rack_option
+        klass = Lamby::Rack.lookup type, @event
+        (klass && klass.handle?(@event)) ? klass.new(@event, @context) : false
       end
     end
 
+    def rack_option
+      return if ENV['LAMBY_TEST_DYNAMIC_HANDLER']
+      @options[:rack]
+    end
+
     def rack_response
       rack? ? rack.response(self) : {}
     end
@@ -86,6 +90,10 @@ module Lamby
         Debug.call @event, @context, rack.env
       elsif rack?
         @app.call rack.env
+      elsif runner?
+        Runner.call(@event)
+      elsif lambdakiq?
+        Lambdakiq.handler(@event)
       elsif event_bridge?
         Lamby.config.event_bridge_handler.call @event, @context
         [200, {}, StringIO.new('')]
@@ -100,12 +108,20 @@ module Lamby
     end
 
     def rack?
-      @event.key?('httpMethod') || @event.dig('requestContext', 'http')
+      rack
     end
 
     def event_bridge?
       Lamby.config.event_bridge_handler &&
         @event.key?('source') && @event.key?('detail') && @event.key?('detail-type')
     end
+
+    def lambdakiq?
+      defined?(::Lambdakiq) && ::Lambdakiq.jobs?(@event)
+    end
+
+    def runner?
+      Runner.handle?(@event)
+    end
   end
 end

data/lib/lamby/logger.rb

@@ -7,9 +7,9 @@ unless ENV['LAMBY_TEST']
   module Lamby
     module Logger
 
-      def initialize(*args)
+      def initialize(*args, **kwargs)
         args[0] = STDOUT
-        super(*args)
+        super(*args, **kwargs)
       end
 
     end

data/lib/lamby/rack.rb

@@ -7,6 +7,22 @@ module Lamby
     LAMBDA_CONTEXT = 'lambda.context'.freeze
     HTTP_X_REQUESTID = 'HTTP_X_REQUEST_ID'.freeze
     HTTP_COOKIE = 'HTTP_COOKIE'.freeze
+    
+    class << self
+
+      def lookup(type, event)
+        types[type] || types.values.detect { |t| t.handle?(event) }
+      end
+
+      # Order is important. REST is hardest to isolated with handle? method.
+      def types
+        { alb:  RackAlb,
+          http: RackHttp,
+          rest: RackRest,
+          api:  RackRest }
+      end
+
+    end
 
     attr_reader :event, :context
 

data/lib/lamby/rack_alb.rb

@@ -1,6 +1,15 @@
 module Lamby
   class RackAlb < Lamby::Rack
 
+    class << self
+
+      def handle?(event)
+        event.key?('httpMethod') && 
+          event.dig('requestContext', 'elb')
+      end
+
+    end
+
     def alb?
       true
     end

data/lib/lamby/rack_http.rb

@@ -1,6 +1,16 @@
 module Lamby
   class RackHttp < Lamby::Rack
 
+    class << self
+
+      def handle?(event)
+        event.key?('version') && 
+          ( event.dig('requestContext', 'http') || 
+            event.dig('requestContext', 'httpMethod') )
+      end
+
+    end
+
     def response(handler)
       if handler.base64_encodeable?
         { isBase64Encoded: true, body: handler.body64 }

data/lib/lamby/rack_rest.rb

@@ -1,5 +1,13 @@
 module Lamby
   class RackRest < Lamby::Rack
+    
+    class << self
+
+      def handle?(event)
+        event.key?('httpMethod')
+      end
+
+    end
 
     def response(handler)
       if handler.base64_encodeable?

data/lib/lamby/runner.rb

@@ -0,0 +1,60 @@
+require 'open3'
+
+module Lamby
+  class Runner
+    class Error < StandardError ; end
+    class UnknownCommandPattern < Error ; end
+
+    PATTERNS = [
+      %r{\A\./bin/(rails|rake) db:migrate.*}
+    ]
+
+    class << self
+
+      def handle?(event)
+        event.dig 'lamby', 'runner'
+      end
+
+      def call(event)
+        new(event).call
+      end
+
+    end
+
+    def initialize(event)
+      @event = event
+      @body = ''
+    end
+
+    def call
+      validate!
+      status = Open3.popen3(command, chdir: chdir) do |_stdin, stdout, stderr, thread|
+        @body << stdout.read
+        @body << stderr.read
+        puts @body
+        thread.value.exitstatus
+      end
+      [status, {}, StringIO.new(@body)]
+    end
+
+    def command
+      @event.dig 'lamby', 'runner'
+    end
+
+    private
+
+    def chdir
+      defined?(::Rails) ? ::Rails.root : Dir.pwd
+    end
+
+    def validate!
+      return if pattern?
+      raise UnknownCommandPattern.new(command)
+    end
+
+    def pattern?
+      PATTERNS.any? { |p| p === command }
+    end
+
+  end
+end

data/lib/lamby/templates/alb.rb

@@ -10,13 +10,13 @@ gsub_file app_file('template.yaml'), /APPNAMEHERE/, appname
 copy_file tpl_file('Dockerfile'), app_file('Dockerfile')
 copy_file tpl_file('Dockerfile-build'), app_file('Dockerfile-build')
 copy_file tpl_file('docker-compose.yml'), app_file('docker-compose.yml')
+gsub_file app_file('docker-compose.yml'), /APPNAMEHERE/, appname.downcase
 
 say 'Adding to .gitignore...'
 FileUtils.touch app_file('.gitignore')
 append_to_file app_file('.gitignore'), <<~GITIGNORE
   # Lamby
   /.aws-sam
-  /.lamby
 GITIGNORE
 
 say 'Creating ./bin files for build and deploy...'
@@ -24,10 +24,10 @@ copy_file tpl_file('_build'), app_file('bin/_build')
 gsub_file app_file('bin/_build'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/_build'), 0755
 copy_file tpl_file('deploy'), app_file('bin/deploy')
+gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/deploy'), 0755
 copy_file tpl_file('_deploy'), app_file('bin/_deploy')
 gsub_file app_file('bin/_deploy'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/_deploy'), 0755
-gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 
 say 'Welcome to AWS Lambda and Rails 🎉', :green

data/lib/lamby/templates/alb/Dockerfile

@@ -1,3 +1,15 @@
 FROM public.ecr.aws/lambda/ruby:2.7
+ARG RAILS_ENV
+ENV RAILS_ENV=$RAILS_ENV
+
 COPY . .
+
+# == Cleanup Unused Files & Directories ==
+RUN rm -rf \
+    log \
+    node_modules \
+    test \
+    tmp \
+    vendor/bundle/ruby/2.7.0/cache
+
 CMD ["app.handler"]

data/lib/lamby/templates/alb/Dockerfile-build

@@ -1,15 +1,18 @@
 FROM amazon/aws-sam-cli-build-image-ruby2.7
 
 # Ensure minimum required SAM version.
-# RUN pip install awscli && \
-#     pip uninstall --yes aws-sam-cli && \
-#     pip install aws-sam-cli==v1.13.2
+ENV SAM_CLI_VERSION=1.23.0
+RUN curl -L "https://github.com/aws/aws-sam-cli/releases/download/v${SAM_CLI_VERSION}/aws-sam-cli-linux-x86_64.zip" \
+         -o "aws-sam-cli-linux-x86_64.zip" && \
+    unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation && \
+    ./sam-installation/install && \
+    rm -rf ./sam-installation ./aws-sam-cli-linux-x86_64.zip
 
 # Node for JavaScript.
-# RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
-#     yum install -y nodejs && \
-#     curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
-#     rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
-#     yum install -y yarn
+RUN curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
+    yum install -y nodejs && \
+    curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+    rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
+    yum install -y yarn
 
 WORKDIR /var/task

data/lib/lamby/templates/alb/_build

@@ -1,20 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
-echo '== Simulate SAM Build Directory =='
-RESOURCE="RailsLambda"
-SAM_TEMP=$(mktemp -d -t sam.XXXXXX)
-rm -rf ./.lamby ./.aws-sam
-cp -r . "$SAM_TEMP"
-mkdir -p ./.lamby
-cp -r "$SAM_TEMP" "./.lamby/$RESOURCE"
-pushd "./.lamby/$RESOURCE"
-
-echo '== Cleaning Dev Dependencies =='
-rm -rf ./.bundle \
-       ./vendor/bundle
+if [ "$CI" != "true" ]; then
+  echo "== Cleaning dev dependencies for local deploy. Run ./bin/setup again afterward! =="
+  rm -rf ./.bundle \
+         ./vendor/bundle \
+         ./node_modules
+fi
 
 echo '== Bundle For Deployment =='
+bundle lock --add-platform x86_64-linux
 bundle config --local deployment true
 bundle config --local without 'development test'
 bundle config --local path './vendor/bundle'
@@ -27,14 +22,4 @@ echo "== Environments & Configuration =="
 #   LAMBY_SSM_PARAMS_PATH="/APPNAMEHERE/${RAILS_ENV}/env"
 
 echo "== Asset Hosts & Precompiling =="
-# NODE_ENV='production' \
-#   RAILS_GROUPS=assets \
-#   ./bin/rails assets:precompile
-
-echo "== Cleanup Unused Files & Directories =="
-rm -rf \
-  log \
-  node_modules \
-  test \
-  tmp \
-  vendor/bundle/ruby/2.7.0/cache
+NODE_ENV='production' ./bin/rails assets:precompile

data/lib/lamby/templates/alb/_deploy

@@ -1,62 +1,31 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
-export DEPLOYMENT_NAME="myorg/APPNAMEHERE"
-export RAILS_ENV=${RAILS_ENV:="production"}
-export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
-export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.${DEPLOYMENT_NAME/\//-}"}
-
 # https://github.com/aws/aws-sam-cli/issues/2447
-export AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
-export IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DEPLOYMENT_NAME}"
-
-echo '== Creating ECR repository =='
-echo 'You can safely ignore any RepositoryAlreadyExistsException errors...'
-aws ecr create-repository \
-  --repository-name "$DEPLOYMENT_NAME" \
-  --image-tag-mutability MUTABLE \
-  --image-scanning-configuration scanOnPush=true \
-  --region "$AWS_DEFAULT_REGION" || true
+AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/APPNAMEHERE"
 
-# Build our application code into a deployment folder
+echo "== Lamby build =="
 ./bin/_build
 
-export VPCID=${VPCID:=$(
-  aws ec2 describe-vpcs \
-    --output text \
-    --filters 'Name=state,Values=available' \
-    --query 'Vpcs[0].VpcId'
-)}
-
-export SUBNETS=${SUBNETS:=$(
-  aws ec2 describe-subnets \
-    --output text \
-    --filters 'Name=state,Values=available' "Name=vpc-id,Values=$VPCID" \
-    --query 'Subnets[*].SubnetId' | \
-    tr -s '[:blank:]' ','
-)}
-
+echo "== SAM build =="
 sam build \
   --parameter-overrides \
-  RailsEnv="${RAILS_ENV}"
+    RailsEnv="${RAILS_ENV}"
 
-echo "== SAM package..."
+echo "== SAM package =="
 sam package \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/template.yaml \
   --output-template-file ./.aws-sam/build/packaged.yaml \
   --image-repository "$IMAGE_REPOSITORY" \
-  --s3-bucket "${CLOUDFORMATION_BUCKET}" \
-  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
 
-echo "== SAM deploy..."
+echo "== SAM deploy =="
 sam deploy \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
+  --stack-name "APPNAMEHERE-${RAILS_ENV}" \
   --image-repository "$IMAGE_REPOSITORY" \
   --capabilities "CAPABILITY_IAM" \
   --parameter-overrides \
-    RailsEnv="${RAILS_ENV}" \
-    VpcId=${VPCID} \
-    Subnets=${SUBNETS}
+    RailsEnv="${RAILS_ENV}"

data/lib/lamby/templates/alb/app.rb

@@ -8,5 +8,5 @@ require_relative 'config/environment'
 $app = Rack::Builder.new { run Rails.application }.to_app
 
 def handler(event:, context:)
-  Lamby.handler $app, event, context, rack: :alb
+  Lamby.handler $app, event, context
 end

data/lib/lamby/templates/alb/deploy

@@ -1,13 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
 export RAILS_ENV=${RAILS_ENV:=production}
 
-if [[ "$OSTYPE" == *"darwin"* ]]; then
-  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
-fi
-
 docker-compose run \
-   -e CLOUDFORMATION_BUCKET \
-   cicd \
-   ./bin/_deploy
+  APPNAMEHERE \
+  ./bin/_deploy

data/lib/lamby/templates/alb/docker-compose.yml

@@ -1,17 +1,19 @@
 version: '3.7'
 services:
-  cicd:
+  APPNAMEHERE:
     build:
-      context: .
+      context: '.'
       dockerfile: Dockerfile-build
+    entrypoint: ./bin/entrypoint
     environment:
       - RAILS_ENV=${RAILS_ENV-development}
+      - SAM_CLI_TELEMETRY=0
       - AWS_PROFILE=${AWS_PROFILE-default}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
       - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}
-      - SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
+      - CI=${CI}
     volumes:
-      - ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}
-      - ~/.aws:/root/.aws:delegated
-      - ~/.ssh/known_hosts:/root/.ssh/known_hosts
-      - .:/var/task:delegated
+      - ${PWD}:/var/task
+      - ${HOME}/.aws:/root/.aws
       - /var/run/docker.sock:/var/run/docker.sock

data/lib/lamby/templates/alb/template.yaml

@@ -68,7 +68,7 @@ Resources:
   RailsLambda:
     Type: AWS::Serverless::Function
     Metadata:
-      DockerContext: ./.lamby/RailsLambda
+      DockerContext: .
       Dockerfile: Dockerfile
     Properties:
       MemorySize: 512

data/lib/lamby/templates/http.rb

@@ -10,13 +10,13 @@ gsub_file app_file('template.yaml'), /APPNAMEHERE/, appname
 copy_file tpl_file('Dockerfile'), app_file('Dockerfile')
 copy_file tpl_file('Dockerfile-build'), app_file('Dockerfile-build')
 copy_file tpl_file('docker-compose.yml'), app_file('docker-compose.yml')
+gsub_file app_file('docker-compose.yml'), /APPNAMEHERE/, appname.downcase
 
 say 'Adding to .gitignore...'
 FileUtils.touch app_file('.gitignore')
 append_to_file app_file('.gitignore'), <<~GITIGNORE
   # Lamby
   /.aws-sam
-  /.lamby
 GITIGNORE
 
 say 'Creating ./bin files for build and deploy...'
@@ -24,10 +24,10 @@ copy_file tpl_file('_build'), app_file('bin/_build')
 gsub_file app_file('bin/_build'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/_build'), 0755
 copy_file tpl_file('deploy'), app_file('bin/deploy')
+gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/deploy'), 0755
 copy_file tpl_file('_deploy'), app_file('bin/_deploy')
 gsub_file app_file('bin/_deploy'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/_deploy'), 0755
-gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 
 say 'Welcome to AWS Lambda and Rails 🎉', :green

data/lib/lamby/templates/http/Dockerfile

@@ -1,3 +1,15 @@
 FROM public.ecr.aws/lambda/ruby:2.7
+ARG RAILS_ENV
+ENV RAILS_ENV=$RAILS_ENV
+
 COPY . .
+
+# == Cleanup Unused Files & Directories ==
+RUN rm -rf \
+    log \
+    node_modules \
+    test \
+    tmp \
+    vendor/bundle/ruby/2.7.0/cache
+
 CMD ["app.handler"]

data/lib/lamby/templates/http/Dockerfile-build

@@ -1,15 +1,18 @@
 FROM amazon/aws-sam-cli-build-image-ruby2.7
 
 # Ensure minimum required SAM version.
-# RUN pip install awscli && \
-#     pip uninstall --yes aws-sam-cli && \
-#     pip install aws-sam-cli==v1.13.2
+ENV SAM_CLI_VERSION=1.23.0
+RUN curl -L "https://github.com/aws/aws-sam-cli/releases/download/v${SAM_CLI_VERSION}/aws-sam-cli-linux-x86_64.zip" \
+         -o "aws-sam-cli-linux-x86_64.zip" && \
+    unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation && \
+    ./sam-installation/install && \
+    rm -rf ./sam-installation ./aws-sam-cli-linux-x86_64.zip
 
 # Node for JavaScript.
-# RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
-#     yum install -y nodejs && \
-#     curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
-#     rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
-#     yum install -y yarn
+RUN curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
+    yum install -y nodejs && \
+    curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+    rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
+    yum install -y yarn
 
 WORKDIR /var/task

data/lib/lamby/templates/http/_build

@@ -1,20 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
-echo '== Simulate SAM Build Directory =='
-RESOURCE="RailsLambda"
-SAM_TEMP=$(mktemp -d -t sam.XXXXXX)
-rm -rf ./.lamby ./.aws-sam
-cp -r . "$SAM_TEMP"
-mkdir -p ./.lamby
-cp -r "$SAM_TEMP" "./.lamby/$RESOURCE"
-pushd "./.lamby/$RESOURCE"
-
-echo '== Cleaning Dev Dependencies =='
-rm -rf ./.bundle \
-       ./vendor/bundle
+if [ "$CI" != "true" ]; then
+  echo "== Cleaning dev dependencies for local deploy. Run ./bin/setup again afterward! =="
+  rm -rf ./.bundle \
+         ./vendor/bundle \
+         ./node_modules
+fi
 
 echo '== Bundle For Deployment =='
+bundle lock --add-platform x86_64-linux
 bundle config --local deployment true
 bundle config --local without 'development test'
 bundle config --local path './vendor/bundle'
@@ -27,14 +22,4 @@ echo "== Environments & Configuration =="
 #   LAMBY_SSM_PARAMS_PATH="/APPNAMEHERE/${RAILS_ENV}/env"
 
 echo "== Asset Hosts & Precompiling =="
-# NODE_ENV='production' \
-#   RAILS_GROUPS=assets \
-#   ./bin/rails assets:precompile
-
-echo "== Cleanup Unused Files & Directories =="
-rm -rf \
-  log \
-  node_modules \
-  test \
-  tmp \
-  vendor/bundle/ruby/2.7.0/cache
+NODE_ENV='production' ./bin/rails assets:precompile

data/lib/lamby/templates/http/_deploy

@@ -1,44 +1,30 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
-export DEPLOYMENT_NAME="myorg/APPNAMEHERE"
-export RAILS_ENV=${RAILS_ENV:="production"}
-export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
-export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.${DEPLOYMENT_NAME/\//-}"}
-
 # https://github.com/aws/aws-sam-cli/issues/2447
-export AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
-export IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DEPLOYMENT_NAME}"
-
-echo '== Creating ECR repository =='
-echo 'You can safely ignore any RepositoryAlreadyExistsException errors...'
-aws ecr create-repository \
-  --repository-name "$DEPLOYMENT_NAME" \
-  --image-tag-mutability MUTABLE \
-  --image-scanning-configuration scanOnPush=true \
-  --region "$AWS_DEFAULT_REGION" || true
+AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/APPNAMEHERE"
 
-# Build our application code into a deployment folder
+echo "== Lamby build =="
 ./bin/_build
 
+echo "== SAM build =="
 sam build \
   --parameter-overrides \
-  RailsEnv="${RAILS_ENV}"
+    RailsEnv="${RAILS_ENV}"
 
-echo "== SAM package..."
+echo "== SAM package =="
 sam package \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/template.yaml \
   --output-template-file ./.aws-sam/build/packaged.yaml \
   --image-repository "$IMAGE_REPOSITORY" \
-  --s3-bucket "${CLOUDFORMATION_BUCKET}" \
-  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
 
-echo "== SAM deploy..."
+echo "== SAM deploy =="
 sam deploy \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
+  --stack-name "APPNAMEHERE-${RAILS_ENV}" \
   --image-repository "$IMAGE_REPOSITORY" \
   --capabilities "CAPABILITY_IAM" \
   --parameter-overrides \

data/lib/lamby/templates/http/app.rb

@@ -8,5 +8,5 @@ require_relative 'config/environment'
 $app = Rack::Builder.new { run Rails.application }.to_app
 
 def handler(event:, context:)
-  Lamby.handler $app, event, context, rack: :http
+  Lamby.handler $app, event, context
 end

data/lib/lamby/templates/http/deploy

@@ -1,13 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
 export RAILS_ENV=${RAILS_ENV:=production}
 
-if [[ "$OSTYPE" == *"darwin"* ]]; then
-  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
-fi
-
 docker-compose run \
-   -e CLOUDFORMATION_BUCKET \
-   cicd \
-   ./bin/_deploy
+  APPNAMEHERE \
+  ./bin/_deploy

data/lib/lamby/templates/http/docker-compose.yml

@@ -1,17 +1,19 @@
 version: '3.7'
 services:
-  cicd:
+  APPNAMEHERE:
     build:
-      context: .
+      context: '.'
       dockerfile: Dockerfile-build
+    entrypoint: ./bin/entrypoint
     environment:
       - RAILS_ENV=${RAILS_ENV-development}
+      - SAM_CLI_TELEMETRY=0
       - AWS_PROFILE=${AWS_PROFILE-default}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
       - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}
-      - SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
+      - CI=${CI}
     volumes:
-      - ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}
-      - ~/.aws:/root/.aws:delegated
-      - ~/.ssh/known_hosts:/root/.ssh/known_hosts
-      - .:/var/task:delegated
+      - ${PWD}:/var/task
+      - ${HOME}/.aws:/root/.aws
       - /var/run/docker.sock:/var/run/docker.sock

data/lib/lamby/templates/http/template.yaml

@@ -16,7 +16,7 @@ Resources:
   RailsLambda:
     Type: AWS::Serverless::Function
     Metadata:
-      DockerContext: ./.lamby/RailsLambda
+      DockerContext: .
       Dockerfile: Dockerfile
     Properties:
       MemorySize: 512

data/lib/lamby/templates/rest.rb

@@ -10,13 +10,13 @@ gsub_file app_file('template.yaml'), /APPNAMEHERE/, appname
 copy_file tpl_file('Dockerfile'), app_file('Dockerfile')
 copy_file tpl_file('Dockerfile-build'), app_file('Dockerfile-build')
 copy_file tpl_file('docker-compose.yml'), app_file('docker-compose.yml')
+gsub_file app_file('docker-compose.yml'), /APPNAMEHERE/, appname.downcase
 
 say 'Adding to .gitignore...'
 FileUtils.touch app_file('.gitignore')
 append_to_file app_file('.gitignore'), <<~GITIGNORE
   # Lamby
   /.aws-sam
-  /.lamby
 GITIGNORE
 
 say 'Creating ./bin files for build and deploy...'
@@ -24,10 +24,10 @@ copy_file tpl_file('_build'), app_file('bin/_build')
 gsub_file app_file('bin/_build'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/_build'), 0755
 copy_file tpl_file('deploy'), app_file('bin/deploy')
+gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/deploy'), 0755
 copy_file tpl_file('_deploy'), app_file('bin/_deploy')
 gsub_file app_file('bin/_deploy'), /APPNAMEHERE/, appname.downcase
 chmod app_file('bin/_deploy'), 0755
-gsub_file app_file('bin/deploy'), /APPNAMEHERE/, appname.downcase
 
 say 'Welcome to AWS Lambda and Rails 🎉', :green

data/lib/lamby/templates/rest/Dockerfile

@@ -1,3 +1,15 @@
 FROM public.ecr.aws/lambda/ruby:2.7
+ARG RAILS_ENV
+ENV RAILS_ENV=$RAILS_ENV
+
 COPY . .
+
+# == Cleanup Unused Files & Directories ==
+RUN rm -rf \
+    log \
+    node_modules \
+    test \
+    tmp \
+    vendor/bundle/ruby/2.7.0/cache
+
 CMD ["app.handler"]

data/lib/lamby/templates/rest/Dockerfile-build

@@ -1,15 +1,18 @@
 FROM amazon/aws-sam-cli-build-image-ruby2.7
 
 # Ensure minimum required SAM version.
-# RUN pip install awscli && \
-#     pip uninstall --yes aws-sam-cli && \
-#     pip install aws-sam-cli==v1.13.2
+ENV SAM_CLI_VERSION=1.23.0
+RUN curl -L "https://github.com/aws/aws-sam-cli/releases/download/v${SAM_CLI_VERSION}/aws-sam-cli-linux-x86_64.zip" \
+         -o "aws-sam-cli-linux-x86_64.zip" && \
+    unzip -q aws-sam-cli-linux-x86_64.zip -d sam-installation && \
+    ./sam-installation/install && \
+    rm -rf ./sam-installation ./aws-sam-cli-linux-x86_64.zip
 
 # Node for JavaScript.
-# RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \
-#     yum install -y nodejs && \
-#     curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
-#     rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
-#     yum install -y yarn
+RUN curl -sL https://rpm.nodesource.com/setup_14.x | bash - && \
+    yum install -y nodejs && \
+    curl --silent --location https://dl.yarnpkg.com/rpm/yarn.repo | tee /etc/yum.repos.d/yarn.repo && \
+    rpm --import https://dl.yarnpkg.com/rpm/pubkey.gpg && \
+    yum install -y yarn
 
 WORKDIR /var/task

data/lib/lamby/templates/rest/_build

@@ -1,20 +1,15 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
-echo '== Simulate SAM Build Directory =='
-RESOURCE="RailsLambda"
-SAM_TEMP=$(mktemp -d -t sam.XXXXXX)
-rm -rf ./.lamby ./.aws-sam
-cp -r . "$SAM_TEMP"
-mkdir -p ./.lamby
-cp -r "$SAM_TEMP" "./.lamby/$RESOURCE"
-pushd "./.lamby/$RESOURCE"
-
-echo '== Cleaning Dev Dependencies =='
-rm -rf ./.bundle \
-       ./vendor/bundle
+if [ "$CI" != "true" ]; then
+  echo "== Cleaning dev dependencies for local deploy. Run ./bin/setup again afterward! =="
+  rm -rf ./.bundle \
+         ./vendor/bundle \
+         ./node_modules
+fi
 
 echo '== Bundle For Deployment =='
+bundle lock --add-platform x86_64-linux
 bundle config --local deployment true
 bundle config --local without 'development test'
 bundle config --local path './vendor/bundle'
@@ -27,14 +22,4 @@ echo "== Environments & Configuration =="
 #   LAMBY_SSM_PARAMS_PATH="/APPNAMEHERE/${RAILS_ENV}/env"
 
 echo "== Asset Hosts & Precompiling =="
-# NODE_ENV='production' \
-#   RAILS_GROUPS=assets \
-#   ./bin/rails assets:precompile
-
-echo "== Cleanup Unused Files & Directories =="
-rm -rf \
-  log \
-  node_modules \
-  test \
-  tmp \
-  vendor/bundle/ruby/2.7.0/cache
+NODE_ENV='production' ./bin/rails assets:precompile

data/lib/lamby/templates/rest/_deploy

@@ -1,44 +1,30 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
-export DEPLOYMENT_NAME="myorg/APPNAMEHERE"
-export RAILS_ENV=${RAILS_ENV:="production"}
-export AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION:=us-east-1}
-export CLOUDFORMATION_BUCKET=${CLOUDFORMATION_BUCKET:="lamby.cloudformation.${DEPLOYMENT_NAME/\//-}"}
-
 # https://github.com/aws/aws-sam-cli/issues/2447
-export AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
-export IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/${DEPLOYMENT_NAME}"
-
-echo '== Creating ECR repository =='
-echo 'You can safely ignore any RepositoryAlreadyExistsException errors...'
-aws ecr create-repository \
-  --repository-name "$DEPLOYMENT_NAME" \
-  --image-tag-mutability MUTABLE \
-  --image-scanning-configuration scanOnPush=true \
-  --region "$AWS_DEFAULT_REGION" || true
+AWS_ACCOUNT_ID=$(aws sts get-caller-identity --query Account --output text)
+IMAGE_REPOSITORY="${AWS_ACCOUNT_ID}.dkr.ecr.${AWS_DEFAULT_REGION}.amazonaws.com/APPNAMEHERE"
 
-# Build our application code into a deployment folder
+echo "== Lamby build =="
 ./bin/_build
 
+echo "== SAM build =="
 sam build \
   --parameter-overrides \
-  RailsEnv="${RAILS_ENV}"
+    RailsEnv="${RAILS_ENV}"
 
-echo "== SAM package..."
+echo "== SAM package =="
 sam package \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/template.yaml \
   --output-template-file ./.aws-sam/build/packaged.yaml \
   --image-repository "$IMAGE_REPOSITORY" \
-  --s3-bucket "${CLOUDFORMATION_BUCKET}" \
-  --s3-prefix "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}"
 
-echo "== SAM deploy..."
+echo "== SAM deploy =="
 sam deploy \
   --region "$AWS_DEFAULT_REGION" \
   --template-file ./.aws-sam/build/packaged.yaml \
-  --stack-name "${DEPLOYMENT_NAME/\//-}-${RAILS_ENV}" \
+  --stack-name "APPNAMEHERE-${RAILS_ENV}" \
   --image-repository "$IMAGE_REPOSITORY" \
   --capabilities "CAPABILITY_IAM" \
   --parameter-overrides \

data/lib/lamby/templates/rest/app.rb

@@ -8,5 +8,5 @@ require_relative 'config/environment'
 $app = Rack::Builder.new { run Rails.application }.to_app
 
 def handler(event:, context:)
-  Lamby.handler $app, event, context, rack: :rest
+  Lamby.handler $app, event, context
 end

data/lib/lamby/templates/rest/deploy

@@ -1,13 +1,8 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
 export RAILS_ENV=${RAILS_ENV:=production}
 
-if [[ "$OSTYPE" == *"darwin"* ]]; then
-  export SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock
-fi
-
 docker-compose run \
-   -e CLOUDFORMATION_BUCKET \
-   cicd \
-   ./bin/_deploy
+  APPNAMEHERE \
+  ./bin/_deploy

data/lib/lamby/templates/rest/docker-compose.yml

@@ -1,17 +1,19 @@
 version: '3.7'
 services:
-  cicd:
+  APPNAMEHERE:
     build:
-      context: .
+      context: '.'
       dockerfile: Dockerfile-build
+    entrypoint: ./bin/entrypoint
     environment:
       - RAILS_ENV=${RAILS_ENV-development}
+      - SAM_CLI_TELEMETRY=0
       - AWS_PROFILE=${AWS_PROFILE-default}
+      - AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}
+      - AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}
       - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}
-      - SSH_AUTH_SOCK=${SSH_AUTH_SOCK}
+      - CI=${CI}
     volumes:
-      - ${SSH_AUTH_SOCK}:${SSH_AUTH_SOCK}
-      - ~/.aws:/root/.aws:delegated
-      - ~/.ssh/known_hosts:/root/.ssh/known_hosts
-      - .:/var/task:delegated
+      - ${PWD}:/var/task
+      - ${HOME}/.aws:/root/.aws
       - /var/run/docker.sock:/var/run/docker.sock

data/lib/lamby/templates/rest/template.yaml

@@ -49,7 +49,7 @@ Resources:
   RailsLambda:
     Type: AWS::Serverless::Function
     Metadata:
-      DockerContext: ./.lamby/RailsLambda
+      DockerContext: .
       Dockerfile: Dockerfile
     Properties:
       MemorySize: 512

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '2.7.1'
+  VERSION = '3.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 2.7.1
+  version: 3.0.3
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-04 00:00:00.000000000 Z
+date: 2021-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -159,6 +159,7 @@ files:
 - lib/lamby/rack_http.rb
 - lib/lamby/rack_rest.rb
 - lib/lamby/railtie.rb
+- lib/lamby/runner.rb
 - lib/lamby/sam_helpers.rb
 - lib/lamby/ssm_parameter_store.rb
 - lib/lamby/tasks.rake