jets 3.1.2 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bb051dfd639163f3f633fbf6573d327ee67e802647d506da22c85733244a563
-  data.tar.gz: 4100d9d52b33f989af9fc8098a97e8214976525cda351b03e388e7111b4dd764
+  metadata.gz: fc8976a98ceaa55f97512b3b0e78cec5f28e1d0ade29d23270894cbcfa1ef5c3
+  data.tar.gz: 149caed9e86daea3f45e745e6f32c28aa0a15b6b938237305e41bc85c774adc4
 SHA512:
-  metadata.gz: 0e249bf85b0fea5d5378e74938a9cf711beb25d24878427de1d18f72f807a56636ffc1db1acbc3e134099c4c4ffec743b8f7d3176a3a63be12f386580bc5828b
-  data.tar.gz: 0572c04c62eb4fe6a152787b3e9055df137c29f8ddc792584d7c85b9389565056f0c2d1fa78501a8fe9b38557af429da74961b41ec24284396033c31698ca2fc
+  metadata.gz: e9a49470b973e8b927c5921a5e373f18d66141d2af0c288fa6a2d0cac4f59fa7a534e1e52bf949d56482f8987843b9f5628d3699f0c27cf4c9cc9f271d6a33c8
+  data.tar.gz: 43e8734b1f3e7b2a7cfb16a1c4d74957fac5e4c1deb090d816d003655775374a8e3c03d473dbd7bc2166a05412562d74f811fe6dbe944237a958c9428f76167a

data/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: boltops-tools

data/CHANGELOG.md

@@ -3,6 +3,17 @@
 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.1.5] - 2022-08-08
+- [#628](https://github.com/boltops-tools/jets/pull/628) Multiple Databases
+- [#629](https://github.com/boltops-tools/jets/pull/629) loosen zeitwerk dependency in generated project Gemfile
+- [#630](https://github.com/boltops-tools/jets/pull/630) compile assets with WEBPACKER_ASSET_HOST as s3 endpoint url
+
+## [3.1.4] - 2022-07-02
+- [#627](https://github.com/boltops-tools/jets/pull/627) use >= for most gem dependencies
+
+## [3.1.3] - 2022-06-29
+- [#626](https://github.com/boltops-tools/jets/pull/626) aws options to better handle rate limit for base path mapping
+
 ## [3.1.2] - 2022-04-24
 - [#618](https://github.com/boltops-tools/jets/pull/618) Jets Console accepts environment cli argument
 - [#621](https://github.com/boltops-tools/jets/pull/621) Add SQS and SNS event helpers for jobs

data/jets.gemspec

@@ -44,7 +44,7 @@ Gem::Specification.new do |spec|
   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 "cfn_camelizer", ">= 0.4.9"
   spec.add_dependency "cfn_response"
   spec.add_dependency "dotenv"
   spec.add_dependency "gems" # jets-gems dependency
@@ -57,11 +57,11 @@ Gem::Specification.new do |spec|
   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.4"
+  spec.add_dependency "serverlessgems", ">= 0.2.0"
   spec.add_dependency "shotgun"
   spec.add_dependency "text-table"
   spec.add_dependency "thor"
-  spec.add_dependency "zeitwerk", "~> 2.5.0"
+  spec.add_dependency "zeitwerk", ">= 2.6.0"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "byebug"

data/lib/jets/application/defaults.rb

@@ -77,10 +77,11 @@ class Jets::Application
       config.inflections.irregular = {}
 
       config.assets = ActiveSupport::OrderedOptions.new
-      config.assets.folders = %w[assets images packs]
       config.assets.base_url = nil # IE: https://cloudfront.com/my/base/path
-      config.assets.max_age = 3600
       config.assets.cache_control = nil # IE: public, max-age=3600 , max_age is a shorter way to set cache_control.
+      config.assets.folders = %w[assets images packs]
+      config.assets.max_age = 3600
+      config.assets.webpacker_asset_host = "s3_endpoint"  # true = use conventional by default
 
       config.ruby = ActiveSupport::OrderedOptions.new
 

data/lib/jets/booter.rb

@@ -94,11 +94,23 @@ class Jets::Booter
     # `show processlist` until after a query. Have confirmed that the connection is reused and the connection count stays
     # the same.
     def connect_db
-      primary_hash_config = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env).find { |hash_config|
-        hash_config.name == "primary"
-      }
-      primary_config = primary_hash_config.configuration_hash # configuration_hash is a normal Ruby Hash
-      ActiveRecord::Base.establish_connection(primary_config)
+      if ActiveRecord::Base.legacy_connection_handling
+        primary_hash_config = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env).find { |hash_config|
+          hash_config.name == "primary"
+        }
+  
+        primary_config = primary_hash_config.configuration_hash # configuration_hash is a normal Ruby Hash
+
+        ActiveRecord::Base.establish_connection(primary_config)
+      else
+        configs = ActiveRecord::Base.configurations.configs_for(env_name: Jets.env, include_replicas: true)
+
+        databases = { }
+        databases[:writing] = :primary if configs.any? { |config| config.name == "primary" }
+        databases[:reading] = :primary_replica if configs.any? { |config| config.name == "primary_replica" }
+
+        ActiveRecord::Base.connects_to database: databases
+      end
     end
 
     def load_internal_turbines

data/lib/jets/builders/code_builder.rb

@@ -205,12 +205,45 @@ module Jets::Builders
       return unless webpacker_included?
 
       sh("yarn install")
+
+      ENV['WEBPACKER_ASSET_HOST'] = webpacker_asset_host if Jets.config.assets.webpacker_asset_host
       webpack_command = File.exist?("#{Jets.root}/bin/webpack") ?
           "bin/webpack" :
           `which webpack`.strip
       sh "JETS_ENV=#{Jets.env} #{webpack_command}"
     end
 
+    # Different url for these. Examples:
+    #
+    #   webpacker_asset_host https://demo-dev-s3bucket-lw5vq7ht8ip4.s3.us-west-2.amazonaws.com/jets/public/packs/media/images/boltops-0dd1c6bd.png
+    #   s3_base_url          https://s3-us-west-2.amazonaws.com/demo-dev-s3bucket-lw5vq7ht8ip4/jets/packs/media/images/boltops-0dd1c6bd.png
+    #
+    # Interesting: webpacker_asset_host works but s3_base_url does not for CORs. IE: reactjs or vuejs requests
+    # Thinking AWS configures the non-subdomain url endpoint to be more restrictive.
+    #
+    def webpacker_asset_host
+      # Allow user to set assets.webpacker_asset_host
+      #
+      #   Jets.application.configure do
+      #     config.assets.webpacker_asset_host = "https://cloudfront.com/my/base/path"
+      #   end
+      #
+      assets = Jets.config.assets
+      return assets.webpacker_asset_host if assets.webpacker_asset_host && assets.webpacker_asset_host != "s3_endpoint"
+      return assets.base_url if assets.base_url
+
+      # By default, will use the s3 url endpoint directly by convention
+      return unless assets.webpacker_asset_host == "s3_endpoint"
+
+      region = Jets.aws.region
+
+      asset_base_url = region == 'us-east-1' ?
+        "https://#{s3_bucket}.s3.amazonaws.com" :
+        "https://#{s3_bucket}.s3.#{region}.amazonaws.com"
+
+      "#{asset_base_url}/jets/public" # s3_base_url
+    end
+
     def webpacker_included?
       # Old code, leaving around for now:
       # Thanks: https://stackoverflow.com/questions/4195735/get-list-of-gems-being-used-by-a-bundler-project

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

@@ -18,7 +18,7 @@ gem "mysql2", "~> 0.5.3"
 <% unless options[:mode] == 'job' -%>
 gem "dynomite"
 <% end -%>
-gem "zeitwerk", "~> 2.5.0"
+gem "zeitwerk", ">= 2.5.0"
 
 # development and test groups are not bundled as part of the deployment
 group :development, :test do

data/lib/jets/internal/app/functions/jets/base_path_mapping.rb

@@ -91,10 +91,22 @@ class BasePathMapping
   end
 
   def apigateway
-    @apigateway ||= Aws::APIGateway::Client.new
+    @apigateway ||= Aws::APIGateway::Client.new(aws_options)
   end
 
   def cfn
-    @cfn ||= Aws::CloudFormation::Client.new
+    @cfn ||= Aws::CloudFormation::Client.new(aws_options)
+  end
+
+  def aws_options
+    options = {
+      retry_limit: 7, # default: 3
+      retry_base_delay: 0.6, # default: 0.3
+    }
+    options.merge!(
+      log_level: :debug,
+      logger: Logger.new($stdout),
+    ) if ENV['JETS_DEBUG_AWS_SDK']
+    options
   end
 end

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "3.1.2"
+  VERSION = "3.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-04-24 00:00:00.000000000 Z
+date: 2022-08-08 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"