lamby 3.1.3 → 4.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d89d9ea207eee94cb34a61940b9dd179f833fc55048042216b9c6826917745f3
-  data.tar.gz: 8478cd0f8ec72d9415cc7479a5505405aa00c97d7d5558da90953abb47be343e
+  metadata.gz: 6913fa1d06b5a645efedec776e518aadb491a154c9c9e9bae771531eec8ebd3a
+  data.tar.gz: fc5d7856fe0239fa333b816e1f87b88fc4fb4778d6a68011334ce32618eacd77
 SHA512:
-  metadata.gz: c04af144338ef19c3fc1e4c1b8d83a696ac0d9942665043807b9f8469baa23ddc581b4604c250cd8cbfca2bbf0fc65e0bbef810b50bb4450c417cf141965ff09
-  data.tar.gz: e054a63c87e499da9cc19c5166f48f96775496d331c6f06f69647f403521da7de039aed50304d86783063744fe5a9698385a3b1409a8226d6caa17e1be8c9c65
+  metadata.gz: ee3a4ed2a996e964aca8bc18f48b74f7d7f0a984f038b1cd69543c4426efb2ee4f16de9b4a872b66fac22d297fc47129c067f17e7f04f9ebde49abc5925ac810
+  data.tar.gz: 470bd76ebf4547411882b830c5c6edf705fc044de93e56021e5f92c93c4c234f84e124ae375b33ff5318b7d2623d1b0e88a92d42f6e175da8cc17b6dbe665475

data/.devcontainer/Dockerfile

@@ -0,0 +1 @@
+FROM mcr.microsoft.com/devcontainers/ruby:3.1

data/.devcontainer/devcontainer.json

@@ -0,0 +1,20 @@
+{
+  "name": "lamby",
+  "build": {
+    "dockerfile": "Dockerfile"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/node:latest": {},
+    "ghcr.io/devcontainers/features/docker-in-docker:latest": {},
+    "ghcr.io/devcontainers/features/sshd:latest": {}
+  },
+  "customizations": {
+    "vscode": {
+      "settings": {
+        "editor.formatOnSave": true
+      },
+      "extensions": []
+    }
+  },
+  "remoteUser": "vscode"
+}

data/.github/workflows/test.yml

@@ -0,0 +1,25 @@
+name: CI/CD
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build & Run Development Container
+        uses: devcontainers/ci@v0.2
+        with:
+          push: always
+          imageName: ghcr.io/customink/lamby-devcontainer
+          cacheFrom: ghcr.io/customink/lamby-devcontainer
+          env: |
+            CI
+          runCmd: |
+            ./bin/setup
+            ./bin/test

data/CHANGELOG.md

@@ -1,9 +1,26 @@
-<!-- -*- mode: markdown -*- -->
-
 # Keep A Changelog!
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v4.0.0 (unreleased)
+
+### Added
+
+- New `Lamby.config.app` with default Rack builder.
+- The `Lamby.command` to simplify `CMD` with the new config.app from above.
+
+#### Removed
+
+- All lamby installer templates.
+- Remove SAM env checks used during debug mode.
+- Removed showing environment variables in debug mode.
+- Need to `require: false` when adding the Lamby gem to your `Gemfile`. 
+- Dotenv integration. Use [Crypteia](https://github.com/customink/crypteia) now.
+
+#### Changed
+
+- Tested Rack 3.x.
+
 ## v3.1.3
 
 #### Fixed

data/Gemfile.lock

@@ -1,171 +1,176 @@
 PATH
   remote: .
   specs:
-    lamby (3.1.2)
+    lamby (4.0.0.beta1)
       rack
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    actioncable (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activejob (= 6.1.3.1)
-      activerecord (= 6.1.3.1)
-      activestorage (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    actionmailbox (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      actionview (= 6.1.3.1)
-      activejob (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.4)
+      actionpack (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activesupport (= 7.0.4)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.3.1)
-      actionview (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.4)
+      actionview (= 7.0.4)
+      activesupport (= 7.0.4)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activerecord (= 6.1.3.1)
-      activestorage (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    actiontext (7.0.4)
+      actionpack (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.3.1)
-      activesupport (= 6.1.3.1)
+    actionview (7.0.4)
+      activesupport (= 7.0.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.3.1)
-      activesupport (= 6.1.3.1)
+    activejob (7.0.4)
+      activesupport (= 7.0.4)
       globalid (>= 0.3.6)
-    activemodel (6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activerecord (6.1.3.1)
-      activemodel (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
-    activestorage (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activejob (= 6.1.3.1)
-      activerecord (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
-      marcel (~> 1.0.0)
-      mini_mime (~> 1.0.2)
-    activesupport (6.1.3.1)
+    activemodel (7.0.4)
+      activesupport (= 7.0.4)
+    activerecord (7.0.4)
+      activemodel (= 7.0.4)
+      activesupport (= 7.0.4)
+    activestorage (7.0.4)
+      actionpack (= 7.0.4)
+      activejob (= 7.0.4)
+      activerecord (= 7.0.4)
+      activesupport (= 7.0.4)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.570.0)
-    aws-sdk-core (3.130.0)
+    aws-partitions (1.660.0)
+    aws-sdk-core (3.167.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-sqs (1.52.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-sqs (1.51.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ssm (1.144.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.108.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     builder (3.2.4)
     coderay (1.1.3)
     concurrent-ruby (1.1.10)
     crass (1.0.6)
-    erubi (1.10.0)
+    erubi (1.11.0)
     globalid (1.0.0)
       activesupport (>= 5.0)
-    i18n (1.10.0)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.1)
-    lambdakiq (2.0.0)
+    lambdakiq (2.1.0)
       activejob
       aws-sdk-sqs
       concurrent-ruby
       railties
-    loofah (2.15.0)
+    loofah (2.19.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (1.0.1)
+    marcel (1.0.2)
     method_source (1.0.0)
-    mini_mime (1.0.3)
-    mini_portile2 (2.8.0)
-    minitest (5.15.0)
-    minitest-focus (1.2.1)
+    mini_mime (1.1.2)
+    minitest (5.16.3)
+    minitest-focus (1.3.1)
       minitest (>= 4, < 6)
-    mocha (1.12.0)
-    nio4r (2.5.7)
-    nokogiri (1.13.3)
-      mini_portile2 (~> 2.8.0)
-      racc (~> 1.4)
-    nokogiri (1.13.3-x86_64-linux)
+    mocha (2.0.2)
+      ruby2_keywords (>= 0.0.5)
+    net-imap (0.3.1)
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.1.3)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nio4r (2.5.8)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.6.0)
-    rack (2.2.3)
-    rack-test (1.1.0)
-      rack (>= 1.0, < 3)
-    rails (6.1.3.1)
-      actioncable (= 6.1.3.1)
-      actionmailbox (= 6.1.3.1)
-      actionmailer (= 6.1.3.1)
-      actionpack (= 6.1.3.1)
-      actiontext (= 6.1.3.1)
-      actionview (= 6.1.3.1)
-      activejob (= 6.1.3.1)
-      activemodel (= 6.1.3.1)
-      activerecord (= 6.1.3.1)
-      activestorage (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    rack (2.2.4)
+    rack-test (2.0.2)
+      rack (>= 1.3)
+    rails (7.0.4)
+      actioncable (= 7.0.4)
+      actionmailbox (= 7.0.4)
+      actionmailer (= 7.0.4)
+      actionpack (= 7.0.4)
+      actiontext (= 7.0.4)
+      actionview (= 7.0.4)
+      activejob (= 7.0.4)
+      activemodel (= 7.0.4)
+      activerecord (= 7.0.4)
+      activestorage (= 7.0.4)
+      activesupport (= 7.0.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.3.1)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.4)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.4.2)
+    rails-html-sanitizer (1.4.3)
       loofah (~> 2.3)
-    railties (6.1.3.1)
-      actionpack (= 6.1.3.1)
-      activesupport (= 6.1.3.1)
+    railties (7.0.4)
+      actionpack (= 7.0.4)
+      activesupport (= 7.0.4)
       method_source
-      rake (>= 0.8.7)
+      rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rake (13.0.6)
-    sprockets (4.0.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
+    ruby2_keywords (0.0.5)
     thor (1.2.1)
-    tzinfo (2.0.4)
+    timeout (0.3.0)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
-    websocket-driver (0.7.3)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.5.4)
+    zeitwerk (2.6.6)
 
 PLATFORMS
-  ruby
   x86_64-linux
 
 DEPENDENCIES
@@ -181,4 +186,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.2.22
+   2.3.7

data/README.md

@@ -1,10 +1,10 @@
-# Lamby [![Actions Status](https://github.com/customink/lamby/workflows/CI/CD/badge.svg)](https://github.com/customink/lamby/actions)
+# Lamby [![Actions Status](https://github.com/customink/lamby/workflows/CI/CD/badge.svg)](https://github.com/customink/lamby/actions) [![Codespaces](https://img.shields.io/badge/Codespaces-✅-black)](https://github.com/features/codespaces)
 
-<h2>Simple Rails &amp; AWS Lambda Integration</h2>
+<h2>Simple Rails &amp; AWS Lambda Integration using Rack</h2>
 
-<img src="https://user-images.githubusercontent.com/2381/59363668-89edeb80-8d03-11e9-9985-2ce14361b7e3.png" alt="Lamby: Simple Rails & AWS Lambda Integration" align="right" />
+Lamby is an [AWS Lambda Web Adapter](https://github.com/awslabs/aws-lambda-web-adapter) for Rack applications.
 
-<p>&nbsp;</p>
+<img src="https://raw.githubusercontent.com/customink/lamby_site/master/app/assets/images/lamby-arch-hero.png" alt="Lamby: Simple Rails & AWS Lambda Integration"/>
 
 The goal of this project is to provide minimal code to allow your Rails application to respond to incoming [AWS Lambda Function Handler in Ruby](https://docs.aws.amazon.com/lambda/latest/dg/ruby-handler.html) `event` and `context` objects in the Lambda handler. We support Application Load Balancer integration or API Gateway.
 
@@ -24,16 +24,19 @@ https://lamby.custominktech.com/docs/installing_aws_sam
 
 ## Contributing
 
-After checking out the repo, run:
+This project is built for [GitHub Codespcaes](https://github.com/features/codespaces) using the [Development Container](https://containers.dev) specification. Once you have the repo cloned and setup with a dev container using either Codespaces or [VS Code](#using-vs-code), run the following commands. This will install packages and run tests.
 
 ```shell
-$ ./bin/bootstrap
 $ ./bin/setup
 $ ./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.
+#### Using VS Code
+
+If you have the [Visual Studio Code Dev Container](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) extension installed you can easily clone this repo locally, use the "Open Folder in Container..." command. This allows you to use the integrated terminal for the commands above.
 
 ## 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).
+
+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.

data/bin/bootstrap

@@ -1,5 +1,2 @@
-#!/bin/bash
+#!/bin/sh
 set -e
-
-echo '== Building containers =='
-docker-compose build

data/bin/setup

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
-docker-compose run \
-  cicd \
-  ./bin/_setup
+echo '== Installing dependencies =='
+bundle config set --local path 'vendor/bundle'
+bundle install

data/bin/test

@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 
 export RAILS_ENV="test"
 
-docker-compose run \
-  cicd \
-  ./bin/_test
+bundle exec rake test
+LAMBY_TEST_DYNAMIC_HANDLER=1 bundle exec rake test
+LAMBY_RACK_DEFLATE_ENABLED=1 bundle exec rake test_deflate

data/bin/update

@@ -1,7 +1,5 @@
-#!/usr/bin/env bash
-
+#!/bin/sh
 set -e
 
 rm -rf ./vendor/bundle
-
 ./bin/setup

data/lib/lamby/config.rb

@@ -31,7 +31,16 @@ module Lamby
       self
     end
 
+    def rack_app
+      @rack_app ||= Rack::Builder.new { run Rails.application }.to_app
+    end
+
+    def rack_app=(app)
+      @rack_app = app
+    end
+
     def initialize_defaults
+      @rack_app = nil
       @event_bridge_handler = lambda { |event, context| puts(event) }
     end
 

data/lib/lamby/debug.rb

@@ -1,7 +1,5 @@
 module Lamby
   module Debug
-    include Lamby::SamHelpers
-
     extend self
 
     def on?(event)
@@ -33,10 +31,6 @@ module Lamby
             <code>
               #{CGI::escapeHTML(context.inspect)}
             </code>
-            <h2>Environment</h2>
-            <pre>
-              #{sam_local? ? JSON.pretty_generate(ENV.to_h) : 'N/A'}
-            </pre>
           </body>
         </html>
       HTML

data/lib/lamby/logger.rb

@@ -1,8 +1,7 @@
 require 'logger'
 
-unless ENV['LAMBY_TEST']
-
-  ENV['RAILS_LOG_TO_STDOUT'] = '1'
+if ENV['AWS_EXECUTION_ENV']
+  ENV['RAILS_LOG_TO_STDOUT'] = '1' 
 
   module Lamby
     module Logger
@@ -15,13 +14,5 @@ unless ENV['LAMBY_TEST']
     end
   end
 
-  Logger.prepend Lamby::Logger
-
+  Logger.prepend Lamby::Logger unless ENV['LAMBY_TEST']
 end
-
-# TODO: Railtie initializer
-# Rails.application.config.logger = ActiveSupport::TaggedLogging.new(
-#   ActiveSupport::Logger.new(STDOUT).tap { |logger|
-#     logger.formatter = Rails.application.config.log_formatter
-#   }
-# )

data/lib/lamby/rack.rb

@@ -1,8 +1,5 @@
 module Lamby
   class Rack
-
-    include SamHelpers
-
     LAMBDA_EVENT = 'lambda.event'.freeze
     LAMBDA_CONTEXT = 'lambda.context'.freeze
     HTTP_X_REQUESTID = 'HTTP_X_REQUEST_ID'.freeze

data/lib/lamby/railtie.rb

@@ -1,10 +1,5 @@
 module Lamby
   class Railtie < ::Rails::Railtie
-
-    rake_tasks do
-      load 'lamby/tasks.rake'
-      load 'lamby/templates.rake'
-    end
-
+    config.lamby = Lamby::Config.config
   end
 end

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '3.1.3'
+  VERSION = '4.0.0.beta1'
 end

data/lib/lamby.rb

@@ -3,7 +3,6 @@ require 'rack'
 require 'base64'
 require 'lamby/version'
 require 'lamby/config'
-require 'lamby/sam_helpers'
 require 'lamby/rack'
 require 'lamby/rack_alb'
 require 'lamby/rack_rest'
@@ -21,6 +20,10 @@ module Lamby
 
   extend self
 
+  def command(event, context)
+    handler.new(config.app, event, context)
+  end
+
   def handler(app, event, context, options = {})
     Handler.call(app, event, context, options)
   end