jets 3.1.0 → 4.0.0

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

@@ -16,7 +16,8 @@ class Jets::Resource::Lambda::Function
     def jets_env
       env = {}
       env[:JETS_ENV] = Jets.env.to_s
-      env[:JETS_ENV_EXTRA] = Jets.config.env_extra if Jets.config.env_extra
+      env[:JETS_ENV_EXTRA] = Jets.extra if Jets.extra # keep JETS_ENV_EXTRA for backwards compatibility
+      env[:JETS_EXTRA] = Jets.extra if Jets.extra
       env[:JETS_PROJECT_NAME] = ENV['JETS_PROJECT_NAME'] if ENV['JETS_PROJECT_NAME']
       env[:JETS_STAGE] = Jets::Resource::ApiGateway::Deployment.stage_name
       env[:JETS_AWS_ACCOUNT] = Jets.aws.account
@@ -36,21 +37,23 @@ class Jets::Resource::Lambda::Function
       exit 1
     end
 
-    # https://docs.aws.amazon.com/lambda/latest/dg/current-supported-versions.html#lambda-environment-variables
+    # https://docs.aws.amazon.com/lambda/latest/dg/configuration-envvars.html
     def reserved_variables
       %w[
         _HANDLER
+        AWS_DEFAULT_REGION
         AWS_REGION
         AWS_EXECUTION_ENV
         AWS_LAMBDA_FUNCTION_NAME
         AWS_LAMBDA_FUNCTION_MEMORY_SIZE
         AWS_LAMBDA_FUNCTION_VERSION
+        AWS_LAMBDA_INITIALIZATION_TYPE
         AWS_LAMBDA_LOG_GROUP_NAME
         AWS_LAMBDA_LOG_STREAM_NAME
+        AWS_ACCESS_KEY
         AWS_ACCESS_KEY_ID
         AWS_SECRET_ACCESS_KEY
         AWS_SESSION_TOKEN
-        TZ
         LAMBDA_TASK_ROOT
         LAMBDA_RUNTIME_DIR
         AWS_LAMBDA_RUNTIME_API

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

@@ -136,9 +136,9 @@ module Jets::Resource::Lambda
     end
 
     def get_layers(runtime)
-      return nil unless runtime =~ /^ruby/
+      return nil unless runtime =~ /^ruby/ || runtime =~ /^provided/
       return Jets.config.lambda.layers if Jets.config.gems.disable
-      
+
       ["!Ref GemLayer"] + Jets.config.lambda.layers
     end
 
@@ -208,7 +208,7 @@ module Jets::Resource::Lambda
     def get_descripton(props)
       props[:description] || default_description
     end
-      
+
     def default_description
       # Example values:
       #   @app_class: Admin/PagesController

data/lib/jets/router/route.rb

@@ -16,6 +16,22 @@ class Jets::Router
       @path = compute_path
       @to = compute_to
       @as = compute_as
+      # Pretty tricky. The @options[:mount_class] is a class that is mounted.
+      # For Grape apps, calling ActiveSupport to_json on a Grape class causes an infinite loop.
+      # Can reproduce with `GrapeApp.to_json`
+      # There's some type of collision between Grape and ActiveSupport to_json.
+      # Coerce mount_class option into a string so that when the route is serialized to JSON
+      # it is a string it won't cause an infinite loop. This allows the apigw routes to be
+      # saved to s3 and loaded back up at the end of a deploy.
+      # Related PR: smarter apigw routes paging calculation #635
+      # https://github.com/boltops-tools/jets/pull/635
+      # Debugging notes: https://gist.github.com/tongueroo/c9baa7e98d5ad68bbdd770fde4651963
+      @options[:mount_class] = @options[:mount_class].to_s if @options[:mount_class]
+    end
+
+    # Constantize back to the original class
+    def mount_class
+      @options[:mount_class].constantize
     end
 
     def compute_path
@@ -187,8 +203,8 @@ class Jets::Router
       end.to_h
     end
 
-    def mount_class
-      @options[:mount_class]
+    def to_h
+      JSON.load(to_json)
     end
 
   private

data/lib/jets/router/state.rb

@@ -0,0 +1,47 @@
+class Jets::Router
+  class State
+    extend Memoist
+    include Jets::AwsServices
+
+    def load(filename)
+      resp = s3.get_object(
+        bucket: Jets.aws.s3_bucket,
+        key: s3_storage_path(filename),
+      )
+      text = resp.body.read
+      JSON.load(text)
+    rescue
+    end
+    memoize :load
+
+    # Save previously deployed APIGW routes state
+    def save(filename, data)
+      # body = Jets::Router.routes.to_json
+      # body = JSON.generate(Jets::Cfn::Builders::PageBuilder.pages)
+      body = data.respond_to?(:to_json) ? data.to_json : JSON.generate(data)
+      s3.put_object(
+        body: body,
+        bucket: Jets.aws.s3_bucket,
+        key: s3_storage_path(filename),
+      )
+    end
+
+    # Examples:
+    #
+    #   jets/state/apigw/pages.json
+    #   jets/state/apigw/routes.json
+    #
+    # Fetch or loaded in:
+    #
+    #   pages.json: Jets::Cfn::Builders::PageBuilder#old_pages
+    #   routes.json: Jets::Resource::ApiGateway::RestApi::Routes::Change::Base#deployed_routes
+    #
+    # Saved in:
+    #
+    #   Jets::Cfn::Ship#save_apigw_state
+    #
+    def s3_storage_path(filename)
+      "jets/state/apigw/#{filename}.json"
+    end
+  end
+end

data/lib/jets/router.rb

@@ -134,6 +134,18 @@ module Jets
         drawn_router.routes
       end
 
+      # So we can save state in s3 post deploy. Example of structure.
+      #
+      #   [
+      #     {"scope"=>{"options"=>{"as"=>"posts", "prefix"=>"posts", "param"=>nil, "from"=>"resources"}, "parent"=>{"options"=>{}, "parent"=>nil, "level"=>1}, "level"=>2}, "options"=>{"to"=>"posts#index", "from_scope"=>true, "path"=>"posts", "method"=>"get"}, "path"=>"posts", "to"=>"posts#index", "as"=>"posts"},
+      #     {"scope"=>{"options"=>{"as"=>"posts", "prefix"=>"posts", "param"=>nil, "from"=>"resources"}, "parent"=>{"options"=>{}, "parent"=>nil, "level"=>1}, "level"=>2}, "options"=>{"to"=>"posts#new", "from_scope"=>true, "path"=>"posts/new", "method"=>"get"}, "path"=>"posts/new", "to"=>"posts#new", "as"=>"new_post"},
+      #     ...
+      #   ]
+      #
+      def to_json
+        JSON.dump(routes.map(&:to_h))
+      end
+
       # Returns all paths including subpaths.
       # Example:
       # Input: ["posts/:id/edit"]

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

@@ -33,6 +33,7 @@ module Jets::Stack::Main::Dsl
         runtime: :ruby,
         timeout: Jets.config.function.timeout,
         memory_size: Jets.config.function.memory_size,
+        ephemeral_storage: Jets.config.function.ephemeral_storage,
         description: description,
       }
 

data/lib/jets/tmp_loader.rb

@@ -9,7 +9,7 @@ module Jets
     def initialize(yaml_path=nil)
       yaml_path ||= "#{Jets.root}/handlers/data.yml"
       return unless File.exist?(yaml_path)
-      @data = YAML.load_file(yaml_path)
+      @data = Jets::Util::Yamler.load_file(yaml_path)
       @s3_bucket = @data['s3_bucket']
       @rack_zip = @data['rack_zip']
     end

data/lib/jets/turbo/database_yaml.rb

@@ -5,7 +5,7 @@ class Jets::Turbo
       return unless File.exist?(current_yaml)
 
       vars = {}
-      current_database = YAML.load_file(current_yaml)
+      current_database = Jets::Util::Yamler.load_file(current_yaml)
       database_names = infer_database_name(current_database)
       vars.merge!(database_names)
       vars['adapter'] = current_database['development']['adapter']

data/lib/jets/util/yamler.rb

@@ -0,0 +1,16 @@
+# Named Yamler to make it clear it's not the YAML class.
+class Jets::Util
+  class Yamler
+    class << self
+      def load(text)
+        options = RUBY_VERSION =~ /^3/ ? {aliases: true} : {} # Ruby 3.0.0 deprecates aliases: true
+        YAML.load(text, **options)
+      end
+
+      def load_file(path)
+        options = RUBY_VERSION =~ /^3/ ? {aliases: true} : {} # Ruby 3.0.0 deprecates aliases: true
+        YAML.load_file(path, **options)
+      end
+    end
+  end
+end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.1.0"
+  VERSION = "4.0.0"
 end

data/lib/jets.rb

@@ -3,6 +3,7 @@ $stdout.sync = true unless ENV["JETS_STDOUT_SYNC"] == "0"
 $:.unshift(File.expand_path("../", __FILE__))
 
 require "jets/core_ext/bundler"
+require "jets/core_ext/file"
 require "jets/autoloaders"
 Jets::Autoloaders.log! if ENV["JETS_AUTOLOAD_LOG"]
 Jets::Autoloaders.once.setup # must be called before cli.setup
@@ -17,6 +18,7 @@ require "active_support/ordered_options"
 require "cfn_camelizer"
 require "cfn_status"
 require "fileutils"
+require "json"
 require "memoist"
 require "rainbow/ext/string"
 require "serverlessgems"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 4.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-08 00:00:00.000000000 Z
+date: 2023-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -252,16 +252,16 @@ dependencies:
   name: cfn_camelizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: cfn_response
   requirement: !ruby/object:Gem::Requirement
@@ -434,16 +434,16 @@ dependencies:
   name: serverlessgems
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: shotgun
   requirement: !ruby/object:Gem::Requirement
@@ -490,16 +490,16 @@ dependencies:
   name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.6.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -590,6 +590,7 @@ files:
 - ".cody/docs/bin/subnav.sh"
 - ".cody/docs/buildspec.yml"
 - ".cody/docs/project.rb"
+- ".github/FUNDING.yml"
 - ".github/ISSUE_TEMPLATE.md"
 - ".github/ISSUE_TEMPLATE/bug_report.md"
 - ".github/ISSUE_TEMPLATE/documentation.md"
@@ -598,9 +599,7 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".gitmodules"
-- ".python-version"
 - ".rspec"
-- ".ruby-version"
 - CHANGELOG.md
 - CONDUCT.md
 - CONTRIBUTING.md
@@ -660,6 +659,7 @@ files:
 - lib/jets/cfn/builders/function_builder.rb
 - lib/jets/cfn/builders/interface.rb
 - lib/jets/cfn/builders/job_builder.rb
+- lib/jets/cfn/builders/page_builder.rb
 - lib/jets/cfn/builders/parent_builder.rb
 - lib/jets/cfn/builders/parent_builder/stagger.rb
 - lib/jets/cfn/builders/rule_builder.rb
@@ -812,6 +812,7 @@ files:
 - lib/jets/controller/stage.rb
 - lib/jets/core.rb
 - lib/jets/core_ext/bundler.rb
+- lib/jets/core_ext/file.rb
 - lib/jets/core_ext/kernel.rb
 - lib/jets/db.rb
 - lib/jets/dotenv.rb
@@ -863,6 +864,8 @@ files:
 - lib/jets/job/helpers/kinesis_event_helper.rb
 - lib/jets/job/helpers/log_event_helper.rb
 - lib/jets/job/helpers/s3_event_helper.rb
+- lib/jets/job/helpers/sns_event_helper.rb
+- lib/jets/job/helpers/sqs_event_helper.rb
 - lib/jets/klass.rb
 - lib/jets/lambda/dsl.rb
 - lib/jets/lambda/function.rb
@@ -878,7 +881,7 @@ files:
 - lib/jets/middleware/default_stack.rb
 - lib/jets/middleware/layer.rb
 - lib/jets/middleware/stack.rb
-- lib/jets/naming.rb
+- lib/jets/names.rb
 - lib/jets/overrides/lambda.rb
 - lib/jets/overrides/lambda/marshaller.rb
 - lib/jets/overrides/rails.rb
@@ -943,6 +946,7 @@ files:
 - lib/jets/resource/iam/class_role.rb
 - lib/jets/resource/iam/function_role.rb
 - lib/jets/resource/iam/managed_policy.rb
+- lib/jets/resource/iam/policy.rb
 - lib/jets/resource/iam/policy_document.rb
 - lib/jets/resource/iot/topic_rule.rb
 - lib/jets/resource/lambda/event_source_mapping.rb
@@ -983,6 +987,7 @@ files:
 - lib/jets/router/route.rb
 - lib/jets/router/route/authorizer.rb
 - lib/jets/router/scope.rb
+- lib/jets/router/state.rb
 - lib/jets/router/util.rb
 - lib/jets/rule/base.rb
 - lib/jets/rule/dsl.rb
@@ -1033,6 +1038,7 @@ files:
 - lib/jets/turbo/rails.rb
 - lib/jets/turbo/templates/config/database.yml
 - lib/jets/util.rb
+- lib/jets/util/yamler.rb
 - lib/jets/version.rb
 - readme/prerelease.md
 - readme/testing.md
@@ -1086,16 +1092,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Ruby Serverless Framework

data/.python-version

@@ -1 +0,0 @@
-3.8.6

data/.ruby-version

@@ -1 +0,0 @@
-2.7.5