jets 1.5.10 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39b6cde7b66e43e4c253e0f055952680298287d9e7c534c4a465ca075b3dfb62
-  data.tar.gz: d3312104416979ca67bd31cebd3a7c2ba604185349c2c368de438d50a68914ef
+  metadata.gz: 525a55f0013d6870b5bd4a0fa2f63b981c8af0f82e1fbf6b2cabc847a9e6cb76
+  data.tar.gz: 17171ba50a0c0e422d7d128465c21c529b13ddfbe7513a7d752f20112a5f81b9
 SHA512:
-  metadata.gz: 1b670d6b6a2c0189fd608d4a7ba61a02206a4ddf78d2c8eda2c4f06d8c4c1beddb2588b417211e697ea0b24f8c426975c9ab08819a56fc3da41f6c959fb272ca
-  data.tar.gz: c84383ea55a03f9b0576fb5ea7c4a895a9e5ae818bd79df008a9e7f621f93ce2d5e4e189d7f4aa9a9a2c0fef12ae7a668747308b263785de0b8d0c46da8330f7
+  metadata.gz: ea140c8868652da36b15d10da8a681792d6623cfb76e8480841900e76a2ea7ce9fd0a7fbe30c570d0d51b7d514bc8d0c6a5d8f3259a9f97ff7df6ee85b484df9
+  data.tar.gz: cc4b2ac99cbb56a2ec20d276d57e6b3a232ca8e292decd9ceb26af704d668acdca1329ae29fdcb4d0b44317c4b6a77747d194c5d767f5fd9b10240388607f6cb

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [1.6.0]
+- #158 from mmyoji/fix-docs-urls
+- #159 from patchkit-net/bugfix/invalid-longpath-collision Fix invalid collision detection on paths that already contains path variables
+- #161 from tongueroo/iam-role-name remove pretty iam role name, let CloudFormation generate
+
 ## [1.5.10]
 - #157 Improve Route Change Detection: Path Variables
 

data/Gemfile.lock

@@ -11,7 +11,7 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.5.10)
+    jets (1.6.0)
       activerecord (~> 5.2.1)
       activesupport (~> 5.2.1)
       aws-sdk-apigateway

data/README.md

@@ -164,8 +164,8 @@ For more documentation, check out the official docs: [Ruby on Jets](http://rubyo
 * [Quick Start](http://rubyonjets.com/quick-start/)
 * [Local Jets Server](http://rubyonjets.com/docs/local-server/)
 * [REPL Console](http://rubyonjets.com/docs/repl-console/)
-* [Project Structure](http://rubyonjets.com/project-structure/)
-* [App Configuration](http://rubyonjets.com/app-config/)
+* [Project Structure](http://rubyonjets.com/docs/structure/)
+* [App Configuration](http://rubyonjets.com/docs/app-config/)
 * [Database Support](http://rubyonjets.com/docs/database-support/)
 * [Polymorphic Support](http://rubyonjets.com/docs/polymorphic-support/)
 * [Rails Support](http://rubyonjets.com/docs/rails-support/)

data/lib/jets/commands/upgrade.rb

@@ -108,6 +108,7 @@ module Jets::Commands
     end
 
     def update_webpack_binstubs
+      return unless File.exist?("bin/webpack")
       lines = IO.readlines("bin/webpack")
       already_upgraded = lines.detect { |l| l =~ /WebpackRunner/ }
       return if already_upgraded

data/lib/jets/resource/api_gateway/rest_api/routes/change/base.rb

@@ -68,13 +68,43 @@ class Jets::Resource::ApiGateway::RestApi::Routes::Change
     #   posts#new
     def recreate_to(method_uri)
       md = method_uri.match(/function:(.*)\//)
-      function_name = md[1] # IE: demo-dev-posts_controller-new
-      controller_action = function_name.sub("#{Jets.project_namespace}-", '')
+      function_arn = md[1] # IE: demo-dev-posts_controller-new
+      controller, action = get_controller_action(function_arn)
+      "#{controller}##{action}" # IE: posts#new
+    end
+
+    def get_controller_action(function_arn)
+      if function_arn.include?('_controller-')
+        controller_action_from_string(function_arn)
+      else
+        controller_action_from_api(function_arn)
+      end
+    end
+
+    # TODO: If this hits the Lambda Rate limit, then list_functions also contains the Lambda
+    # function description. So we can paginate through list_functions results and store
+    # description from there if needed.
+    # Dont think this will be needed though because controller_action_from_string gets called
+    # most of the time. Also, user might be able to request their Lambda limit to be increased.
+    def controller_action_from_api(function_arn)
+      desc = lambda_function_description(function_arn)
+      controller, action = desc.split('#')
+      controller = controller.underscore.sub(/_controller$/,'')
+      [controller, action]
+    end
+
+    def controller_action_from_string(function_arn)
+      controller_action = function_arn.sub("#{Jets.project_namespace}-", '')
       md = controller_action.match(/(.*)_controller-(.*)/)
       controller = md[1]
       controller = controller.gsub('-','/')
       action = md[2]
-      "#{controller}##{action}" # IE: posts#new
+      [controller, action]
+    end
+
+    def lambda_function_description(function_arn)
+      resp = lambda.get_function(function_name: function_arn)
+      resp.configuration.description # contains full info: PostsController#index
     end
 
     # Duplicated in rest_api/change_detection.rb, base_path/role.rb, rest_api/routes.rb

data/lib/jets/resource/api_gateway/rest_api/routes/collision.rb

@@ -68,6 +68,8 @@ class Jets::Resource::ApiGateway::RestApi::Routes
     end
 
     def parent?(parent, path)
+      return false if parent == path
+
       parent_parts = parent.split('/')
       path_parts = path.split('/')
 

data/lib/jets/resource/iam/application_role.rb

@@ -14,8 +14,8 @@ module Jets::Resource::Iam
       "iam_role"
     end
 
-    def role_name
-      "#{Jets.config.project_namespace}-application-role"
+    def policy_name
+      "#{Jets.config.project_namespace}-application-policy"
     end
 
     def outputs

data/lib/jets/resource/iam/base_role_definition.rb

@@ -5,11 +5,12 @@ module Jets::Resource::Iam
     def definition
       logical_id = role_logical_id
 
+      # Do not assign pretty role_name because long controller names might hit the 64-char
+      # limit. Also, IAM roles are global, so assigning role names prevents cross region deploys.
       definition = {
         logical_id => {
           type: "AWS::IAM::Role",
           properties: {
-            role_name: role_name,
             path: "/",
             assume_role_policy_document: {
               version: "2012-10-17",
@@ -24,7 +25,7 @@ module Jets::Resource::Iam
       }
 
       definition[logical_id][:properties][:policies] = [
-        policy_name: "#{role_name}-policy",
+        policy_name: "#{policy_name[0..127]}", # required, limited to 128-chars
         policy_document: policy_document,
       ] unless policy_document['Statement'].empty?
 

data/lib/jets/resource/iam/class_role.rb

@@ -12,9 +12,9 @@ module Jets::Resource::Iam
       "{namespace}_iam_role".underscore
     end
 
-    def role_name
+    def policy_name
       class_namespace = replacements[:namespace].underscore.dasherize
-      "#{Jets.config.project_namespace}-#{class_namespace}-role" # camelized because used as template value
+      "#{Jets.config.project_namespace}-#{class_namespace}-policy" # camelized because used as template value
     end
 
     def replacements

data/lib/jets/resource/iam/function_role.rb

@@ -12,9 +12,9 @@ module Jets::Resource::Iam
       "{namespace}_iam_role".underscore
     end
 
-    def role_name
+    def policy_name
       funcion_namespace = replacements[:namespace].underscore.dasherize
-      "#{Jets.config.project_namespace}-#{funcion_namespace}-role" # camelized because used as template value
+      "#{Jets.config.project_namespace}-#{funcion_namespace}-policy" # camelized because used as template value
     end
 
     def replacements

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

@@ -125,10 +125,11 @@ module Jets::Resource::Lambda
       handler = full_handler(props)
       runtime = get_runtime(props)
       managed = {
-        function_name: function_name,
         handler: handler,
         runtime: runtime,
+        description: description,
       }
+      managed[:function_name] = function_name if function_name
       layers = get_layers(runtime)
       managed[:layers] = layers if layers
       props.merge!(managed)
@@ -184,6 +185,7 @@ 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"
@@ -195,7 +197,20 @@ module Jets::Resource::Lambda
       #   method: admin-pages_controller-index
       method = @app_class.underscore
       method = method.sub('/','-').gsub(/[^0-9a-z\-_]/i, '') + "-#{@task.meth}"
-      "#{Jets.config.project_namespace}-#{method}"
+      function_name = "#{Jets.config.project_namespace}-#{method}"
+      # 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
+    end
+
+    def description
+      # Example values:
+      #   @app_class: Admin/PagesController
+      #   @task.meth: index
+      # Returns:
+      #   Admin/PagesController#index
+      "#{@app_class}##{@task.meth}"
     end
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "1.5.10"
+  VERSION = "1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.6.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-18 00:00:00.000000000 Z
+date: 2019-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord