jets 2.3.16 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 044aba70f94ce9b1894daf0a763d0a36bfa5687c79beed5acfebc3f1f0db6086
-  data.tar.gz: 28ce72323a8e5bb93db5598f2a2ba60b60921e3d969fb13f237384489902b734
+  metadata.gz: f937aab664b90c0d2f1ae347f54711c6ad5c2ed60109658203a34fb824af040c
+  data.tar.gz: 6ea84a0034df3635be2813ab457a5c7fb4d8bb7580f6bef7a50f913dc4f2e23b
 SHA512:
-  metadata.gz: 17888c72f237bd56a10c61ecc783ba59ec2aa8ff5345750689ebc1fa7a6d0d221bf604c6879e71cf5787baa45c36cb0b9525a015e0b4159ad7e9a46b58f95d77
-  data.tar.gz: 106ca34b5c04e3c774a27ec9431c0c7cef7b5311ae624e975ee061b31aaa7b3f536c6267d67e34d26ed1504a289b7de46d0746e54cead594c9482b62ab2f8dd8
+  metadata.gz: d0af6694a880f0179cf5a8c617fa4a6b43808bf7e4c70f070c88ad7e88f49822290342217c353ce37abf5d4885977d53983965a65813fbaf87267fe6c0f3e6ce
+  data.tar.gz: 10ce6d263675a3abbf5196f7abf72fbe0bea631bc441dbc716965021cc64e0059cfe36bcce6575be6078bc3ac64320e6e9e3eaa09bd1531726721256259dd2a8

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "vendor/cfn-status"]
-	path = vendor/cfn-status
-	url = https://github.com/tongueroo/cfn-status.git

data/.python-version

@@ -1 +1 @@
-3.6.6
+3.8.6

data/.ruby-version

@@ -1 +1 @@
-2.5.7
+2.7.2

data/CHANGELOG.md

@@ -3,6 +3,59 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [3.0.2] - 2021-01-12
+- update serverlessgems gem
+
+## [3.0.1] - 2021-01-12
+- [#524](https://github.com/boltops-tools/jets/pull/524) fix native gem detection
+
+## [3.0.0]
+* #328 i18n docs
+* #391 Deploy Option: Auto Replace API Gateway
+* #444 Ruby 2.7 Support
+* #453 Update to Bootstrap4 official release
+* #454 When the controller name is singular, the behavior of searching for the View file is different from expected.
+* #457 Breaking change: Harden IAM policy and do allow list all buckets by default. Breaking change.
+* #479 Create request completion log method
+* #487 API Gateway Base Path
+* #488 Add retry_limit and read_timeout options
+* #491 Fix queryStringParameters handling for nested value in spec_helper
+* #492 Add params keyword case with get method for spec helpers test
+* #494 Update ruby_packager.rb
+* #496 Add unicode test for spec_helpers test
+* #499 default_iam_policy does not correctly include VPC related actions on resource creation
+* Improve autoloader: Shouldnt have to to call `bundle exec` in front of jets anymore.
+* `jets configure` command
+* Big improvements to docs site, add search
+* Use serverlessgems API
+* Breaking: use do not pluralize controller names for views folder
+* Shorten SSM secrets notation support
+* Remove deprecations and warnings: bundle install, generate scaffold, webpacker, yarn license, etc
+* Also setting the `config.iam_policy` appends to the default policy now.
+* Upgrade to Rails 6.1 components
+* Increase cloudformation output limit to 200
+* Replace `--sure` with `-y` option
+* Fix params helper in views
+* Webpacker upgrade
+
+## [2.3.18]
+- #514 Allow to define route that contains dot
+- #515 set content type on upload by using extension so cloudfront will compress when serving
+- #517 support nested query params in tests
+
+## [2.3.17]
+- #472 Docs: Update cors-support.md
+- #475 Docs: Update activerecord.md to include db:create step
+- #476 Docs: Update authorizer-cognito.md
+- #482 Docs: Fixed description for "jetpacker" gem in Gemfile
+- #483 Docs: controllers Fix minor typo
+- #489 Docs: call typo
+- #490 Docs: authorizers typo
+- #504 Docs: tutorial series
+- #505 Docs: display more tutorial articles
+- #509 Docs: Update lamdba permissions for minimal-iam-policy doc
+- #512 Bug fix: fix on_lambda? check allow testing #512
+
 ## [2.3.16]
 - #466 fix application_config typo
 - #467 Handle forbidden error from s3

data/README.md

@@ -5,10 +5,10 @@
 Ruby and Lambda splat out a baby and that child's name is [Jets](http://rubyonjets.com/).
 
 ![Build Status](https://codebuild.us-west-2.amazonaws.com/badges?uuid=eyJlbmNyeXB0ZWREYXRhIjoiZ08vK2hjOHczQUVoUDhSYnBNNUU4T0gxQWJuOTlLaXpwVGQ1NjJ3NnVDY1dSdFVXQ3d2VXVSQzRFcU1qd1JPMndFZlByRktIcTUrZm5GWlM5dHpjM1ZrPSIsIml2UGFyYW1ldGVyU3BlYyI6Imluc1Qrd25GanhUdHlidjUiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
-[![CircleCI](https://circleci.com/gh/tongueroo/jets.svg?style=svg)](https://circleci.com/gh/tongueroo/jets)
+[![CircleCI](https://circleci.com/gh/boltops-tools/jets.svg?style=svg)](https://circleci.com/gh/boltops-tools/jets)
 [![Gem Version](https://badge.fury.io/rb/jets.svg)](https://badge.fury.io/rb/jets)
 [![Support](https://img.shields.io/badge/Support-Help-blue.svg)](http://rubyonjets.com/support/)
-[![Gitter Chat](https://badges.gitter.im/tongueroo/jets.png)](https://gitter.im/tongueroo/jets)
+[![Gitter Chat](https://badges.gitter.im/boltops-tools/jets.png)](https://gitter.im/boltops-tools/jets)
 
 [![BoltOps Badge](https://img.boltops.com/boltops/badges/boltops-badge.png)](https://www.boltops.com)
 

data/backers.md

@@ -15,4 +15,6 @@ Funds donated via Patreon go directly to support Tung Nguyen's full-time work on
 - Nate Clark
 - Hirokatsu Endo
 - Michael Choi
+- Phan Lam
+- Theron Welch
 <!--10 end-->

data/jets.gemspec

@@ -27,11 +27,11 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "actionmailer", "~> 6.0.0"
-  spec.add_dependency "actionpack", "~> 6.0.0"
-  spec.add_dependency "actionview", "~> 6.0.0"
-  spec.add_dependency "activerecord", "~> 6.0.0"
-  spec.add_dependency "activesupport", "~> 6.0.0"
+  spec.add_dependency "actionmailer", "~> 6.1.0"
+  spec.add_dependency "actionpack", "~> 6.1.0"
+  spec.add_dependency "actionview", "~> 6.1.0"
+  spec.add_dependency "activerecord", "~> 6.1.0"
+  spec.add_dependency "activesupport", "~> 6.1.0"
   spec.add_dependency "aws-mfa-secure", "~> 0.4.0"
   spec.add_dependency "aws-sdk-apigateway"
   spec.add_dependency "aws-sdk-cloudformation"
@@ -43,27 +43,29 @@ Gem::Specification.new do |spec|
   spec.add_dependency "aws-sdk-sns"
   spec.add_dependency "aws-sdk-sqs"
   spec.add_dependency "aws-sdk-ssm"
+  spec.add_dependency "cfn-status"
   spec.add_dependency "cfn_camelizer", "~> 0.4.6"
-  spec.add_dependency "cfnresponse"
+  spec.add_dependency "cfn_response"
   spec.add_dependency "dotenv"
   spec.add_dependency "gems" # jets-gems dependency
   spec.add_dependency "hashie"
-  spec.add_dependency "jets-gems"
   spec.add_dependency "jets-html-sanitizer"
   spec.add_dependency "kramdown"
   spec.add_dependency "memoist"
   spec.add_dependency "mimemagic"
   spec.add_dependency "rack"
-  spec.add_dependency "railties", "~> 6.0.0" # for ActiveRecord database_tasks.rb
+  spec.add_dependency "railties", "~> 6.1.0" # for ActiveRecord database_tasks.rb
   spec.add_dependency "rainbow"
   spec.add_dependency "recursive-open-struct"
+  spec.add_dependency "serverlessgems", "~> 0.1.2"
   spec.add_dependency "shotgun"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"
   spec.add_dependency "zeitwerk"
 
-  spec.add_development_dependency "byebug"
   spec.add_development_dependency "bundler"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "render_me_pretty"
   spec.add_development_dependency "rspec"
 end

data/lib/jets.rb

@@ -1,6 +1,13 @@
 $stdout.sync = true unless ENV["JETS_STDOUT_SYNC"] == "0"
 
 $:.unshift(File.expand_path("../", __FILE__))
+
+require "jets/core_ext/bundler"
+require "jets/autoloaders"
+Jets::Autoloaders.log! if ENV["JETS_AUTOLOAD_LOG"]
+Jets::Autoloaders.once.setup # must be called before cli.setup
+Jets::Autoloaders.cli.setup
+
 require "active_support"
 require "active_support/concern"
 require "active_support/core_ext"
@@ -8,24 +15,13 @@ require "active_support/dependencies"
 require "active_support/ordered_hash"
 require "active_support/ordered_options"
 require "cfn_camelizer"
+require "cfn_status"
 require "fileutils"
-require "jets/gems"
 require "memoist"
 require "rainbow/ext/string"
-
-gem_root = File.dirname(__dir__)
-$:.unshift("#{gem_root}/lib")
-$:.unshift("#{gem_root}/vendor/cfn-status/lib")
-require "cfn_status"
-
-require "jets/core_ext/bundler"
-
-require "jets/autoloaders"
-Jets::Autoloaders.log! if ENV["JETS_AUTOLOAD_LOG"]
-Jets::Autoloaders.once.setup
+require "serverlessgems"
 
 module Jets
-  RUBY_VERSION = "2.5.3"
   MAX_FUNCTION_NAME_SIZE = 64
 
   class Error < StandardError; end

data/lib/jets/application.rb

@@ -22,6 +22,7 @@ class Jets::Application
     load_environments_config
     load_db_config
     set_iam_policy # relies on dependent values, must be called afterwards
+    set_time_zone
     normalize_env_vars!
   end
 
@@ -64,7 +65,7 @@ class Jets::Application
     return ENV['JETS_PROJECT_NAME'] if ENV['JETS_PROJECT_NAME'] # override
 
     lines = IO.readlines("#{Jets.root}/config/application.rb")
-    project_name_line = lines.find { |l| l =~ /config\.project_name.*=/ }
+    project_name_line = lines.find { |l| l =~ /config\.project_name.*=/ && l !~ /^\s+#/ }
     project_name_line.gsub(/.*=/,'').strip.gsub(/["']/,'') # project_name
   end
 
@@ -175,10 +176,16 @@ class Jets::Application
   end
 
   def set_iam_policy
-    config.iam_policy ||= self.class.default_iam_policy
+    config.iam_policy ||= []
+    config.default_iam_policy ||= self.class.default_iam_policy
+    config.iam_policy = config.default_iam_policy | config.iam_policy
     config.managed_policy_definitions ||= [] # default empty
   end
 
+  def set_time_zone
+    Time.zone_default = Time.find_zone!(config.time_zone)
+  end
+
   # It is pretty easy to attempt to set environment variables without
   # the correct AWS Environment.Variables path struture.
   # Auto-fix it for convenience.

data/lib/jets/application/defaults.rb

@@ -10,18 +10,12 @@ class Jets::Application
           effect: "Allow",
           resource: "arn:aws:logs:#{Jets.aws.region}:#{Jets.aws.account}:log-group:/aws/lambda/#{project_namespace}-*",
         }
-        s3_bucket = Jets.aws.s3_bucket
         s3_readonly = {
-          action: ["s3:Get*", "s3:List*"],
+          action: ["s3:Get*", "s3:List*", "s3:HeadBucket"],
           effect: "Allow",
-          resource: "arn:aws:s3:::#{s3_bucket}*",
+          resource: "arn:aws:s3:::#{Jets.aws.s3_bucket}*",
         }
-        s3_bucket = {
-          action: ["s3:ListAllMyBuckets", "s3:HeadBucket"],
-          effect: "Allow",
-          resource: "arn:aws:s3:::*", # scoped to all buckets
-        }
-        policies = [logs, s3_readonly, s3_bucket]
+        policies = [logs, s3_readonly]
 
         cloudformation = {
           action: ["cloudformation:DescribeStacks", "cloudformation:DescribeStackResources"],
@@ -57,6 +51,7 @@ class Jets::Application
       config.autoload_paths = [] # allows for customization
       config.ignore_paths = [] # allows for customization
       config.logger = Jets::Logger.new($stderr)
+      config.time_zone = "UTC"
 
       # function properties defaults
       config.function = ActiveSupport::OrderedOptions.new
@@ -73,9 +68,9 @@ class Jets::Application
       config.prewarm.rack_ratio = 5
 
       config.gems = ActiveSupport::OrderedOptions.new
-      config.gems.sources = [
-        Jets.default_gems_source
-      ]
+      config.gems.clean = false
+      config.gems.disable = false
+      config.gems.source = "https://api.serverlessgems.com/api/v1"
 
       config.inflections = ActiveSupport::OrderedOptions.new
       config.inflections.irregular = {}
@@ -95,12 +90,13 @@ class Jets::Application
       config.session.options = {}
 
       config.api = ActiveSupport::OrderedOptions.new
+      config.api.api_key_required = false # Turn off API key required
       config.api.authorization_type = "NONE"
-      config.api.cors_authorization_type = nil # nil so ApiGateway::Cors#cors_authorization_type handles
+      config.api.auto_replace = nil # https://github.com/boltops-tools/jets/issues/391
       config.api.binary_media_types = ['multipart/form-data']
-      config.api.endpoint_type = 'EDGE' # PRIVATE, EDGE, REGIONAL
+      config.api.cors_authorization_type = nil # nil so ApiGateway::Cors#cors_authorization_type handles
       config.api.endpoint_policy = nil # required when endpoint_type is EDGE
-      config.api.api_key_required = false # Turn off API key required
+      config.api.endpoint_type = 'EDGE' # PRIVATE, EDGE, REGIONAL
 
       config.api.authorizers = ActiveSupport::OrderedOptions.new
       config.api.authorizers.default_token_source = "Auth" # method.request.header.Auth
@@ -151,6 +147,9 @@ class Jets::Application
       config.controllers.default_protect_from_forgery = nil
       config.controllers.filtered_parameters = []
 
+      config.app = ActiveSupport::OrderedOptions.new
+      config.app.domain = nil
+
       config.deploy = ActiveSupport::OrderedOptions.new
       config.deploy.stagger = ActiveSupport::OrderedOptions.new
       config.deploy.stagger.enabled = false
@@ -158,6 +157,9 @@ class Jets::Application
 
       config.hot_reload = Jets.env.development?
 
+      config.ruby = ActiveSupport::OrderedOptions.new
+      config.ruby.check = true
+
       config
     end
 

data/lib/jets/autoloaders.rb

@@ -3,6 +3,8 @@ Jets::Bundle.setup
 require "zeitwerk"
 
 module Jets
+  module Commands ; end
+
   module Autoloaders
     class OnceInflector < Zeitwerk::Inflector
       def camelize(basename, _abspath)
@@ -21,6 +23,7 @@ module Jets
       def log!
         main.log!
         once.log!
+        cli.log!
       end
 
       def main
@@ -56,6 +59,17 @@ module Jets
       end
       memoize :once
 
+      def cli
+        Zeitwerk::Loader.new.tap do |loader|
+          loader.tag = "jets.cli"
+          loader.inflector = OnceInflector.new
+
+          loader.push_dir("#{__dir__}/commands", namespace: Jets::Commands)
+          loader.ignore("#{__dir__}/commands/templates*")
+        end
+      end
+      memoize :cli
+
     private
       def internal_app_paths
         %w[
@@ -84,7 +98,7 @@ module Jets
           builders/rackup_wrappers
           builders/reconfigure_rails
           builders/templates
-          commands/templates
+          commands
           controller/middleware/webpacker_setup.rb
           core_ext
           internal

data/lib/jets/booter.rb

@@ -83,7 +83,7 @@ class Jets::Booter
       # using ActiveRecord rake tasks outside of Rails.
       ActiveRecord::Tasks::DatabaseTasks.database_configuration = db_configs
 
-      if db_configs[Jets.env].blank?
+      if db_configs.configs_for(env_name: Jets.env).blank?
         abort("ERROR: config/database.yml exists but no environment section configured for #{Jets.env}")
       end
       ActiveRecord::Base.configurations = db_configs
@@ -96,9 +96,9 @@ class Jets::Booter
     # the same.
     def connect_db
       primary_hash_config = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env).find { |hash_config|
-        hash_config.spec_name == "primary"
+        hash_config.name == "primary"
       }
-      primary_config = primary_hash_config.config # config is a normal Ruby Hash
+      primary_config = primary_hash_config.configuration_hash # configuration_hash is a normal Ruby Hash
       ActiveRecord::Base.establish_connection(primary_config)
     end
 

data/lib/jets/builders/code_builder.rb

@@ -373,28 +373,29 @@ module Jets::Builders
       end
     end
 
-    def check_ruby_version
-      unless ruby_version_supported?
-        puts "You are using Ruby version #{RUBY_VERSION} which is not supported by Jets."
-        ruby_variant = Jets::RUBY_VERSION.split('.')[0..1].join('.') + '.x'
-        abort("Jets uses Ruby #{Jets::RUBY_VERSION}.  You should use a variant of Ruby #{ruby_variant}".color(:red))
-      end
-    end
-
     def copy_ruby_version_file
       ruby_version_path = Jets.root.join(".ruby-version")
       return unless File.exists?(ruby_version_path)
       FileUtils.cp_r(ruby_version_path, build_area)
     end
 
-    def ruby_version_supported?
-      pattern = /(\d+)\.(\d+)\.(\d+)/
-      md = RUBY_VERSION.match(pattern)
-      ruby = {major: md[1], minor: md[2]}
-      md = Jets::RUBY_VERSION.match(pattern)
-      jets = {major: md[1], minor: md[2]}
+    SUPPORTED_RUBY_VERSIONS = %w[2.5 2.7]
+    def check_ruby_version
+      return unless ENV['JETS_RUBY_CHECK'] == '0' || Jets.config.ruby.check == false
+      return if ruby_version_supported?
+      puts <<~EOL.color(:red)
+      You are using Ruby version #{RUBY_VERSION} which is not supported by Jets.
+      Please use one of the Jets supported ruby versions: #{SUPPORTED_RUBY_VERSIONS.join(' ')}
+      If you would like to skip this check you can set: JETS_RUBY_CHECK=0
+      EOL
+      exit 1
+    end
 
-      ruby[:major] == jets[:major] && ruby[:minor] == jets[:minor]
+    def ruby_version_supported?
+      md = RUBY_VERSION.match(/(\d+)\.(\d+)\.\d+/)
+      major, minor = md[1], md[2]
+      detected_ruby = [major, minor].join('.')
+      SUPPORTED_RUBY_VERSIONS.include?(detected_ruby)
     end
 
     # Group all the path settings together here

data/lib/jets/builders/gem_replacer.rb

@@ -17,19 +17,30 @@ module Jets::Builders
       end
 
       # found gems will only have gems that were found
-      found_gems.each do |gem_name, source|
-        options = @options.merge(source_url: source)
-        gem_extractor = Jets::Gems::Extract::Gem.new(gem_name, options)
+      found_gems.each do |gem_name|
+        gem_extractor = Jets::Gems::Extract::Gem.new(gem_name, @options)
         gem_extractor.run
+        rename_gem(gem_name)
       end
 
       tidy
     end
 
+    def rename_gem(gem_name)
+      ruby_folder = "#{Jets.build_root}/stage/opt/ruby/gems/#{Jets::Gems.ruby_folder}"
+      gems_folder = "#{ruby_folder}/gems"
+      expr = "#{gems_folder}/#{gem_name}-x*-{darwin,linux}"
+      src = Dir.glob(expr).first
+      return unless src
+
+      dest = src.sub("-darwin", "-linux")
+      FileUtils.mv(src, dest) unless File.exist?(dest) # looks like rename_gem actually runs twice
+    end
+
     def sh(command)
       puts "=> #{command}".color(:green)
       success = system(command)
-      abort("Command Failed") unless success
+      abort("Command Failed: #{command}") unless success
       success
     end