lamby 0.6.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 158acb62cde3cf096b2fa436266c972673610f9ae3a50c453861c68c17fc5354
-  data.tar.gz: 3222b4c37bf6499526edfa9fb7b9bf6368c2792f2ffac2cc58ff5b60dbe9162a
+  metadata.gz: cad37e588b82d16978294d8ae866bdb90f67dbd82f8da8ad04f74c04515043d7
+  data.tar.gz: f2301b796dfcfcd32ea21dd8dee9666257887e28022266a9e662c17f2a5df204
 SHA512:
-  metadata.gz: 06e5cd72373261f7d6197dd85fda6c620d61183a002c80397be5433c61178c7fe632ef1b9264935c799ed5725caa12cf65880343d03cc091ad1feb51322b1613
-  data.tar.gz: 48f2f83253a4a44b8334fa0117400ff9d99d7d976dfd1b3847f4e64cb98a4c985f6d0cb52577447fc6dd99c253214969717a9821805a23336dafbb97a018ca5c
+  metadata.gz: 0062a78076ce56c00ce31ba1813112f4e1341e24fd104df195131f4a5cde00142490d336ceacb91c6431facfaae3dc115feba6e0e9952c81c6e907f3bd32b3c9
+  data.tar.gz: d728410d053304a4b6306972d63e054b1d33b45ca57ca8c9499467902c53990523164661399b1098fbd9b27d9cff1e11518250fee0d03c8bc0130bda6670eda4

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v1.0.0
+
+#### Fixed
+
+* ALB query params & binary responses. Fixes #38.
+
+
 ## v0.6.0
 
 #### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lamby (0.6.0)
+    lamby (1.0.0)
       rack
       rails
 
@@ -87,7 +87,7 @@ GEM
     minitest (5.11.3)
     mocha (1.8.0)
       metaclass (~> 0.0.1)
-    nio4r (2.3.1)
+    nio4r (2.4.0)
     nokogiri (1.10.3)
       mini_portile2 (~> 2.4.0)
     pry (0.12.2)

data/lib/lamby.rb

@@ -4,6 +4,7 @@ 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/debug'

data/lib/lamby/debug.rb

@@ -5,7 +5,7 @@ module Lamby
     extend self
 
     def on?(event)
-      params = event['queryStringParameters']
+      params = event['multiValueQueryStringParameters'] || event['queryStringParameters']
       (Rails.env.development? || ENV['LAMBY_DEBUG']) && params && params['debug'] == '1'
     end
 

data/lib/lamby/handler.rb

@@ -20,7 +20,7 @@ module Lamby
     def response
       { statusCode: status,
         headers: headers,
-        body: body }
+        body: body }.merge(rack_response)
     end
 
     def status
@@ -55,6 +55,10 @@ module Lamby
       end
     end
 
+    def rack_response
+      rack.response(self)
+    end
+
     def call_app
       if Debug.on?(@event)
         Debug.call @event, @context, rack.env

data/lib/lamby/rack.rb

@@ -0,0 +1,85 @@
+module Lamby
+  class Rack
+
+    include SamHelpers
+
+    LAMBDA_EVENT = 'lambda.event'.freeze
+    LAMBDA_CONTEXT = 'lambda.context'.freeze
+    HTTP_X_REQUESTID = 'HTTP_X_REQUEST_ID'.freeze
+
+    attr_reader :event, :context
+
+    def initialize(event, context)
+      @event = event
+      @context = context
+    end
+
+    def env
+      @env ||= env_base.merge!(env_headers)
+    end
+
+    def response(_handler)
+      {}
+    end
+
+    def api?
+      false
+    end
+
+    def alb?
+      false
+    end
+
+    def multi_value?
+      false
+    end
+
+    private
+
+    def env_base
+      raise NotImplementedError
+    end
+
+    def env_headers
+      headers.transform_keys do |key|
+        "HTTP_#{key.to_s.upcase.tr '-', '_'}"
+      end.tap do |hdrs|
+        hdrs[HTTP_X_REQUESTID] = request_id
+      end
+    end
+
+    def content_type
+      headers.delete('Content-Type') || headers.delete('content-type') || headers.delete('CONTENT_TYPE')
+    end
+
+    def content_length
+      bytesize = body.bytesize.to_s if body
+      headers.delete('Content-Length') || headers.delete('content-length') || headers.delete('CONTENT_LENGTH') || bytesize
+    end
+
+    def body
+      @body ||= if event['body'] && base64_encoded?
+        Base64.decode64 event['body']
+      else
+        event['body']
+      end
+    end
+
+    def headers
+      @headers ||= event['headers'] || {}
+    end
+
+    def query_string
+      @query_string ||= event['queryStringParameters'].try(:to_query)
+    end
+
+    def base64_encoded?
+      event['isBase64Encoded']
+    end
+
+    def request_id
+      context.aws_request_id
+    end
+
+  end
+end

data/lib/lamby/rack_alb.rb

@@ -1,21 +1,24 @@
 module Lamby
-  class RackAlb
+  class RackAlb < Lamby::Rack
 
-    include SamHelpers
-
-    LAMBDA_EVENT = 'lambda.event'.freeze
-    LAMBDA_CONTEXT = 'lambda.context'.freeze
-    HTTP_X_REQUESTID = 'HTTP_X_REQUEST_ID'.freeze
-
-    attr_reader :event, :context
+    def alb?
+      true
+    end
 
-    def initialize(event, context)
-      @event = event
-      @context = context
+    def multi_value?
+      event.key? 'multiValueHeaders'
     end
 
-    def env
-      @env ||= env_base.merge!(env_headers)
+    def response(handler)
+      hhdrs = handler.headers
+      multivalue_headers = hhdrs.transform_values { |v| Array.wrap(v) } 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
+      { multiValueHeaders: multivalue_headers,
+        statusDescription: status_description,
+        isBase64Encoded: base64_encode,
+        body: body }.compact
     end
 
     private
@@ -45,45 +48,25 @@ module Lamby
       end
     end
 
-    def env_headers
-      headers.transform_keys do |key|
-        "HTTP_#{key.to_s.upcase.tr '-', '_'}"
-      end.tap do |hdrs|
-        hdrs[HTTP_X_REQUESTID] = request_id
-      end
-    end
-
-    def content_type
-      headers.delete('Content-Type') || headers.delete('content-type') || headers.delete('CONTENT_TYPE')
-    end
-
-    def content_length
-      bytesize = body.bytesize.to_s if body
-      headers.delete('Content-Length') || headers.delete('content-length') || headers.delete('CONTENT_LENGTH') || bytesize
+    def headers
+      @headers ||= multi_value? ? headers_multi : super
     end
 
-    def body
-      @body ||= if event['body'] && base64_encoded?
-        Base64.decode64 event['body']
-      else
-        event['body']
+    def headers_multi
+      (event['multiValueHeaders'] || {}).transform_values do |v|
+        v.is_a?(Array) ? v.first : v
       end
     end
 
-    def headers
-      event['headers'] || {}
-    end
-
     def query_string
-      @query_string ||= event['queryStringParameters'].try(:to_query)
-    end
-
-    def base64_encoded?
-      event['isBase64Encoded']
+      @query_string ||= multi_value? ? query_string_multi : super
     end
 
-    def request_id
-      context.aws_request_id
+    def query_string_multi
+      query = event['multiValueQueryStringParameters'] || {}
+      string = query.map do |key, value|
+        value.map{ |v| "#{key}=#{v}" }.join('&')
+      end.flatten.join('&')
     end
 
   end

data/lib/lamby/rack_api.rb

@@ -1,21 +1,8 @@
 module Lamby
-  class RackApi
+  class RackApi < Lamby::Rack
 
-    include SamHelpers
-
-    LAMBDA_EVENT = 'lambda.event'.freeze
-    LAMBDA_CONTEXT = 'lambda.context'.freeze
-    HTTP_X_REQUESTID = 'HTTP_X_REQUEST_ID'.freeze
-
-    attr_reader :event, :context
-
-    def initialize(event, context)
-      @event = event
-      @context = context
-    end
-
-    def env
-      @env ||= env_base.merge!(env_headers)
+    def api?
+      true
     end
 
     private
@@ -27,7 +14,7 @@ module Lamby
         ::Rack::QUERY_STRING => query_string,
         ::Rack::SERVER_NAME => headers['Host'],
         ::Rack::SERVER_PORT => headers['X-Forwarded-Port'],
-        ::Rack::SERVER_PROTOCOL => server_protocol,
+        ::Rack::SERVER_PROTOCOL => event.dig('requestContext', 'protocol') || 'HTTP/1.1',
         ::Rack::RACK_VERSION => ::Rack::VERSION,
         ::Rack::RACK_URL_SCHEME => 'https',
         ::Rack::RACK_INPUT => StringIO.new(body || ''),
@@ -45,50 +32,5 @@ module Lamby
       end
     end
 
-    def env_headers
-      headers.transform_keys do |key|
-        "HTTP_#{key.to_s.upcase.tr '-', '_'}"
-      end.tap do |hdrs|
-        hdrs[HTTP_X_REQUESTID] = request_id
-      end
-    end
-
-    def content_type
-      headers.delete('Content-Type') || headers.delete('content-type') || headers.delete('CONTENT_TYPE')
-    end
-
-    def content_length
-      bytesize = body.bytesize.to_s if body
-      headers.delete('Content-Length') || headers.delete('content-length') || headers.delete('CONTENT_LENGTH') || bytesize
-    end
-
-    def body
-      @body ||= if event['body'] && base64_encoded?
-        Base64.decode64 event['body']
-      else
-        event['body']
-      end
-    end
-
-    def headers
-      event['headers'] || {}
-    end
-
-    def query_string
-      @query_string ||= event['queryStringParameters'].try(:to_query)
-    end
-
-    def base64_encoded?
-      event['isBase64Encoded']
-    end
-
-    def server_protocol
-      event.dig('requestContext', 'protocol') || 'HTTP/1.1'
-    end
-
-    def request_id
-      context.aws_request_id
-    end
-
   end
 end

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

@@ -31,6 +31,9 @@ Resources:
     DependsOn: RailsFunctionInvokePermission
     Properties:
       TargetType: lambda
+      TargetGroupAttributes:
+        - Key: lambda.multi_value_headers.enabled
+          Value: true
       Targets:
         - Id: !GetAtt RailsFunction.Arn
 
@@ -79,7 +82,8 @@ Resources:
 Outputs:
 
   RailsLoadBalancerDNSNAme:
-      Value: !GetAtt RailsLoadBalancer.DNSName
+    Description: Application Load Balancer DNS Name
+    Value: !GetAtt RailsLoadBalancer.DNSName
 
   RailsFunctionArn:
     Description: Lambda ARN

data/lib/lamby/version.rb

@@ -1,3 +1,3 @@
 module Lamby
-  VERSION = '0.6.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-29 00:00:00.000000000 Z
+date: 2019-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -167,6 +167,7 @@ files:
 - lib/lamby/debug.rb
 - lib/lamby/handler.rb
 - lib/lamby/logger.rb
+- lib/lamby/rack.rb
 - lib/lamby/rack_alb.rb
 - lib/lamby/rack_api.rb
 - lib/lamby/railtie.rb