funktor 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 700b659a76af0a0e7e6a21c91a91553f4d5ff5899140ef18313bd181d97de4e1
-  data.tar.gz: f9d311402f6a0686e11c0d30131135fc5372bf58cc8e6c32c0f5a90f649861d7
+  metadata.gz: 666c2af44a969a861936755046fdb067cd118f5c1c197673d3eaf9848a88a3a0
+  data.tar.gz: d3a6282e200730a25192d6030f3c28876d10cc6d2b8895797dcf51033605e2c7
 SHA512:
-  metadata.gz: 47e9682f6d0f96e9ce5d393574642b8361049c91f07dc2b9154c4492c0b10257bc651e22ea5512a1f904cd2a895c9435d9722c559b756086618f1ea58983298a
-  data.tar.gz: a498a2854d47e3c2b0bfd9f1bb2d2feb31b5bd3b8ac1f34c79a5efd127cb81d77862147cd6d27528589710676b748bd744bdd3ace35ebfdb118d4983a3414ac0
+  metadata.gz: acfa560d423d17f40e94d6605e7915b4bb2c9f8f1e52530735cf8be887451fa4990f986f8f7a314c43ce38e9d03771c9e33c6d311270dc9a18201aa2ea1760f7
+  data.tar.gz: abfa953bfc26962c069839a152cb05616cabb5ac8035760210fd0b815bd2efed13f1ffb597f5f027eda71d95f4a4dcc82de3c618d5b2e059aacca1d8dcb433a7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    funktor (0.2.3)
+    funktor (0.2.4)
       activesupport
       aws-sdk-sqs (~> 1.37)
       thor

data/lib/funktor/cli/init.rb

@@ -30,9 +30,7 @@ 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")
@@ -54,6 +52,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")
@@ -94,11 +96,34 @@ module Funktor
         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 +132,10 @@ module Funktor
         funktor_config["appName"]
       end
 
+      def app_name
+        funktor_config["appName"]
+      end
+
       def runtime
         funktor_config["runtime"]
       end

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

@@ -308,10 +308,10 @@ Resources:
                     "type": "metric",
                     "properties": {
                         "metrics": [
-                            [ "rails-lambda-experiment", "Duration", "WorkerClassName", "HelloWorker" ],
-                            [ "...", { "stat": "p99" } ],
-                            [ "...", "HelloLaterWorker" ],
-                            [ "...", { "stat": "p99" } ]
+                            <%- 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,

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.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: funktor
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Jeremy Green