lamby 3.0.3 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f07a6126778a111a18346115f2084c62e44e4911317f7dca5c5facd7f7939dc
-  data.tar.gz: e5490dcec93e2994f1334164bcde3b27b90d486879cf8e222a9ec4697df881d5
+  metadata.gz: 40152d0ab40a6a6082853a1824fa716eb8b74e2289469a271f66681ac23e153a
+  data.tar.gz: 1c4af9ff9a7d556a2335f6326dfdb4a65047357e274c7adfae45a151d7ef43c0
 SHA512:
-  metadata.gz: 43c26ff51d13c5451f1e2db53f501f8ea8622894b93d6755fcca20a7cca037f65b23dc8bba19f7b85f34785a87b627090f394ac621d71ee57d6dbca9f79962ca
-  data.tar.gz: 03f578c7b381bd91ff52ecca6ce17f65523a899c8333372cd6c32f937f23cafc12acb841de153c4eabc755c4babbd53aa09e832aa957698141401bcc39d4aaa3
+  metadata.gz: 58000ce78c01aa5bc1c2c80bcac05571d2e8ca01926d7e37c6b7000564677c594ec2391dea314a88337f4f2c98009f2fa55e06f0b07628032b40ecd4522e6320
+  data.tar.gz: a26fb1d84a283caa0bcc2d46e8ec9344bed9314dee2bbe91691307b096f621fa9ae4c48b6500d628e3bdae8ac30445499cbb92fc1cd6369915b85603d8784e9b

data/CHANGELOG.md

@@ -4,6 +4,24 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v3.1.2
+
+#### Fixed
+
+- Lambdakiq Handler Integration. Fixes #120.
+
+## v3.1.1
+
+#### Fixed
+
+- X-Request-Start header value for New Relic with API Gateway.
+
+## v3.1.0
+
+#### Added
+
+- Add X-Request-Start header for New Relic with API Gateway.
+
 ## v3.0.3
 
 #### Fixed

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM lambci/lambda:build-ruby2.7
+FROM public.ecr.aws/sam/build-ruby2.7:1.26.0
 
 # Asset Pipeline
 RUN curl -sL https://rpm.nodesource.com/setup_12.x | bash - && \

data/Gemfile

@@ -5,5 +5,5 @@ gemspec
 gem 'rails'
 
 group :test do
-  gem 'lambdakiq', require: false
-end
+  gem 'lambdakiq'
+end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lamby (3.0.3)
+    lamby (3.1.2)
       rack
 
 GEM
@@ -66,37 +66,37 @@ GEM
       minitest (>= 5.1)
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
-    aws-eventstream (1.1.1)
-    aws-partitions (1.446.0)
-    aws-sdk-core (3.114.0)
+    aws-eventstream (1.2.0)
+    aws-partitions (1.570.0)
+    aws-sdk-core (3.130.0)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-sqs (1.38.0)
-      aws-sdk-core (~> 3, >= 3.112.0)
+    aws-sdk-sqs (1.51.0)
+      aws-sdk-core (~> 3, >= 3.127.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.2.3)
+    aws-sigv4 (1.4.0)
       aws-eventstream (~> 1, >= 1.0.2)
     builder (3.2.4)
     coderay (1.1.3)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.10)
     crass (1.0.6)
     erubi (1.10.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
-    i18n (1.8.10)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
-    lambdakiq (1.0.1)
+    jmespath (1.6.1)
+    lambdakiq (2.0.0)
       activejob
       aws-sdk-sqs
       concurrent-ruby
       railties
-    loofah (2.9.1)
+    loofah (2.15.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -104,19 +104,21 @@ GEM
     marcel (1.0.1)
     method_source (1.0.0)
     mini_mime (1.0.3)
-    mini_portile2 (2.5.0)
-    minitest (5.14.4)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
     minitest-focus (1.2.1)
       minitest (>= 4, < 6)
     mocha (1.12.0)
     nio4r (2.5.7)
-    nokogiri (1.11.3)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.13.3-x86_64-linux)
       racc (~> 1.4)
     pry (0.14.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
@@ -138,7 +140,7 @@ GEM
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.3.0)
+    rails-html-sanitizer (1.4.2)
       loofah (~> 2.3)
     railties (6.1.3.1)
       actionpack (= 6.1.3.1)
@@ -146,7 +148,7 @@ GEM
       method_source
       rake (>= 0.8.7)
       thor (~> 1.0)
-    rake (13.0.3)
+    rake (13.0.6)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -154,16 +156,17 @@ GEM
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   ruby
+  x86_64-linux
 
 DEPENDENCIES
   aws-sdk-ssm
@@ -178,4 +181,4 @@ DEPENDENCIES
   rake
 
 BUNDLED WITH
-   2.2.15
+   2.2.22

data/bin/_setup

@@ -2,5 +2,6 @@
 set -e
 
 echo '== Installing dependencies =='
+bundle lock --add-platform x86_64-linux
 bundle config set --local path 'vendor/bundle'
 bundle install

data/bin/bootstrap

@@ -2,5 +2,4 @@
 set -e
 
 echo '== Building containers =='
-docker pull lambci/lambda:build-ruby2.7
 docker-compose build

data/docker-compose.yml

@@ -3,6 +3,7 @@ services:
   cicd:
     build: .
     environment:
+      - AWS_REGION=${AWS_REGION-us-east-1}
       - AWS_PROFILE=${AWS_PROFILE-default}
       - RAILS_ENV=${RAILS_ENV-test}
       - AWS_DEFAULT_REGION=${AWS_DEFAULT_REGION-us-east-1}

data/lib/lamby/handler.rb

@@ -14,13 +14,10 @@ module Lamby
       @event = event
       @context = context
       @options = options
-      @called = false
     end
 
     def response
-      { statusCode: status,
-        headers: headers,
-        body: body }.merge(rack_response)
+      @response
     end
 
     def status
@@ -46,10 +43,7 @@ module Lamby
     end
 
     def call
-      return self if @called
-      @status, @headers, @body = call_app
-      set_cookies if rack?
-      @called = true
+      @response ||= call_app
       self
     end
 
@@ -82,21 +76,25 @@ module Lamby
     end
 
     def rack_response
-      rack? ? rack.response(self) : {}
+      { statusCode: status,
+        headers: headers,
+        body: body }.merge(rack.response(self))
     end
 
     def call_app
       if Debug.on?(@event)
         Debug.call @event, @context, rack.env
       elsif rack?
-        @app.call rack.env
+        @status, @headers, @body = @app.call rack.env 
+        set_cookies
+        rack_response
       elsif runner?
-        Runner.call(@event)
+        @status, @headers, @body = Runner.call(@event)
+        { statusCode: status, headers: headers, body: body }
       elsif lambdakiq?
         Lambdakiq.handler(@event)
       elsif event_bridge?
         Lamby.config.event_bridge_handler.call @event, @context
-        [200, {}, StringIO.new('')]
       else
         [404, {}, StringIO.new('')]
       end

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_X_REQUEST_START = 'HTTP_X_REQUEST_START'.freeze
     HTTP_COOKIE = 'HTTP_COOKIE'.freeze
     
     class << self
@@ -54,6 +55,7 @@ module Lamby
         "HTTP_#{key.to_s.upcase.tr '-', '_'}"
       end.tap do |hdrs|
         hdrs[HTTP_X_REQUESTID] = request_id
+        hdrs[HTTP_X_REQUEST_START] = "t=#{request_start}" if request_start
       end
     end
 
@@ -109,5 +111,10 @@ module Lamby
       context.aws_request_id
     end
 
+    def request_start
+      event.dig('requestContext', 'timeEpoch') || 
+        event.dig('requestContext', 'requestTimeEpoch')
+    end
+
   end
 end

data/lib/lamby/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lamby
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.2
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2022-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack