lambdakiq 2.0.2 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc719ae59b3ba58dca3f268f2be9c3fc96f56c2c40eabee791da33da33b50534
-  data.tar.gz: 873a8d6563b4e17dcf52534b2776e166aeb0a18cd4992d3d91139bc60f77a4d9
+  metadata.gz: 84d147fdbb851da5e7e6ebace4cd2eb5a00ae53d3bd0d36981d9cb90c93bac5b
+  data.tar.gz: 534d3f92cde56e7462202ebfd0b828039974d37792ee19d4c30b64ea0e901d61
 SHA512:
-  metadata.gz: b830f98d593b7fd995b946889669b8b7c6bf9c450df752abf6b6d17b4bf674ab393000691c5a92f089a07c73bddf99f6375aac4933a046cafefa55bf01bb2586
-  data.tar.gz: 2cbbd15df392bfc7b3837e22afafd177aaa9db739a0883ac7090772ec028ef05e8c621f575232f9bffe7151dda2789a748096bcadfd6cc8e526b6e30cc712d2a
+  metadata.gz: 6cff69c86fae5f46a63cfbd7ee6290fb8aa472a6dc1377424df1cf8daf17ca96c373a87577c4f50ebaf081d8c9b13421e032f8b71b314cbd4135ec2ca7ca7dfe
+  data.tar.gz: bed7c2407983c15b2ed48ba63362afe7b7a305c7415ec0deb533e25928ea805b8b5c8ad91bbeee4b51a7d3b69008e4854910b9093f392f454fdb78c8e8550db6

data/CHANGELOG.md

@@ -2,6 +2,18 @@
 
 See this http://keepachangelog.com link for information on how we want this documented formatted.
 
+## v2.2.0
+
+### Added
+
+- Simple `Lambdakiq.cmd` to be used with `ImageConfig.Command`. 
+
+## v2.1.0
+
+#### Fixed
+
+- Ensure failed messages go to DLQ. Fixes #30. Fixes #31. Thanks @thenano
+
 ## v2.0.2
 
 #### Fixed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    lambdakiq (2.0.2)
+    lambdakiq (2.2.0)
       activejob
       aws-sdk-sqs
       concurrent-ruby

data/README.md

@@ -56,21 +56,7 @@ ActionMailer::MailDeliveryJob.include Lambdakiq::Worker
 ActionMailer::MailDeliveryJob.queue_as ENV['JOBS_QUEUE_NAME']
 ```
 
-The same Docker image will be used for both your `web` and `jobs` functions (example setup in following sections) which means the same `app.rb` handler would be used. The [Lamby](https://lamby.custominktech.com) gem automatically detects if Lambdakiq is being used so the following handler works as is.
-
-```ruby
-def handler(event:, context:)
-  Lamby.handler $app, event, context
-end
-```
-
-You can use the Lambdakiq handler directly in cases where your handler is a different method. Likewise there is a `Lambdakiq.jobs?(event)` helper function which returns true if the `messageAttributes` has a `lambdakiq` attribute.
-
-```ruby
-def jobs_handler(event:, context:)
-  Lambdakiq.handler(event)
-end
-```
+The same Docker image will be used for both your `web` and `jobs` functions (example setup in following sections). The [Lamby](https://lamby.custominktech.com) gem can automatically can detect if Lambdakiq is present when using the newer `Lamby.cmd` or older lower `Lamby.handler` method. That said, please take a look at the `JobsLambda` in the following section and how `ImageConfig` is used as the golden path for sharing containers.
 
 ### SQS Resources
 
@@ -146,6 +132,8 @@ JobsLambda:
           BatchSize: 1
           FunctionResponseTypes:
             - ReportBatchItemFailures
+    ImageConfig:
+      Command: ["config/environment.Lambdakiq.cmd"]
     MemorySize: 1792
     PackageType: Image
     Policies:
@@ -161,6 +149,7 @@ JobsLambda:
 
 Here are some key aspects of our `JobsLambda` resource above:
 
+- We use the `ImageConfig.Command` to load your Rails env and invoke the `Lambdakiq.cmd` which calls the `Lambdakiq.handler` on your behalf.
 - The `Events` property uses the [SQS Type](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-function-sqs.html).
 - The [BatchSize](https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-function-sqs.html#sam-function-sqs-batchsize) can be any number you like. Less means more Lambda concurrency, more means some jobs could take longer. The jobs function `Timeout` must be lower than the `JobsQueue`'s `VisibilityTimeout` property. When the batch size is one, the queue's visibility is generally one second more.
 - You must use `ReportBatchItemFailures` response types. Lambdakiq assumes we are [reporting batch item failures](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html#services-sqs-batchfailurereporting). This is a new feature of SQS introduced in [November 2021](https://docs.aws.amazon.com/lambda/latest/dg/with-sqs.html#services-sqs-batchfailurereporting).

data/lib/lambdakiq/job.rb

@@ -72,7 +72,11 @@ module Lambdakiq
         @error = e
       else
         instrument :retry_stopped, error: e
-        delete_message
+        if should_redrive?
+          @error = e
+        else
+          delete_message
+        end
       end
     end
 
@@ -97,10 +101,16 @@ module Lambdakiq
       executions > retry_limit
     end
 
+    def job_retry
+      [active_job.lambdakiq_retry, Lambdakiq.config.max_retries, 12].compact.min
+    end
+
     def retry_limit
-      config_retry = [Lambdakiq.config.max_retries, 12].min
-      [ (active_job.lambdakiq_retry || config_retry),
-        (queue.max_receive_count - 1) ].min
+      [job_retry, (queue.max_receive_count - 1)].min
+    end
+
+    def should_redrive?
+      !queue.redrive_policy.nil? && job_retry >= queue.max_receive_count
     end
 
     def fifo_delay?

data/lib/lambdakiq/queue.rb

@@ -22,11 +22,11 @@ module Lambdakiq
     end
 
     def redrive_policy
-      @redrive_policy ||= JSON.parse(attributes['RedrivePolicy'])
+      @redrive_policy ||= attributes['RedrivePolicy'] ? JSON.parse(attributes['RedrivePolicy']) : nil
     end
 
     def max_receive_count
-      redrive_policy['maxReceiveCount'].to_i
+      redrive_policy&.dig('maxReceiveCount')&.to_i || 1
     end
 
     def fifo?

data/lib/lambdakiq/version.rb

@@ -1,3 +1,3 @@
 module Lambdakiq
-  VERSION = '2.0.2'
+  VERSION = '2.2.0'
 end

data/lib/lambdakiq.rb

@@ -20,6 +20,10 @@ require 'lambdakiq/railtie'
 
 module Lambdakiq
 
+  def cmd(event:, context:)
+    handler(event)
+  end
+
   def handler(event)
     Job.handler(event)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lambdakiq
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.2.0
 platform: ruby
 authors:
 - Ken Collins
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-08-02 00:00:00.000000000 Z
+date: 2022-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob