funktor 0.7.5 → 0.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b78b0dfad4344af7ceaeef40b2871f68e1305deaa0218f87737b05b4d2e36578
-  data.tar.gz: 3405468ffbcf7c826ff25dce2a4a991df9c6ebe1076cfbcb357ce1b94174355d
+  metadata.gz: 55a26178c2cc3afd27da38d8322aba99cb8b05b707a0c69651531ec44471bf79
+  data.tar.gz: 8d96412765a0711319b73137b295fdf2c2e90da61e6c2f38caa11aa0c91774f6
 SHA512:
-  metadata.gz: 556517fc7fe7ee77c5cb38b4a97c64333cc929aa7524cd4263ae5f9087e847ba5958def975a4b7401f95aa77bd9b276cc700440e591db769da49e41c22bb9e3f
-  data.tar.gz: 524a7ce3720d0f6d3f368ebc1bec6035568942e2eaaec44c001e3b4acfc7397797b08c6a8c528cd7730ea42007e9b7e1c0b2e55a6c83460a52d75a4a991faf53
+  metadata.gz: 6e31ed84ec9c743a74c7f77db2859dfbadcbb6d1553c5e945185e60afaf2b0657274d4e18502bb1f7794ea9585fa5f90d91a550da29524ae5e9cd92a8f4c4533
+  data.tar.gz: 9b61c9c412003860d61c22f4626f9c91c6193e95aaa3e6fe45951905da80b90699f3c08e9dbb6ae3e84c1b32fa77b9850ca19c499905cbd6cd0e42b8287d2f70

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.7.4)
+    funktor (0.7.8)
       activesupport
       aws-sdk-dynamodb (~> 1.62)
       aws-sdk-sqs (~> 1.37)
@@ -22,8 +22,8 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.584.0)
-    aws-sdk-core (3.130.2)
+    aws-partitions (1.587.0)
+    aws-sdk-core (3.131.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)

data/funktor-testapp/Dockerfile

@@ -0,0 +1,63 @@
+FROM public.ecr.aws/lambda/ruby:2.7 AS build_image
+
+# Uncomment this as a cache buster
+#RUN echo date
+
+# If you supplied buildArgs to the ecr image you can access them here using ARG & ENV
+#ARG BUNDLE_GEM__FURY__IO
+#ENV BUNDLE_GEM__FURY__IO=${BUNDLE_GEM__FURY__IO}
+
+# First we install some stuff that we need for gems that have to compile native extensions
+#RUN yum groupinstall "Development Tools" -y
+#RUN yum install -y amazon-linux-extras
+#RUN amazon-linux-extras enable postgresql11
+#RUN yum install -y postgresql-devel
+
+# Now we copy the Gemfile and Gemfile.lock into the build image so we can install our gems
+COPY Gemfile Gemfile.lock .
+
+# Set a few bundle configuration options
+RUN bundle lock --add-platform x86_64-linux
+#RUN bundle config --local deployment true
+#RUN bundle config --local plugins false
+#RUN bundle config --local frozen true
+#RUN bundle config --local without 'development test'
+RUN bundle config --local path './vendor/bundle'
+
+# Now install our gems
+RUN bundle install --quiet --jobs 4
+
+# Now we start a second stage in the build that is a clean image without build tools
+FROM public.ecr.aws/lambda/ruby:2.7 AS deploy_image
+
+#ENV RAILS_ENV=production
+#ENV RACK_ENV=production
+
+# Install node so that asset related gems have a JS runtime.
+# We ship the node executeable to production to make it easier to get an app deployed.
+# TODO: Document steps that could be taken to remove this dependency.
+#RUN curl --silent --location https://rpm.nodesource.com/setup_14.x | bash -
+#RUN yum install -y nodejs
+
+# Then copy some postgres related files
+#COPY --from=build_image  /usr/lib64/libpq.so.5 /usr/lib64/
+#COPY --from=build_image  /usr/lib64/libldap_r-2.4.so.2 /usr/lib64/
+#COPY --from=build_image  /usr/lib64/liblber-2.4.so.2 /usr/lib64/
+#COPY --from=build_image  /usr/lib64/libsasl2.so.3 /usr/lib64/
+#COPY --from=build_image  /usr/lib64/libssl3.so /usr/lib64/
+#COPY --from=build_image  /usr/lib64/libsmime3.so /usr/lib64/
+#COPY --from=build_image  /usr/lib64/libnss3.so /usr/lib64/
+
+
+# Next we copy the app from our local directory and we copy
+# the bundled gems from the build image.
+# We do this after copying dependencies becuase the app will
+# change more frequently, and we can used caching up to here.
+
+COPY --from=build_image /var/task .
+COPY . .
+
+# And finally we have the CMD for the deployed container
+# You can overwrite command in `serverless.yml` template
+CMD [ "app.LambdaFunction::Handler.process" ]
+

data/funktor-testapp/app/services/job_flood.rb

@@ -23,7 +23,7 @@ class JobFlood
         job_target_time = Time.now + (minute * 60) + rand(60)
         job_sleep = rand(0.0..max_job_length_in_seconds.to_f)
         puts job_target_time
-        [AuditWorker, AuditWorker, SingleThreadAuditWorker].sample.perform_at(job_target_time, {
+        [AuditWorker, AuditWorker, SingleThreadAuditWorker, HelloWorker, GreetingsWorker].sample.perform_at(job_target_time, {
           mode: 'later',
           message: 'msg: from random JobFlood - ' + SecureRandom.hex,
           target_time: job_target_time,

data/funktor-testapp/funktor_config/boot.rb

@@ -12,6 +12,9 @@ Bundler.require(:default, :production)
 $LOAD_PATH.unshift 'funktor/lib'
 require 'funktor'
 
+
+Funktor.enable_work_queue_visibility = false
+
 # Load all ruby files in the app directory
 require_rel File.join('..', 'app')
 

data/funktor-testapp/funktor_config/environment.yml

@@ -1,7 +1,16 @@
-BUNDLE_WITHOUT: development:test:assets
+BUNDLE_WITHOUT: development:test
 BUNDLE_PLUGINS: false
 BUNDLE_FROZEN: true
+BUNDLE_DEPLOYMENT: true
 SERVERLESS_STAGE: ${self:custom.stage}
+
+FUNKTOR_LOG_LEVEL: INFO
+
+RAILS_LOG_TO_STDOUT: true
+RAILS_ENV: production
+RACK_ENV: production
+RAILS_MAX_THREADS: 1
+
 FUNKTOR_APP_NAME: funktor-testapp
 FUNKTOR_INCOMING_JOB_QUEUE:
   Ref: IncomingJobQueue

data/funktor-testapp/funktor_config/function_definitions/default_queue_handler.yml

@@ -1,8 +1,12 @@
-handler: lambda_event_handlers/default_queue_handler.call
+#handler: lambda_event_handlers/default_queue_handler.call
 timeout: ${self:custom.funktor.DefaultQueueHandler.functionTimeout, 900}
 reservedConcurrency: ${self:custom.funktor.DefaultQueueHandler.reservedConcurrency, null}
 provisionedConcurrency: ${self:custom.funktor.DefaultQueueHandler.provisionedConcurrency, null}
 memorySize: ${self:custom.funktor.DefaultQueueHandler.memorySize, 256}
+image:
+  name: funktorimage
+  command:
+    - lambda_event_handlers/default_queue_handler.call
 events:
   - sqs:
       batchSize: ${self:custom.funktor.DefaultQueueHandler.batchSize, 1}

data/funktor-testapp/funktor_config/function_definitions/incoming_job_handler.yml

@@ -1,8 +1,12 @@
-handler: lambda_event_handlers/incoming_job_handler.call
+#handler: lambda_event_handlers/incoming_job_handler.call
 timeout: ${self:custom.funktor.IncomingJobHandler.functionTimeout, 30}
 reservedConcurrency: ${self:custom.funktor.IncomingJobHandler.reservedConcurrency, null}
 provisionedConcurrency: ${self:custom.funktor.IncomingJobHandler.provisionedConcurrency, null}
 memorySize: ${self:custom.funktor.IncomingJobHandler.memorySize, 256}
+image:
+  name: funktorimage
+  command:
+    - lambda_event_handlers/incoming_job_handler.call
 events:
   - sqs:
       batchSize: ${self:custom.funktor.IncomingJobHandler.batchSize, 1}

data/funktor-testapp/funktor_config/function_definitions/job_activator.yml

@@ -1,7 +1,11 @@
-handler: lambda_event_handlers/job_activator.call
+#handler: lambda_event_handlers/job_activator.call
 timeout: ${self:custom.funktor.JobActivator.functionTimeout, 30}
 reservedConcurrency: ${self:custom.funktor.JobActivator.reservedConcurrency, null}
 provisionedConcurrency: ${self:custom.funktor.JobActivator.provisionedConcurrency, null}
 memorySize: ${self:custom.funktor.JobActivator.memorySize, 256}
+image:
+  name: funktorimage
+  command:
+    - lambda_event_handlers/job_activator.call
 events:
   - schedule: rate(1 minute)

data/funktor-testapp/funktor_config/function_definitions/low_concurrency_queue_handler.yml

@@ -1,8 +1,12 @@
-handler: lambda_event_handlers/low_concurrency_queue_handler.call
+#handler: lambda_event_handlers/low_concurrency_queue_handler.call
 timeout: ${self:custom.funktor.LowConcurrencyQueueHandler.functionTimeout, 900}
 reservedConcurrency: ${self:custom.funktor.LowConcurrencyQueueHandler.reservedConcurrency, null}
 provisionedConcurrency: ${self:custom.funktor.LowConcurrencyQueueHandler.provisionedConcurrency, null}
 memorySize: ${self:custom.funktor.LowConcurrencyQueueHandler.memorySize, 256}
+image:
+  name: funktorimage
+  command:
+    - lambda_event_handlers/low_concurrency_queue_handler.call
 events:
   - sqs:
       batchSize: ${self:custom.funktor.LowConcurrencyQueueHandler.batchSize, 1}

data/funktor-testapp/funktor_config/package.yml

@@ -1,10 +1,10 @@
 # TODO - Figure out how to allow individual packaging to work out of the box.
-individually: false
-include:
-  - Gemfile
-  - Gemfile.lock
-  - funktor_config/boot.rb
-  - app/**
+#individually: false
+#include:
+  #- Gemfile
+  #- Gemfile.lock
+  #- funktor_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.
 #exclude: