lamby 1.0.2 → 2.2.1

data/bin/setup

@@ -1,6 +1,6 @@
 #!/bin/bash
-
 set -e
 
-bundle install
-pipenv install
+docker-compose run \
+  cicd \
+  ./bin/_setup

data/bin/test

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

data/bin/update

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

data/docker-compose.yml

@@ -0,0 +1,14 @@
+version: '3.7'
+services:
+  cicd:
+    build: .
+    environment:
+      - AWS_PROFILE=${AWS_PROFILE-default}
+      - RAILS_ENV=${RAILS_ENV-test}
+      - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}
+      - SAM_CLI_TELEMETRY=0
+      - DIDPWD=${PWD}
+    volumes:
+      - ~/.aws:/root/.aws:delegated
+      - .:/var/task:delegated
+      - /var/run/docker.sock:/var/run/docker.sock

data/lamby.gemspec

@@ -19,12 +19,11 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
   spec.add_dependency 'rack'
-  spec.add_dependency 'rails'
   spec.add_development_dependency 'aws-sdk-ssm'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
+  spec.add_development_dependency 'minitest-focus'
   spec.add_development_dependency 'mocha'
   spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'sqlite3'
 end

data/lib/lamby.rb

@@ -1,16 +1,19 @@
 require 'lamby/logger'
 require 'rack'
 require 'base64'
-require 'active_support/all'
 require 'lamby/version'
 require 'lamby/sam_helpers'
 require 'lamby/rack'
 require 'lamby/rack_alb'
-require 'lamby/rack_api'
+require 'lamby/rack_rest'
+require 'lamby/rack_http'
 require 'lamby/debug'
 require 'lamby/handler'
-require 'rails/railtie'
-require 'lamby/railtie'
+
+if defined?(Rails)
+  require 'rails/railtie'
+  require 'lamby/railtie'
+end
 
 module Lamby
 

data/lib/lamby/debug.rb

@@ -6,7 +6,7 @@ module Lamby
 
     def on?(event)
       params = event['multiValueQueryStringParameters'] || event['queryStringParameters']
-      (Rails.env.development? || ENV['LAMBY_DEBUG']) && params && params['debug'] == '1'
+      (development? || ENV['LAMBY_DEBUG']) && params && params['debug'] == '1'
     end
 
     def call(event, context, env)
@@ -42,5 +42,12 @@ module Lamby
       HTML
     end
 
+    def development?
+      ENV
+        .slice('RACK_ENV', 'RAILS_ENV')
+        .values
+        .any? { |v| v.to_s.casecmp('development').zero? }
+    end
+
   end
 end

data/lib/lamby/handler.rb

@@ -44,14 +44,27 @@ module Lamby
       self
     end
 
+    def base64_encodeable?
+      @headers && (
+        @headers['Content-Transfer-Encoding'] == 'binary' ||
+        @headers['X-Lamby-Base64'] == '1'
+      )
+    end
+
+    def body64
+      Base64.strict_encode64(body)
+    end
+
     private
 
     def rack
       @rack ||= case @options[:rack]
-      when :api
-        Lamby::RackApi.new @event, @context
-      else
+      when :rest, :api
+        Lamby::RackRest.new @event, @context
+      when :alb
         Lamby::RackAlb.new @event, @context
+      else
+        Lamby::RackHttp.new @event, @context
       end
     end
 

data/lib/lamby/logger.rb

@@ -1,19 +1,23 @@
 require 'logger'
 
-ENV['RAILS_LOG_TO_STDOUT'] = '1'
+unless ENV['LAMBY_TEST']
 
-module Lamby
-  module Logger
+  ENV['RAILS_LOG_TO_STDOUT'] = '1'
 
-    def initialize(*args)
-      args[0] = STDOUT
-      super(*args)
-    end
+  module Lamby
+    module Logger
+
+      def initialize(*args)
+        args[0] = STDOUT
+        super(*args)
+      end
 
+    end
   end
-end
 
-Logger.prepend Lamby::Logger
+  Logger.prepend Lamby::Logger
+
+end
 
 # TODO: Railtie initializer
 # Rails.application.config.logger = ActiveSupport::TaggedLogging.new(

data/lib/lamby/rack.rb

@@ -6,6 +6,7 @@ module Lamby
     LAMBDA_EVENT = 'lambda.event'.freeze
     LAMBDA_CONTEXT = 'lambda.context'.freeze
     HTTP_X_REQUESTID = 'HTTP_X_REQUEST_ID'.freeze
+    HTTP_COOKIE = 'HTTP_COOKIE'.freeze
 
     attr_reader :event, :context
 
@@ -22,14 +23,6 @@ module Lamby
       {}
     end
 
-    def api?
-      false
-    end
-
-    def alb?
-      false
-    end
-
     def multi_value?
       false
     end
@@ -70,7 +63,26 @@ module Lamby
     end
 
     def query_string
-      @query_string ||= event['queryStringParameters'].try(:to_query)
+      @query_string ||= if event.key?('rawQueryString')
+        event['rawQueryString']
+      elsif event.key?('multiValueQueryStringParameters')
+        query = event['multiValueQueryStringParameters'] || {}
+        query.map do |key, value|
+          value.map{ |v| "#{key}=#{v}" }.join('&')
+        end.flatten.join('&')
+      else
+        build_query_string
+      end
+    end
+
+    def build_query_string
+      return if event['queryStringParameters'].nil?
+
+      Rack::Utils.build_nested_query(
+        event.fetch('queryStringParameters')
+      )
+        .gsub('[', '%5B')
+        .gsub(']', '%5D')
     end
 
     def base64_encoded?

data/lib/lamby/rack_alb.rb

@@ -11,7 +11,7 @@ module Lamby
 
     def response(handler)
       hhdrs = handler.headers
-      multivalue_headers = hhdrs.transform_values { |v| Array.wrap(v) } if multi_value?
+      multivalue_headers = hhdrs.transform_values { |v| Array[v].compact.flatten } if multi_value?
       status_description = "#{handler.status} #{::Rack::Utils::HTTP_STATUS_CODES[handler.status]}"
       base64_encode = hhdrs['Content-Transfer-Encoding'] == 'binary' || hhdrs['X-Lamby-Base64'] == '1'
       body = Base64.strict_encode64(handler.body) if base64_encode
@@ -53,20 +53,17 @@ module Lamby
     end
 
     def headers_multi
-      (event['multiValueHeaders'] || {}).transform_values do |v|
-        v.is_a?(Array) ? v.first : v
-      end
-    end
-
-    def query_string
-      @query_string ||= multi_value? ? query_string_multi : super
-    end
-
-    def query_string_multi
-      query = event['multiValueQueryStringParameters'] || {}
-      string = query.map do |key, value|
-        value.map{ |v| "#{key}=#{v}" }.join('&')
-      end.flatten.join('&')
+      Hash[(event['multiValueHeaders'] || {}).map do |k,v|
+        if v.is_a?(Array)
+          if k == 'x-forwarded-for'
+            [k, v.join(', ')]
+          else
+            [k, v.first]
+          end
+        else
+          [k,v]
+        end
+      end]
     end
 
   end

data/lib/lamby/rack_http.rb

@@ -0,0 +1,84 @@
+module Lamby
+  class RackHttp < Lamby::Rack
+
+    def response(handler)
+      if handler.base64_encodeable?
+        { isBase64Encoded: true, body: handler.body64 }
+      else
+        super
+      end
+    end
+
+    private
+
+    def env_base
+      { ::Rack::REQUEST_METHOD => request_method,
+        ::Rack::SCRIPT_NAME => '',
+        ::Rack::PATH_INFO => path_info,
+        ::Rack::QUERY_STRING => query_string,
+        ::Rack::SERVER_NAME => server_name,
+        ::Rack::SERVER_PORT => server_port,
+        ::Rack::SERVER_PROTOCOL => server_protocol,
+        ::Rack::RACK_VERSION => ::Rack::VERSION,
+        ::Rack::RACK_URL_SCHEME => 'https',
+        ::Rack::RACK_INPUT => StringIO.new(body || ''),
+        ::Rack::RACK_ERRORS => $stderr,
+        ::Rack::RACK_MULTITHREAD => false,
+        ::Rack::RACK_MULTIPROCESS => false,
+        ::Rack::RACK_RUNONCE => false,
+        LAMBDA_EVENT => event,
+        LAMBDA_CONTEXT => context
+      }.tap do |env|
+        ct = content_type
+        cl = content_length
+        env['CONTENT_TYPE'] = ct if ct
+        env['CONTENT_LENGTH'] = cl if cl
+      end
+    end
+
+    def env_headers
+      super.tap do |hdrs|
+        if cookies.any?
+          hdrs[HTTP_COOKIE] = cookies.join('; ')
+        end
+      end
+    end
+
+    def request_method
+      event.dig('requestContext', 'http', 'method') || event['httpMethod']
+    end
+
+    def cookies
+      event['cookies'] || []
+    end
+
+    # Using custom domain names with v1.0 yields a good `path` parameter sans
+    # stage. However, v2.0 and others do not. So we are just going to remove stage
+    # no matter waht from other places for both.
+    #
+    def path_info
+      stage = event.dig('requestContext', 'stage')
+      spath = event.dig('requestContext', 'http', 'path') || event.dig('requestContext', 'path')
+      spath.sub /\A\/#{stage}/, ''
+    end
+
+    def server_name
+      headers['x-forwarded-host'] ||
+        headers['X-Forwarded-Host'] ||
+        headers['host'] ||
+        headers['Host']
+    end
+
+    def server_port
+      headers['x-forwarded-port'] || headers['X-Forwarded-Port']
+    end
+
+    def server_protocol
+      event.dig('requestContext', 'http', 'protocol') ||
+        event.dig('requestContext', 'protocol') ||
+        'HTTP/1.1'
+    end
+
+
+  end
+end

data/lib/lamby/{rack_api.rb → rack_rest.rb}

@@ -1,8 +1,12 @@
 module Lamby
-  class RackApi < Lamby::Rack
+  class RackRest < Lamby::Rack
 
-    def api?
-      true
+    def response(handler)
+      if handler.base64_encodeable?
+        { isBase64Encoded: true, body: handler.body64 }
+      else
+        super
+      end
     end
 
     private

data/lib/lamby/ssm_parameter_store.rb

@@ -16,12 +16,13 @@ module Lamby
       end
 
       def get!(path)
-        parts = path.from(1).split('/')
+        parts = path[1..-1].split('/')
         env = parts.pop
         path = "/#{parts.join('/')}"
-        new(path).get!.params.detect do |p|
+        param = new(path).get!.params.detect do |p|
           p.env == env
-        end.try(:value)
+        end
+        param&.value
       end
 
     end
@@ -44,7 +45,7 @@ module Lamby
 
     def get!
       get_all!
-      get_history! if label.present?
+      get_history! unless label.to_s.empty?
       self
     end
 
@@ -68,7 +69,7 @@ module Lamby
 
     def dotenv_contents
       params.each_with_object('') do |param, contents|
-        line = "export #{param.env}=#{param.value}\n"
+        line = "#{param.env}=#{param.value}\n"
         contents << line
       end
     end
@@ -98,7 +99,7 @@ module Lamby
         with_decryption: true,
         max_results: MAX_RESULTS
       }.tap { |options|
-        token = @all_response.try(:next_token)
+        token = @all_response&.next_token
         options[:next_token] = token if token
       }
     end
@@ -137,7 +138,7 @@ module Lamby
         with_decryption: true,
         max_results: MAX_RESULTS
       }.tap { |options|
-        token = @hist_response.try(:next_token)
+        token = @hist_response&.next_token
         options[:next_token] = token if token
       }
     end

data/lib/lamby/templates.rake

@@ -1,6 +1,7 @@
 installers = {
-  'API Gateway' => :api_gateway,
-  'Application Load Balancer' => :application_load_balancer
+  'API Gateway (HTTP API)' => :http,
+  'API Gateway (REST API)' => :rest,
+  'Application Load Balancer' => :alb
 }.freeze
 
 namespace :lamby do
@@ -32,5 +33,5 @@ namespace :lamby do
   end
 
   desc "Install Lamby files for #{installers.first.first}"
-  task install: 'install:application_load_balancer'
+  task install: 'install:http'
 end

data/lib/lamby/templates/{application_load_balancer.rb → alb.rb}

@@ -1,4 +1,4 @@
-$LAMBY_INSTALLER_NAME = 'application_load_balancer'
+$LAMBY_INSTALLER_NAME = 'alb'
 load 'lamby/templates/shared.rb'
 
 say '==> Running Lamby Application Load Balancer installer...'
@@ -10,7 +10,7 @@ gsub_file app_file('template.yaml'), /APPNAMEHERE/, appname
 
 say 'Adding to .gitignore...'
 FileUtils.touch app_file('.gitignore')
-append_to_file app_file('.gitignore'), <<-GITIGNORE.strip_heredoc
+append_to_file app_file('.gitignore'), <<~GITIGNORE
   # Lamby
   /.aws-sam
 GITIGNORE