funktor 0.2.2 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38d383dcdafdb71a93c3ab881ec7772e8694fe0a8ca913a11a27ab634b068349
-  data.tar.gz: 92e17fab7ca35700c1721dbd9f674d14a1dd8a033486ed1af9d65236cad305cc
+  metadata.gz: 0fee608bd2e1c3272dbfb578144c618d1fc9b21a87cb92a180d24476b93f5805
+  data.tar.gz: 641e22473435c8a01a1253891117183278d1af33b0aa0e640e19e5eed0496bec
 SHA512:
-  metadata.gz: 1643f95d5f02f83272c2304e6c22cda5c91bb39f4f109cd4d363d9b667294679dbfa4634962162193dd9c2ea90da57f21048a41d2b5710a80f19c91631136f8d
-  data.tar.gz: 559c5693bf8a958b22e0b6b189f72ca43d758701498ccb85c52c3cf3a9e7c2b148d26d17efdea72089328e393c1ad671b3d03b6f8dcee1ac39498fc6cf6f7535
+  metadata.gz: 6395cef9f105bfd8772c815abfba51611e45894e9733ed67f733a7e2c08d1c7969abaf04956ff0aa1e8a9c9d345f7c2c59e7f8bb3e6f5e98d2e9442a16895958
+  data.tar.gz: 0b29706049f47b3159b559529c535abcdca384cc2a9a3a4ad4af1fac0138eab957f799a94731fa7a097dcdae8ea45be920952a24d627133e5433f1620bf468b1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.2.2)
+    funktor (0.2.7)
       activesupport
       aws-sdk-sqs (~> 1.37)
       thor
@@ -9,7 +9,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.3.2)
+    activesupport (6.1.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -18,8 +18,8 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.1.1)
-    aws-partitions (1.465.0)
-    aws-sdk-core (3.114.1)
+    aws-partitions (1.471.0)
+    aws-sdk-core (3.115.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
@@ -29,7 +29,7 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
-    concurrent-ruby (1.1.8)
+    concurrent-ruby (1.1.9)
     crack (0.4.5)
       rexml
     diff-lcs (1.4.4)

data/lib/funktor/cli/init.rb

@@ -15,7 +15,7 @@ module Funktor
 
       class_option :file, :aliases => "-f",
         :type => :string, :desc => "The funktor init file.",
-        :default => "funktor.yml"
+        :default => "funktor_init.yml"
 
       desc <<~DESC
         Description:
@@ -30,16 +30,13 @@ module Funktor
         name
       end
 
-      def serverless_yml
-        template "serverless.yml", File.join("serverless.yml")
-      end
-
       def funktor_config_yml
         #template "funktor_config.yml", File.join("funktor_config.yml")
         template File.join("config", "funktor.yml"), File.join("config", "funktor.yml")
         template File.join("config", "ruby_layer.yml"), File.join("config", "ruby_layer.yml")
         template File.join("config", "package.yml"), File.join("config", "package.yml")
         template File.join("config", "environment.yml"), File.join("config", "environment.yml")
+        template File.join("config", "boot.rb"), File.join("config", "boot.rb")
       end
 
       def package_json
@@ -54,6 +51,10 @@ module Funktor
         template "gitignore", File.join(".gitignore")
       end
 
+      def workers
+        template File.join("app", "workers", "hello_worker.rb"), File.join("app", "workers", "hello_worker.rb")
+      end
+
       def resources
         template File.join("config", "resources", "incoming_job_queue.yml"), File.join("config", "resources", "incoming_job_queue.yml")
         template File.join("config", "resources", "incoming_job_queue_user.yml"), File.join("config", "resources", "incoming_job_queue_user.yml")
@@ -86,19 +87,42 @@ module Funktor
       end
 
       def lambda_handlers
-        template File.join("app", "handlers", "incoming_job_handler.rb"), File.join("app", "handlers", "incoming_job_handler.rb")
+        template File.join("lambda_event_handlers", "incoming_job_handler.rb"), File.join("lambda_event_handlers", "incoming_job_handler.rb")
         queues.each do |queue_details|
           @work_queue_name = queue_details.keys.first
           @work_queue_config = queue_details.values.first
-          template File.join("app", "handlers", "work_queue_handler.rb"), File.join("app", "handlers", "#{work_queue_name.underscore}_queue_handler.rb")
+          template File.join("lambda_event_handlers", "work_queue_handler.rb"), File.join("lambda_event_handlers", "#{work_queue_name.underscore}_queue_handler.rb")
         end
       end
 
-      def workers
-        template File.join("app", "workers", "hello_worker.rb"), File.join("app", "workers", "hello_worker.rb")
+      def serverless_yml
+        template "serverless.yml", File.join("serverless.yml")
       end
 
       private
+
+      def app_worker_names
+        app_worker_files.map do |file|
+          File.basename(file, ".rb").camelize
+        end
+      end
+
+      def app_worker_files
+        Dir.glob(File.join('app', 'workers', '**.rb'))
+      end
+
+      def all_iam_permissions
+        Dir.glob(File.join('config', 'iam_permissions', '**.yml'))
+      end
+
+      def all_function_definitions
+        Dir.glob(File.join('config', 'function_definitions', '**.yml'))
+      end
+
+      def all_resources
+        Dir.glob(File.join('config', 'resources', '**.yml'))
+      end
+
       def funktor_config
         @funktor_config ||= YAML.load_file options[:file]
       end
@@ -107,6 +131,10 @@ module Funktor
         funktor_config["appName"]
       end
 
+      def app_name
+        funktor_config["appName"]
+      end
+
       def runtime
         funktor_config["runtime"]
       end
@@ -127,6 +155,28 @@ module Funktor
         @work_queue_config
       end
 
+      def queue_config(queue_name)
+        funktor_config["queues"].each do |queue_details|
+          if queue_details.keys.first == queue_name
+            return queue_details.values.first
+          end
+        end
+        return nil
+      end
+
+      def incoming_config_value(config_name)
+        funktor_config.dig("incomingJobHandler", config_name) ||
+          funktor_config.dig("handlerDefaults", config_name) ||
+          "null" # When we parse yaml 'null' gets turned to nil, which comes out as an empty string in the template
+      end
+
+      def queue_config_value(queue_name, config_name)
+        queue_config(queue_name)&.dig(config_name) ||
+          funktor_config.dig("handlerDefaults", config_name) ||
+          "null" # When we parse yaml 'null' gets turned to nil, which comes out as an empty string in the template
+
+      end
+
     end
   end
 end

data/lib/funktor/cli/templates/Gemfile

@@ -3,7 +3,5 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
 ruby '~> 2.7'
 
-source "https://gem.fury.io/jagthedrummer/" do
-  gem 'funktor'
-end
+gem 'funktor'
 

data/lib/funktor/cli/templates/config/boot.rb

@@ -0,0 +1,16 @@
+# Point at our Gemfile
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
+
+# load rubygems & bundler
+require "rubygems"
+require 'bundler/setup'
+
+# Set up gems listed in the Gemfile.
+Bundler.require(:default, :production)
+
+# Load all ruby files in the app directory
+Dir.glob( File.join('..', 'app', '**', '*.rb'), base: File.dirname(__FILE__) ).each do |ruby_file|
+  puts "require_relative #{ruby_file}"
+  require_relative ruby_file
+end
+

data/lib/funktor/cli/templates/config/function_definitions/incoming_job_handler.yml

@@ -1,4 +1,4 @@
-handler: app/handlers/incoming_job_handler.call
+handler: lambda_event_handlers/incoming_job_handler.call
 timeout: ${self:custom.funktor.incomingJobHandler.timeout, 30}
 reservedConcurrency: ${self:custom.funktor.incomingJobHandler.reservedConcurrency, null}
 provisionedConcurrency: ${self:custom.funktor.incomingJobHandler.provisionedConcurrency, null}

data/lib/funktor/cli/templates/config/function_definitions/work_queue_handler.yml

@@ -1,4 +1,4 @@
-handler: app/handlers/<%= work_queue_name.underscore %>_queue_handler.call
+handler: lambda_event_handlers/<%= work_queue_name.underscore %>_queue_handler.call
 timeout: ${self:custom.funktor.<%= work_queue_name.camelize %>QueueHandler.timeout, 900}
 reservedConcurrency: ${self:custom.funktor.<%= work_queue_name.camelize %>QueueHandler.reservedConcurrency, null}
 provisionedConcurrency: ${self:custom.funktor.<%= work_queue_name.camelize %>QueueHandler.provisionedConcurrency, null}

data/lib/funktor/cli/templates/config/funktor.yml

@@ -3,19 +3,23 @@ incomingJobHandler:
   # to a handler at one time, so you'll want this to be at least 10x the maximum time you
   # expect to spend for one message. The incoming job handler usually will be pretty fast,
   # but we default to a high number here to allow for the times when things go weird.
-  timeout: 300
+  timeout: <%= incoming_config_value 'timeout' %>
   # reservedConcurrency represents the maximum number of concurrent executions.
   # For the incoming job handler you probably don't want to limit it because you
   # want to get things onto work queues as quickly as possible.
-  reservedConcurrency: null
+  reservedConcurrency: <%= incoming_config_value 'reservedConcurrency' %>
   # provisionedConcurrency represents the number of lambda functions that will always
   # be available. For the incoming jobs handler you probably don't need to set this
   # unless your jobs are very bursty AND very time sensitive.
-  provisionedConcurrency: null
+  provisionedConcurrency: <%= incoming_config_value 'provisionedConcurrency' %>
   # Use memory_size to adjust the reousrces (both memory and CPU) available.
   # For the incoming jobs handler you probably don't need this to be too large,
   # but if you're seeing large delays at this stage it might help to bump it up.
-  memorySize: 256
+  memorySize: <%= incoming_config_value 'memorySize' %>
+  batchSize: <%= incoming_config_value 'batchSize' %>
+  maximumBatchingWindow: <%= incoming_config_value 'maximumBatchingWindow' %>
+  visibilityTimeout: <%= incoming_config_value 'visibilityTimeout' %>
+  logRetentionInDays: <%= incoming_config_value 'logRetentionInDays' %>
 
 <%- queue_names.each do |queue_name| -%>
 <%= queue_name.camelize %>QueueHandler:
@@ -23,23 +27,26 @@ incomingJobHandler:
   # to a handler at one time, so you'll want this to be at least 10x the maximum time you
   # expect to spend for one message. The active job handler may be slow if your jobs are
   # doing a lot of work, so we default to the maximum here.
-  timeout: 300 # TODO pull this (and other values) from funktor_init.yml
+  timeout: <%= queue_config_value queue_name, 'timeout' %>
   # reservedConcurrency represents the maximum number of concurrent executions.
   # For the active job handler you may want to limit it if you have resource limitations
   # like database connections that you need to avoid exhausting.
-  reservedConcurrency: null
+  reservedConcurrency: <%= queue_config_value queue_name, 'reservedConcurrency' %>
   # provisionedConcurrency represents the number of lambda functions that will always
   # be available. For the active job handler you probably don't need to set this
   # unless your jobs are very bursty AND very time sensitive.
-  provisionedConcurrency: null
+  provisionedConcurrency: <%= queue_config_value queue_name, 'provisionedConcurrency' %>
   # Use memory_size to adjust the reousrces (both memory and CPU) available.
   # For the active jobs handler you'll want this to be at least as large as the memory
   # required to actually do your jobs. You can choose an even higher number to increase
   # the available CPU to make the jobs run faster.
-  memorySize: 256
-<%- end -%>
-
+  memorySize: <%= queue_config_value queue_name, 'memorySize' %>
+  batchSize: <%= queue_config_value queue_name, 'batchSize' %>
+  maximumBatchingWindow: <%= queue_config_value queue_name, 'maximumBatchingWindow' %>
+  visibilityTimeout: <%= queue_config_value queue_name, 'visibilityTimeout' %>
+  logRetentionInDays: <%= queue_config_value queue_name, 'logRetentionInDays' %>
 
+<%- end -%>
 
 
 # You shouldn't need to mess with these under most circumstances. But you could if you want to change
@@ -51,6 +58,7 @@ dashboardName: ${self:service}-${self:custom.stage}-dashboard
 <%- queue_names.each do |queue_name| -%>
 <%= queue_name.camelize %>QueueName: ${self:service}-${self:custom.stage}-<%= queue_name.underscore.dasherize %>
 <%= queue_name.camelize %>DeadJobQueueName: ${self:service}-${self:custom.stage}-<%= queue_name.underscore.dasherize %>-dead
+<%= queue_name.camelize %>QueueHandlerName: ${self:service}-${self:custom.stage}-<%= queue_name.camelize %>QueueHandler
 <%- end -%>
 
 

data/lib/funktor/cli/templates/config/package.yml

@@ -3,6 +3,7 @@ individually: false
 include:
   - Gemfile
   - Gemfile.lock
+  - config/boot.rb
   - app/**
 # Evertyting is excluded by default with serverless-ruby-layer, but you could use
 # the lines below to exlude files that are inside an include path.

data/lib/funktor/cli/templates/config/resources/cloudwatch_dashboard.yml

@@ -6,123 +6,82 @@ Resources:
       DashboardBody: >
         {
             "widgets": [
-                {
-                    "height": 6,
-                    "width": 9,
-                    "y": 3,
+
+                { <% "Incoming Jobs" %>
+                    "height": 3,
+                    "width": 6,
+                    "y": 0,
                     "x": 0,
-                    "type": "metric",
+                    "type": "text",
                     "properties": {
-                        "metrics": [
-                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName", "${self:custom.funktor.incomingJobQueueName}", { "label": "Received" } ],
-                            [ ".", "NumberOfMessagesDeleted", ".", ".", { "label": "Handled" } ],
-                            [ "AWS/Lambda", "Invocations", "FunctionName", "${self:service}-${self:provider.stage}-incoming_job_handler", "Resource", "${self:service}-${self:provider.stage}-incoming_job_handler", { "label": "Handler Invocations" } ],
-                            [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${self:custom.funktor.incomingJobQueueName}", { "label": "Pending?" } ],
-                            [ ".", "ApproximateNumberOfMessagesNotVisible", ".", ".", { "label": "Backlog?" } ],
-                            [ ".", "NumberOfMessagesSent", ".", ".", { "label": "Sent" } ],
-                            [ ".", "ApproximateNumberOfMessagesDelayed", ".", ".", { "label": "Delayed" } ]
-                        ],
-                        "view": "timeSeries",
-                        "stacked": false,
-                        "region": "us-east-1",
-                        "title": "Incoming Job Queue (Async & scheduled jobs land here first)",
-                        "period": 60,
-                        "stat": "Sum",
-                        "setPeriodToTimeRange": true,
-                        "liveData": true
+                        "markdown": "\n# Incoming Jobs\n"
                     }
                 },
-                {
-                    "height": 6,
-                    "width": 9,
-                    "y": 12,
-                    "x": 0,
+                { <% "Incoming Job Queue Messages per minute" %>
+                    "height": 3,
+                    "width": 3,
+                    "y": 0,
+                    "x": 6,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName", "${self:custom.funktor.DefaultQueueName}", { "label": "Received" } ],
-                            [ ".", "NumberOfMessagesDeleted", ".", ".", { "label": "Handled" } ],
-                            [ "AWS/Lambda", "Invocations", "FunctionName", "${self:service}-${self:provider.stage}-DefaultQueueHandler", "Resource", "${self:service}-${self:provider.stage}-DefaultQueueHandler", { "label": "Handler Invocations" } ],
-                            [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${self:custom.funktor.DefaultQueueName}", { "label": "Pending?" } ],
-                            [ ".", "ApproximateNumberOfMessagesNotVisible", ".", ".", { "label": "Backlog?" } ],
-                            [ ".", "NumberOfMessagesSent", ".", ".", { "label": "Sent" } ],
-                            [ ".", "ApproximateNumberOfMessagesDelayed", ".", ".", { "label": "Delayed" } ]
+                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName", "${self:custom.funktor.incomingJobQueueName}", { "label": "Messages Per Minute" } ]
                         ],
-                        "view": "timeSeries",
-                        "stacked": false,
+                        "view": "singleValue",
                         "region": "us-east-1",
-                        "title": "Active Job Queue (Async jobs go here immediately, scheduled jobs land here in the minute before they're scheduled)",
-                        "period": 60,
                         "stat": "Sum",
-                        "liveData": true
+                        "period": 60,
+                        "title": "Messages Per Minute"
                     }
                 },
-                {
+                { <% "Incoming Job Handler Duration" %>
                     "height": 3,
-                    "width": 9,
-                    "y": 30,
-                    "x": 0,
+                    "width": 15,
+                    "y": 0,
+                    "x": 9,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ { "expression": "m2/PERIOD(m2)", "label": "Consumed Read Capacity Units", "id": "e1", "stat": "Sum", "region": "us-east-1" } ],
-                            [ "AWS/DynamoDB", "ConsumedReadCapacityUnits", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", { "id": "m2", "visible": false } ],
-                            [ ".", "ConsumedWriteCapacityUnits", ".", ".", { "yAxis": "left", "id": "m4", "visible": false } ],
-                            [ ".", "WriteThrottleEvents", ".", ".", { "yAxis": "right", "id": "m5", "visible": false } ]
+                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-incoming_job_handler", "Resource", "${self:service}-${self:provider.stage}-incoming_job_handler", { "label": "p10" } ],
+                            [ "...", { "label": "p50", "stat": "p50" } ],
+                            [ "...", { "label": "p99", "stat": "p99" } ],
+                            [ "...", { "label": "Average", "stat": "Average" } ]
                         ],
-                        "view": "timeSeries",
-                        "stacked": false,
+                        "view": "singleValue",
                         "region": "us-east-1",
-                        "title": "Scheduled Job Table Read Capacity Units",
+                        "stat": "p10",
                         "period": 60,
-                        "stat": "Sum",
-                        "liveData": true
+                        "title": "Handler Duration"
                     }
                 },
-                {
-                    "height": 3,
-                    "width": 18,
-                    "y": 33,
+
+                { <% "Incoming Job Queue (Async & scheduled jobs land here first)" %>
+                    "height": 6,
+                    "width": 9,
+                    "y": 3,
                     "x": 0,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "AWS/DynamoDB", "SuccessfulRequestLatency", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", "Operation", "PutItem", { "yAxis": "left" } ],
-                            [ "...", "Query" ],
-                            [ ".", "ThrottledRequests", ".", ".", ".", "PutItem", { "yAxis": "right", "visible": false } ],
-                            [ ".", "SuccessfulRequestLatency", ".", ".", ".", "DeleteItem" ],
-                            [ ".", "ThrottledRequests", ".", ".", ".", ".", { "yAxis": "right", "visible": false } ]
+                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName", "${self:custom.funktor.incomingJobQueueName}", { "label": "Received" } ],
+                            [ ".", "NumberOfMessagesDeleted", ".", ".", { "label": "Handled" } ],
+                            [ "AWS/Lambda", "Invocations", "FunctionName", "${self:service}-${self:provider.stage}-incoming_job_handler", "Resource", "${self:service}-${self:provider.stage}-incoming_job_handler", { "label": "Handler Invocations" } ],
+                            [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName", "${self:custom.funktor.incomingJobQueueName}", { "label": "Pending?" } ],
+                            [ ".", "ApproximateNumberOfMessagesNotVisible", ".", ".", { "label": "Backlog?" } ],
+                            [ ".", "NumberOfMessagesSent", ".", ".", { "label": "Sent" } ],
+                            [ ".", "ApproximateNumberOfMessagesDelayed", ".", ".", { "label": "Delayed" } ]
                         ],
                         "view": "timeSeries",
                         "stacked": false,
                         "region": "us-east-1",
-                        "stat": "Average",
+                        "title": "Incoming Job Queue (Async & scheduled jobs land here first)",
                         "period": 60,
-                        "title": "Scheduled Job Table Latency",
-                        "liveData": true
-                    }
-                },
-                {
-                    "height": 3,
-                    "width": 6,
-                    "y": 33,
-                    "x": 18,
-                    "type": "metric",
-                    "properties": {
-                        "metrics": [
-                            [ "AWS/DynamoDB", "ThrottledRequests", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", "Operation", "DeleteItem" ],
-                            [ "...", "PutItem" ]
-                        ],
-                        "view": "timeSeries",
-                        "stacked": false,
-                        "region": "us-east-1",
                         "stat": "Sum",
-                        "period": 60,
-                        "title": "Scheduled Job Table Throttled Operations",
+                        "setPeriodToTimeRange": true,
                         "liveData": true
                     }
                 },
-                {
+                { <% "Incoming Job Handler Duration in Milliseconds" %>
                     "height": 6,
                     "width": 9,
                     "y": 3,
@@ -142,7 +101,7 @@ Resources:
                         "liveData": true
                     }
                 },
-                {
+                { <% "Incoming Job Handler Error count and success rate (%)" %>
                     "height": 3,
                     "width": 6,
                     "y": 3,
@@ -167,7 +126,9 @@ Resources:
                         "liveData": true
                     }
                 },
-                {
+
+
+                { <% "Incoming Job Handler Concurrent Executions" %>
                     "height": 3,
                     "width": 6,
                     "y": 6,
@@ -185,104 +146,127 @@ Resources:
                         "liveData": true
                     }
                 },
-                {
-                    "height": 6,
-                    "width": 9,
-                    "y": 12,
-                    "x": 9,
+
+
+
+                <% current_y = 9 %>
+                <%- queue_names.each do |queue_name| -%>
+                { <% "Active Jobs" %>
+                    "height": 3,
+                    "width": 6,
+                    "y": <%= current_y %>,
+                    "x": 0,
+                    "type": "text",
+                    "properties": {
+                        "markdown": "\n# <%= queue_name.camelize %> Queue\n"
+                    }
+                },
+                { <% "Active Jobs messages per minut" %>
+                    "height": 3,
+                    "width": 3,
+                    "y": <%= current_y %>,
+                    "x": 6,
                     "type": "metric",
                     "properties": {
-                        "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-active_job_handler", { "stat": "Minimum" } ],
-                            [ "...", { "stat": "Average" } ],
-                            [ "...", { "stat": "Maximum" } ]
+                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueName}", { "label": "Messages Per Minute" } ]
                         ],
+                        "view": "singleValue",
                         "region": "us-east-1",
-                        "title": "Active Job Handler Duration in Milliseconds",
-                        "view": "timeSeries",
-                        "stacked": false,
-                        "liveData": true
+                        "stat": "Sum",
+                        "period": 60,
+                        "title": "Messages Per Minute"
                     }
                 },
-                {
+                { <% "Active Job Handler Duration" %>
                     "height": 3,
-                    "width": 6,
-                    "y": 12,
-                    "x": 18,
+                    "width": 15,
+                    "y": <%= current_y %>,
+                    "x": 9,
                     "type": "metric",
                     "properties": {
-                        "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "Errors", "FunctionName", "${self:service}-${self:provider.stage}-active_job_handler", { "id": "errors", "stat": "Sum", "color": "#d13212" } ],
-                            [ ".", "Invocations", ".", ".", { "id": "invocations", "stat": "Sum", "visible": false } ],
-                            [ { "expression": "100 - 100 * errors / MAX([errors, invocations])", "label": "Success rate (%)", "id": "availability", "yAxis": "right", "region": "us-east-1" } ]
+                            [ "AWS/Lambda", "Duration", "FunctionName",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueHandlerName}", "Resource",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueHandlerName}", { "label": "p10" } ],
+                            [ "...", { "label": "p50", "stat": "p50" } ],
+                            [ "...", { "label": "p99", "stat": "p99" } ],
+                            [ "...", { "label": "Average", "stat": "Average" } ]
                         ],
+                        "view": "singleValue",
                         "region": "us-east-1",
-                        "title": "Active Job HandlerError count and success rate (%)",
-                        "yAxis": {
-                            "right": {
-                                "max": 100
-                            }
-                        },
-                        "view": "timeSeries",
-                        "stacked": false,
-                        "liveData": true
+                        "stat": "p10",
+                        "period": 60,
+                        "title": "Handler Duration"
                     }
                 },
-                {
-                    "height": 3,
-                    "width": 6,
-                    "y": 15,
-                    "x": 18,
+                { <% "Active Job Queue" %>
+                    "height": 6,
+                    "width": 9,
+                    "y": <%= current_y + 3 %>,
+                    "x": 0,
                     "type": "metric",
                     "properties": {
-                        "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "ConcurrentExecutions", "FunctionName", "${self:service}-${self:provider.stage}-active_job_handler", { "stat": "Maximum" } ]
+                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueName}",
+                              { "label": "Received" } ],
+                            [ ".", "NumberOfMessagesDeleted", ".", ".", { "label": "Handled" } ],
+                            [ "AWS/Lambda", "Invocations", "FunctionName",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueHandlerName}", "Resource",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueHandlerName}", { "label": "Handler Invocations" } ],
+                            [ "AWS/SQS", "ApproximateNumberOfMessagesVisible", "QueueName",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueName}", { "label": "Pending?" } ],
+                            [ ".", "ApproximateNumberOfMessagesNotVisible", ".", ".", { "label": "Backlog?" } ],
+                            [ ".", "NumberOfMessagesSent", ".", ".", { "label": "Sent" } ],
+                            [ ".", "ApproximateNumberOfMessagesDelayed", ".", ".", { "label": "Delayed" } ]
                         ],
-                        "region": "us-east-1",
-                        "title": "Active Job Handler Concurrent executions",
                         "view": "timeSeries",
                         "stacked": false,
+                        "region": "us-east-1",
+                        "title": "<%= queue_name.camelize %> Queue (Async jobs go here immediately, scheduled jobs land here in the minute before they're scheduled)",
+                        "period": 60,
+                        "stat": "Sum",
                         "liveData": true
                     }
                 },
-                {
-                    "height": 3,
+                { <% "Active Job Handler Duration in Milliseconds" %>
+                    "height": 6,
                     "width": 9,
-                    "y": 27,
+                    "y": <%= current_y + 3 %>,
                     "x": 9,
                     "type": "metric",
                     "properties": {
                         "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "stat": "Minimum" } ],
+                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:custom.funktor.<%= queue_name.camelize %>QueueHandlerName}", { "stat": "Minimum" } ],
                             [ "...", { "stat": "Average" } ],
                             [ "...", { "stat": "Maximum" } ]
                         ],
                         "region": "us-east-1",
-                        "title": "Delayed Job Scheduler Duration",
+                        "title": "<%= queue_name.camelize %> Queue Handler Duration in Milliseconds",
                         "view": "timeSeries",
                         "stacked": false,
                         "liveData": true
                     }
                 },
-                {
+                { <% "Active Job HandlerError count and success rate (%)" %>
                     "height": 3,
                     "width": 6,
-                    "y": 27,
+                    "y": <%= current_y + 3 %>,
                     "x": 18,
                     "type": "metric",
                     "properties": {
                         "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "Errors", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "id": "errors", "stat": "Sum", "color": "#d13212" } ],
+                            [ "AWS/Lambda", "Errors", "FunctionName",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueHandlerName}", { "id": "errors", "stat": "Sum", "color": "#d13212" } ],
                             [ ".", "Invocations", ".", ".", { "id": "invocations", "stat": "Sum", "visible": false } ],
                             [ { "expression": "100 - 100 * errors / MAX([errors, invocations])", "label": "Success rate (%)", "id": "availability", "yAxis": "right", "region": "us-east-1" } ]
                         ],
                         "region": "us-east-1",
-                        "title": "Delayed Job SchedulerError count and success rate (%)",
+                        "title": "<%= queue_name.camelize %> Queue Handler Error count and success rate (%)",
                         "yAxis": {
                             "right": {
                                 "max": 100
@@ -293,188 +277,214 @@ Resources:
                         "liveData": true
                     }
                 },
-                {
+                { <% "Active Job Handler Concurrent executions" %>
                     "height": 3,
                     "width": 6,
-                    "y": 30,
+                    "y": <%= current_y + 6 %>,
                     "x": 18,
                     "type": "metric",
                     "properties": {
                         "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "ConcurrentExecutions", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "stat": "Maximum" } ]
+                            [ "AWS/Lambda", "ConcurrentExecutions", "FunctionName",
+                              "${self:custom.funktor.<%= queue_name.camelize %>QueueHandlerName}", { "stat": "Maximum" } ]
                         ],
                         "region": "us-east-1",
-                        "title": "Delayd Job Schedule Concurrent executions",
+                        "title": "<%= queue_name.camelize %> Queue Handler Concurrent executions",
                         "view": "timeSeries",
                         "stacked": false,
                         "liveData": true
                     }
                 },
-                {
-                    "height": 3,
-                    "width": 9,
-                    "y": 27,
+
+                <% current_y += 9 %>
+                <%- end -%>
+
+                { <% "Job Duration By Worker" %>
+                    "height": 6,
+                    "width": 24,
+                    "y": <%= current_y %>,
                     "x": 0,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "AWS/DynamoDB", "ReturnedItemCount", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", "Operation", "Query" ]
+                            <%- app_worker_names.each do |worker_name| -%>
+                            [ "<%= app_name %>", "Duration", "WorkerClassName", "<%= worker_name %>" ],
+                            [ "...", { "stat": "p99" } ]<%= worker_name == app_worker_names.last ? "" : "," %>
+                            <%- end -%>
                         ],
                         "view": "timeSeries",
                         "stacked": false,
                         "region": "us-east-1",
-                        "title": "Delayed Jobs To Be Executed In The Next 90 Seconds",
-                        "period": 60,
                         "stat": "Average",
-                        "liveData": true
-                    }
-                },
-                {
-                    "height": 3,
-                    "width": 6,
-                    "y": 0,
-                    "x": 0,
-                    "type": "text",
-                    "properties": {
-                        "markdown": "\n# Incoming Jobs\n"
-                    }
-                },
-                {
-                    "height": 3,
-                    "width": 6,
-                    "y": 9,
-                    "x": 0,
-                    "type": "text",
-                    "properties": {
-                        "markdown": "\n# Active Jobs\n"
+                        "period": 60,
+                        "title": "Job Duration by Worker"
                     }
                 },
-                {
+                <% current_y += 6 %>
+
+                { <% "Delayed Jobs" %>
                     "height": 3,
                     "width": 6,
-                    "y": 24,
+                    "y": <%= current_y %>,
                     "x": 0,
                     "type": "text",
                     "properties": {
                         "markdown": "\n# Delayed Jobs\n"
                     }
                 },
-                {
+                { <% "Messages To Be Scheduled" %>
                     "height": 3,
                     "width": 3,
-                    "y": 0,
+                    "y": <%= current_y %>,
                     "x": 6,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName", "${self:custom.funktor.incomingJobQueueName}", { "label": "Messages Per Minute" } ]
+                            [ "AWS/DynamoDB", "ReturnedItemCount", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", "Operation", "Query" ]
                         ],
                         "view": "singleValue",
                         "region": "us-east-1",
-                        "stat": "Sum",
+                        "stat": "Average",
                         "period": 60,
-                        "title": "Messages Per Minute"
+                        "title": "Messages To Be Scheduled"
                     }
                 },
-                {
+                { <% "Delayed Job Scheduler Duration" %>
                     "height": 3,
-                    "width": 3,
-                    "y": 9,
-                    "x": 6,
+                    "width": 15,
+                    "y": <%= current_y %>,
+                    "x": 9,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "AWS/SQS", "NumberOfMessagesReceived", "QueueName", "${self:service}-${self:custom.stage}-active-jobs", { "label": "Messages Per Minute" } ]
+                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", "Resource", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "label": "p10" } ],
+                            [ "...", { "label": "p50", "stat": "p50" } ],
+                            [ "...", { "label": "p99", "stat": "p99" } ],
+                            [ "...", { "label": "Average", "stat": "Average" } ]
                         ],
                         "view": "singleValue",
                         "region": "us-east-1",
-                        "stat": "Sum",
+                        "stat": "p10",
                         "period": 60,
-                        "title": "Messages Per Minute"
+                        "title": "Handler Duration"
                     }
                 },
-                {
+
+
+
+                <% current_y += 3 %>
+                { <% "Delayed Job SchedulerError count and success rate (%)" %>
                     "height": 3,
-                    "width": 15,
-                    "y": 0,
-                    "x": 9,
+                    "width": 6,
+                    "y": <%= current_y %>,
+                    "x": 18,
                     "type": "metric",
                     "properties": {
+                        "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-incoming_job_handler", "Resource", "${self:service}-${self:provider.stage}-incoming_job_handler", { "label": "p10" } ],
-                            [ "...", { "label": "p50", "stat": "p50" } ],
-                            [ "...", { "label": "p99", "stat": "p99" } ],
-                            [ "...", { "label": "Average", "stat": "Average" } ]
+                            [ "AWS/Lambda", "Errors", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "id": "errors", "stat": "Sum", "color": "#d13212" } ],
+                            [ ".", "Invocations", ".", ".", { "id": "invocations", "stat": "Sum", "visible": false } ],
+                            [ { "expression": "100 - 100 * errors / MAX([errors, invocations])", "label": "Success rate (%)", "id": "availability", "yAxis": "right", "region": "us-east-1" } ]
                         ],
-                        "view": "singleValue",
                         "region": "us-east-1",
-                        "stat": "p10",
-                        "period": 60,
-                        "title": "Handler Duration"
+                        "title": "Delayed Job SchedulerError count and success rate (%)",
+                        "yAxis": {
+                            "right": {
+                                "max": 100
+                            }
+                        },
+                        "view": "timeSeries",
+                        "stacked": false,
+                        "liveData": true
                     }
                 },
-                {
+                { <% "Delayed Job Scheduler Duration" %>
                     "height": 3,
-                    "width": 15,
-                    "y": 9,
+                    "width": 9,
+                    "y": <%= current_y %>,
                     "x": 9,
                     "type": "metric",
                     "properties": {
+                        "period": 60,
                         "metrics": [
-                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-active_job_handler", "Resource", "${self:service}-${self:provider.stage}-active_job_handler", { "label": "p10" } ],
-                            [ "...", { "label": "p50", "stat": "p50" } ],
-                            [ "...", { "label": "p99", "stat": "p99" } ],
-                            [ "...", { "label": "Average", "stat": "Average" } ]
+                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "stat": "Minimum" } ],
+                            [ "...", { "stat": "Average" } ],
+                            [ "...", { "stat": "Maximum" } ]
                         ],
-                        "view": "singleValue",
                         "region": "us-east-1",
-                        "stat": "p10",
-                        "period": 60,
-                        "title": "Handler Duration"
+                        "title": "Delayed Job Scheduler Duration",
+                        "view": "timeSeries",
+                        "stacked": false,
+                        "liveData": true
                     }
                 },
-                {
+                { <% "Delayed Jobs To Be Executed In The Next 90 Seconds" %>
                     "height": 3,
-                    "width": 3,
-                    "y": 24,
-                    "x": 6,
+                    "width": 9,
+                    "y": <%= current_y %>,
+                    "x": 0,
                     "type": "metric",
                     "properties": {
                         "metrics": [
                             [ "AWS/DynamoDB", "ReturnedItemCount", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", "Operation", "Query" ]
                         ],
-                        "view": "singleValue",
+                        "view": "timeSeries",
+                        "stacked": false,
                         "region": "us-east-1",
-                        "stat": "Average",
+                        "title": "Delayed Jobs To Be Executed In The Next 90 Seconds",
                         "period": 60,
-                        "title": "Messages To Be Scheduled"
+                        "stat": "Average",
+                        "liveData": true
                     }
                 },
-                {
+
+
+                <% current_y += 3 %>
+                { <% "Scheduled Job Table Read Capacity Units" %>
                     "height": 3,
-                    "width": 15,
-                    "y": 24,
-                    "x": 9,
+                    "width": 9,
+                    "y": <%= current_y %>,
+                    "x": 0,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "AWS/Lambda", "Duration", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", "Resource", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "label": "p10" } ],
-                            [ "...", { "label": "p50", "stat": "p50" } ],
-                            [ "...", { "label": "p99", "stat": "p99" } ],
-                            [ "...", { "label": "Average", "stat": "Average" } ]
+                            [ { "expression": "m2/PERIOD(m2)", "label": "Consumed Read Capacity Units", "id": "e1", "stat": "Sum", "region": "us-east-1" } ],
+                            [ "AWS/DynamoDB", "ConsumedReadCapacityUnits", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", { "id": "m2", "visible": false } ],
+                            [ ".", "ConsumedWriteCapacityUnits", ".", ".", { "yAxis": "left", "id": "m4", "visible": false } ],
+                            [ ".", "WriteThrottleEvents", ".", ".", { "yAxis": "right", "id": "m5", "visible": false } ]
                         ],
-                        "view": "singleValue",
+                        "view": "timeSeries",
+                        "stacked": false,
                         "region": "us-east-1",
-                        "stat": "p10",
+                        "title": "Scheduled Job Table Read Capacity Units",
                         "period": 60,
-                        "title": "Handler Duration"
+                        "stat": "Sum",
+                        "liveData": true
+                    }
+                },
+                { <% "Delayd Job Schedule Concurrent executions" %>
+                    "height": 3,
+                    "width": 6,
+                    "y": <%= current_y %>,
+                    "x": 18,
+                    "type": "metric",
+                    "properties": {
+                        "period": 60,
+                        "metrics": [
+                            [ "AWS/Lambda", "ConcurrentExecutions", "FunctionName", "${self:service}-${self:provider.stage}-delayed_job_scheduler", { "stat": "Maximum" } ]
+                        ],
+                        "region": "us-east-1",
+                        "title": "Delayd Job Schedule Concurrent executions",
+                        "view": "timeSeries",
+                        "stacked": false,
+                        "liveData": true
                     }
                 },
-                {
+                { <% "Scheduled Job Table Write Capacity Units" %>
                     "height": 3,
                     "width": 9,
-                    "y": 30,
+                    "y": <%= current_y %>,
                     "x": 9,
                     "type": "metric",
                     "properties": {
@@ -493,26 +503,53 @@ Resources:
                         "liveData": true
                     }
                 },
-                {
-                    "height": 6,
-                    "width": 24,
-                    "y": 18,
+
+
+
+                <% current_y += 3 %>
+                { <% "Scheduled Job Table Latency" %>
+                    "height": 3,
+                    "width": 18,
+                    "y": <%= current_y %>,
                     "x": 0,
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "rails-lambda-experiment", "Duration", "WorkerClassName", "HelloWorker" ],
-                            [ "...", { "stat": "p99" } ],
-                            [ "...", "HelloLaterWorker" ],
-                            [ "...", { "stat": "p99" } ]
+                            [ "AWS/DynamoDB", "SuccessfulRequestLatency", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", "Operation", "PutItem", { "yAxis": "left" } ],
+                            [ "...", "Query" ],
+                            [ ".", "ThrottledRequests", ".", ".", ".", "PutItem", { "yAxis": "right", "visible": false } ],
+                            [ ".", "SuccessfulRequestLatency", ".", ".", ".", "DeleteItem" ],
+                            [ ".", "ThrottledRequests", ".", ".", ".", ".", { "yAxis": "right", "visible": false } ]
                         ],
                         "view": "timeSeries",
                         "stacked": false,
                         "region": "us-east-1",
                         "stat": "Average",
                         "period": 60,
-                        "title": "Job Duration by Worker"
+                        "title": "Scheduled Job Table Latency",
+                        "liveData": true
+                    }
+                },
+                { <% "Scheduled Job Table Throttled Operations" %>
+                    "height": 3,
+                    "width": 6,
+                    "y": <%= current_y %>,
+                    "x": 18,
+                    "type": "metric",
+                    "properties": {
+                        "metrics": [
+                            [ "AWS/DynamoDB", "ThrottledRequests", "TableName", "${self:service}-${self:custom.stage}-delayed-jobs", "Operation", "DeleteItem" ],
+                            [ "...", "PutItem" ]
+                        ],
+                        "view": "timeSeries",
+                        "stacked": false,
+                        "region": "us-east-1",
+                        "stat": "Sum",
+                        "period": 60,
+                        "title": "Scheduled Job Table Throttled Operations",
+                        "liveData": true
                     }
                 }
+
             ]
         }

data/lib/funktor/cli/templates/funktor_init.yml.tt

@@ -5,12 +5,12 @@ runtime: ruby2.7
 
 # These values will be applied to any funktor handlers that don't specify custom values.
 # TODO - These still need to be wired up to do anything.
-handler_defaults:
+handlerDefaults:
   # timeout is how long the handler can possibly run. Up to 10 messages may be delivered
   # to a handler at one time, so you'll want this to be at least 10x the maximum time you
   # expect to spend for one message. We default to a high number here to allow for the
   # times when things go weird.
-  timeout: 900
+  timeout: 300
 
   # reservedConcurrency represents the maximum number of concurrent executions.
   # Usually you'll want to leave this as null so that handlers can scale infinitely
@@ -44,20 +44,17 @@ handler_defaults:
   logRetentionInDays: 30
 
 # Incoming Job Handler
-# TODO - These still need to be wired up to do anything.
-incoming_job_handler:
+incomingJobHandler:
   # If your jobs are bursty AND time-sensitive you might want to have some lambdas pre-provisioned
   # to quickly handle jobs at the beginning of a burst. Uncomment the line below if so.
   # provisionedConcurrency: 4
 
 
-# TODO - These still need to be wired up to do anything.
 queues:
   - default:
       # Set queue specific config options here
       # memorySize: 512
-      # TODO - Is it advisable to use FIFO queuues with Funktor?
-      # TODO - Maybe this isn't really even supported by CloudFormation?
+      # TODO - Is it advisable to use FIFO queuues with Funktor? Maybe this isn't really even supported by CloudFormation?
       # fifo: false
   - singleThread:
       reservedConcurrency: 1

data/lib/funktor/cli/templates/{app/handlers → lambda_event_handlers}/incoming_job_handler.rb

@@ -1,4 +1,4 @@
-require 'funktor'
+require_relative '../config/boot'
 
 $handler = Funktor::IncomingJobHandler.new
 

data/lib/funktor/cli/templates/lambda_event_handlers/work_queue_handler.rb

@@ -0,0 +1,8 @@
+require_relative '../config/boot'
+
+$handler = Funktor::ActiveJobHandler.new
+
+def call(event:, context:)
+  $handler.call(event: event, context: context)
+end
+

data/lib/funktor/cli/templates/serverless.yml

@@ -27,10 +27,8 @@ provider:
   environment: ${file(config/environment.yml)}
   versionFunctions: false # Reduces the amount of storage used since all Lambdas together are limited to 75GB
   iamRoleStatements:
-    - ${file(config/iam_permissions/ssm.yml)}
-    - ${file(config/iam_permissions/incoming_job_queue.yml)}
-    <%- queue_names.each do |queue_name| -%>
-    - ${file(config/iam_permissions/<%= queue_name.underscore %>_queue.yml)}
+    <%- all_iam_permissions.each do |iam_permission| -%>
+    - ${file(<%= iam_permission %>)}
     <%- end -%>
 
 
@@ -44,17 +42,13 @@ custom:
 package: ${file(config/package.yml)}
 
 functions:
-  incomingJobHandler: ${file(config/function_definitions/incoming_job_handler.yml)}
-  <%- queue_names.each do |queue_name| -%>
-  <%= queue_name.camelize %>QueueHandler: ${file(config/function_definitions/<%= queue_name.underscore %>_queue_handler.yml)}
+  <%- all_function_definitions.each do |function_definition| -%>
+  <%= File.basename(function_definition, ".yml").camelize %>: ${file(<%= function_definition %>)}
   <%- end -%>
 
 resources:
-  - ${file(config/resources/incoming_job_queue.yml)}
-  - ${file(config/resources/incoming_job_queue_user.yml)}
-  - ${file(config/resources/cloudwatch_dashboard.yml)}
-  <%- queue_names.each do |queue_name| -%>
-  - ${file(config/resources/<%= queue_name.underscore %>_queue.yml)}
+  <%- all_resources.each do |resource| -%>
+  - ${file(<%= resource %>)}
   <%- end -%>
 
 plugins:

data/lib/funktor/version.rb

@@ -1,3 +1,3 @@
 module Funktor
-  VERSION = "0.2.2"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.7
 platform: ruby
 authors:
 - Jeremy Green
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-sqs
@@ -115,9 +115,8 @@ files:
 - lib/funktor/cli/generate/work_queue.rb
 - lib/funktor/cli/init.rb
 - lib/funktor/cli/templates/Gemfile
-- lib/funktor/cli/templates/app/handlers/incoming_job_handler.rb
-- lib/funktor/cli/templates/app/handlers/work_queue_handler.rb
 - lib/funktor/cli/templates/app/workers/hello_worker.rb
+- lib/funktor/cli/templates/config/boot.rb
 - lib/funktor/cli/templates/config/environment.yml
 - lib/funktor/cli/templates/config/function_definitions/incoming_job_handler.yml
 - lib/funktor/cli/templates/config/function_definitions/work_queue_handler.yml
@@ -133,6 +132,8 @@ files:
 - lib/funktor/cli/templates/config/ruby_layer.yml
 - lib/funktor/cli/templates/funktor_init.yml.tt
 - lib/funktor/cli/templates/gitignore
+- lib/funktor/cli/templates/lambda_event_handlers/incoming_job_handler.rb
+- lib/funktor/cli/templates/lambda_event_handlers/work_queue_handler.rb
 - lib/funktor/cli/templates/package.json
 - lib/funktor/cli/templates/serverless.yml
 - lib/funktor/fake_job_queue.rb

data/lib/funktor/cli/templates/app/handlers/work_queue_handler.rb

@@ -1,17 +0,0 @@
-require 'funktor'
-
-# Bundler is hard to make work because AWS includes some gems in the basic ruby runtime.
-# We're probably going to need to use containers...
-#require "rubygems"
-#require "bundler/setup"
-#Bundler.require(:default)
-
-# TODO : Ideally this wouldn't be needed
-require_relative '../workers/hello_worker'
-
-$handler = Funktor::ActiveJobHandler.new
-
-def call(event:, context:)
-  $handler.call(event: event, context: context)
-end
-