jets 1.9.23 → 1.9.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f412ceff12f17dc7991129a970fb8cadbbd99505df4477ff9d21caa0c5336cd
-  data.tar.gz: e21ec406d552d30bf5a2f3975d986ebf319737235e78042bb20565b34d91fa6c
+  metadata.gz: 2f1be1857a1221db9a29d0106fa74d9f2d773fe5f3c09eb877eb91dabfacf913
+  data.tar.gz: 93154ffb64b35f28d6af723d5d6309077480b083ddb67b9e69a5fdafc2e30aec
 SHA512:
-  metadata.gz: 0edbc1119cc44b14bd71585f077e8abf6b8e545d83f587e7fe4e7c4059817033d0869539e96e688540bcddd3cbd90c8f905189cb08780a393610535ae5a8b3df
-  data.tar.gz: e74dd8be455ea2120b3b2fc1fc8e20621488f6fc030cae7a9847a2f84d4dffa9cdf6f70cc8f7e5d17cf5531f927285d127fdda9d52316f135d5f95a3571a278c
+  metadata.gz: 4e6a216db6fe880c7474a22a104f5b323fec4fe7b2f784b5a8837608df7a24b6cff5be8e13151e5ee6e2ceb110ccfb9c6a629b40b0762f1128b50cc1c5c17c9a
+  data.tar.gz: 0b149b34bf275c7c77d373a43c6f4abe89710d40e2adca924a07a3a9e8d3d2b2add0c384b5e180495903748ab727b97f4c64c2e40aa3fa372c69e105a0b97171

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [1.9.24]
+- #301 Fix jets call for long function names. Lookup actual function names for long functions
+
 ## [1.9.23]
 - #300 use .jets/project folder for afterburner instead of .jets/app
 

data/lib/jets.rb

@@ -16,6 +16,8 @@ Jets::Autoloaders.once.setup
 
 module Jets
   RUBY_VERSION = "2.5.3"
+  MAX_FUNCTION_NAME_SIZE = 64
+
   class Error < StandardError; end
   extend Core # root, logger, etc
 end

data/lib/jets/application/defaults.rb

@@ -23,14 +23,12 @@ class Jets::Application
         }
         policies = [logs, s3_readonly, s3_bucket]
 
-        if Jets::Stack.has_resources?
-          cloudformation = {
-            action: ["cloudformation:DescribeStacks"],
-            effect: "Allow",
-            resource: "arn:aws:cloudformation:#{Jets.aws.region}:#{Jets.aws.account}:stack/#{project_namespace}*",
-          }
-          policies << cloudformation
-        end
+        cloudformation = {
+          action: ["cloudformation:DescribeStacks", "cloudformation:DescribeStackResources"],
+          effect: "Allow",
+          resource: "arn:aws:cloudformation:#{Jets.aws.region}:#{Jets.aws.account}:stack/#{project_namespace}*",
+        }
+        policies << cloudformation
 
         if Jets.config.function.vpc_config
           vpc = {

data/lib/jets/autoloaders.rb

@@ -27,6 +27,7 @@ module Jets
         Zeitwerk::Loader.new.tap do |loader|
           loader.tag = "jets.main"
           # loader.inflector = Inflector.new # TODO: allow custom app inflector
+          loader.ignore("#{Jets.root}/app/shared/functions")
         end
       end
       memoize :main

data/lib/jets/commands/call/base_guesser.rb

@@ -5,6 +5,8 @@
 #
 class Jets::Commands::Call
   class BaseGuesser
+    include Jets::AwsServices
+
     # provided_function_name:
     #   admin/related_pages_controller-list_all
     #   admin-related-pages-controller-list-all
@@ -28,6 +30,31 @@ class Jets::Commands::Call
 
       code_path = class_name.underscore.gsub('/','-')
       function_name = [Jets.config.project_namespace, code_path, method_name].join('-')
+      generated_function_name(function_name)
+    end
+
+    def generated_function_name(function_name)
+      if function_name.size > Jets::MAX_FUNCTION_NAME_SIZE # name generated by CloudFormation
+        logical_id = @class_name.gsub('::','')
+        app_stack_arn = lookup(parent_stack[:outputs], logical_id)
+
+        resources = stack_resources(app_stack_arn)
+        resource = resources.find { |r| r.logical_resource_id == method_name.camelize + "LambdaFunction" } # method_name only contains the method
+        resource.physical_resource_id # actual function name
+      else
+        function_name
+      end
+    end
+
+    # Class variable caches
+    @@stack_resources = {}
+    def stack_resources(stack_name)
+      @@stack_resources[stack_name] ||= cfn.describe_stack_resources(stack_name: stack_name).stack_resources
+    end
+
+    @@parent_stack = nil
+    def parent_stack
+      @@parent_stack ||= cfn.describe_stacks(stack_name: Jets::Naming.parent_stack_name).stacks.first
     end
   end
 end

data/lib/jets/commands/main.rb

@@ -80,7 +80,7 @@ module Jets::Commands
     option :qualifier, desc: "Lambda function version or alias name"
     option :show_log, type: :boolean, desc: "Shows last 4KB of log in the x-amz-log-result header"
     option :lambda_proxy, type: :boolean, default: true, desc: "Enables automatic Lambda proxy transformation of the event payload"
-    option :guess, type: :boolean, default: true, desc: "Enables guess mode. Uses inference to allows use of all dashes to specify functions. Smart mode verifies that the function exists in the code base."
+    option :guess, type: :boolean, default: true, desc: "Enables guess mode. Uses inference to allows use of all dashes to specify functions. Guess mode verifies that the function exists in the code base."
     option :local, type: :boolean, desc: "Enables local mode. Instead of invoke the AWS Lambda function, the method gets called locally with current app code. With local mode guess mode is always used."
     def call(function_name, payload='')
       # Printing to stdout can mangle up the response when piping

data/lib/jets/commands/templates/skeleton/Gemfile.tt

@@ -23,6 +23,7 @@ group :development, :test do
 <% unless options[:mode] == 'job' -%>
   gem 'shotgun'
   gem 'rack'
+  gem 'puma'
 <% end -%>
 end
 

data/lib/jets/resource/lambda/function.rb

@@ -184,7 +184,6 @@ module Jets::Resource::Lambda
       "jets/code/code-#{checksum}.zip" # s3_key
     end
 
-    MAX_FUNCTION_NAME_SIZE = 64
     # Examples:
     #   "#{Jets.config.project_namespace}-sleep_job-perform"
     #   "demo-dev-sleep_job-perform"
@@ -200,7 +199,7 @@ module Jets::Resource::Lambda
       # Returns nil if function name is too long.
       # CloudFormation will managed the the function name in this case.
       # A pretty function name won't be generated but the deploy will be successful.
-      function_name.size > MAX_FUNCTION_NAME_SIZE ? nil : function_name
+      function_name.size > Jets::MAX_FUNCTION_NAME_SIZE ? nil : function_name
     end
 
     def description

data/lib/jets/stack.rb

@@ -61,20 +61,11 @@ module Jets
       end
       memoize :template
 
-      # Usage:
-      #
-      #   Jets::Stack.has_resources?
-      #
-      def has_resources?
-        # need to eager load the app/shared resources in order to check if shared resources have been registered
-        eager_load_shared_resources!
-        !!subclasses.detect do |subclass|
-          subclass.build?
-        end
-      end
-
+      # Eager loading the app/shared resources to ensure shared resources have been registered.
+      # Not being used anymore but keeping around just in case for now.
       def eager_load_shared_resources!
         Dir.glob("#{Jets.root}/app/shared/**").each do |path|
+          next if path.include?("app/shared/functions")
           Jets::Autoloaders.main.preload(path)
         end
       end

data/lib/jets/stack/main/dsl/lambda.rb

@@ -1,6 +1,5 @@
 module Jets::Stack::Main::Dsl
   module Lambda
-    MAX_FUNCTION_NAME_SIZE = 64
     # Example:
     #
     #   function(:hello,
@@ -38,7 +37,7 @@ module Jets::Stack::Main::Dsl
       }
 
       function_name = "#{Jets.config.project_namespace}-#{class_namespace}-#{meth}"
-      function_name = function_name.size > MAX_FUNCTION_NAME_SIZE ? nil : function_name
+      function_name = function_name.size > Jets::MAX_FUNCTION_NAME_SIZE ? nil : function_name
       defaults[:function_name] = function_name if function_name
 
       props = defaults.merge(props)

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.9.23"
+  VERSION = "1.9.24"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.9.23
+  version: 1.9.24
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-27 00:00:00.000000000 Z
+date: 2019-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer