jets 1.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20fa97bccfb5b99e19a2edcf301bf31e53cd433a13862114fcb9648880e11fcc
-  data.tar.gz: 124710223a460aed3a74a7498e2d2a15e5227c820d20a59db639ce83bdf2fb73
+  metadata.gz: 85ff84fd12cbc8c033636dae3eb3cf3b332389a28c611353a5167837622f7fc4
+  data.tar.gz: 492d4d772344cf8e329d02194a52aa6490bb7e47fb5f9e494332ee498f891be7
 SHA512:
-  metadata.gz: d6ce23cf7b443de33af876d2ac178eaaa2faca79eb5b70188cedd726861478cb030f4dbcab3d03a894f271878a7d4b1923e9bef1555db97faebc4b34aa5cfb36
-  data.tar.gz: b415939caba3f43bd03a5c10e47263ca2cd5adb0ebd01c7e76e495b3d09d25228863f51c83b9ece4eee865a0aa6ce5b64f1de3c6ac29234f55c0cde2d3ee0581
+  metadata.gz: 899243a605ac1e19c670b14967947605617b86ff347edda853742c091d62b5771a12222d0f34e834d680da4066ea4363eab677ae76ee9b35a87cd596ddec34b6
+  data.tar.gz: db515e009cda35564ae4c7fcf757d0fbbe910494a7427867ba6df725ed3b4cddbba308b33c34bbbc54b14ed38a4d2d60a950738b9ecdf1da3895d32e464898b0

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 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.2.0]
+- major upgrades: binary support, custom domain, bluegreen
+- binary support
+- custom domains support: http://rubyonjets.com/docs/routing-custom-domain/
+- automated bluegreen deploy for api gateway when needed: http://rubyonjets.com/docs/blue-green-deployment/
+- Merge pull request #84 from tongueroo/bluegreen
+
 ## [1.1.5]
 - Support multiple path parameters. Also allow path parameters to hold any value other than '/'.
 - Merge pull request #82 from adam-harwood/master

data/Gemfile.lock

@@ -11,11 +11,12 @@ GIT
 PATH
   remote: .
   specs:
-    jets (1.1.5)
+    jets (1.2.0)
       actionpack (>= 5.2.1)
       actionview (>= 5.2.1)
       activerecord (>= 5.2.1)
       activesupport (>= 5.2.1)
+      aws-sdk-apigateway
       aws-sdk-cloudformation
       aws-sdk-cloudwatchlogs
       aws-sdk-dynamodb
@@ -65,28 +66,31 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     aws-eventstream (1.0.1)
-    aws-partitions (1.118.0)
+    aws-partitions (1.121.0)
+    aws-sdk-apigateway (1.23.0)
+      aws-sdk-core (~> 3, >= 3.39.0)
+      aws-sigv4 (~> 1.0)
     aws-sdk-cloudformation (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-cloudwatchlogs (1.12.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-core (3.41.0)
+    aws-sdk-core (3.42.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-dynamodb (1.17.0)
+    aws-sdk-dynamodb (1.18.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-kms (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-lambda (1.15.0)
+    aws-sdk-lambda (1.16.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.27.0)
+    aws-sdk-s3 (1.29.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)

data/README/testing.md

@@ -16,7 +16,9 @@ To run the integration tests locally, you need to create a new Jets CRUD project
 
     jets new demo
     cd demo
+    # edit Gemfile to use the branch of jets being tested
     jets generate scaffold Post title:string
+    jets import:rails http://github.com/tongueroo/demo-rails.git
     jets server --no-reload
 
 Then you can run the postman tests:
@@ -40,12 +42,14 @@ Then you can deploy the jets app and test it on real AWS Lambda.
 
 Run the remote integration script:
 
+    eval "export $(cat demo/.env.development.remote)" # for DATABASE_URL for mega mode
     BASE_URL=xxx spec/integration/remote.sh
 
 Example:
 
+    eval "export $(cat demo/.env.development.remote)" # for DATABASE_URL for mega mode
     BASE_URL=https://wb5dcjc09a.execute-api.us-west-2.amazonaws.com/dev spec/integration/remote.sh
 
 ## Manual Test
 
-Test books create, update and delete manually until it's scripted.
+Test books create, update and delete manually until it's scripted.

data/jets.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "actionview", ">= 5.2.1"
   spec.add_dependency "activerecord", ">= 5.2.1"
   spec.add_dependency "activesupport", ">= 5.2.1"
+  spec.add_dependency "aws-sdk-apigateway"
   spec.add_dependency "aws-sdk-cloudformation"
   spec.add_dependency "aws-sdk-cloudwatchlogs"
   spec.add_dependency "aws-sdk-dynamodb"

data/lib/jets.rb

@@ -1,8 +1,12 @@
 $:.unshift(File.expand_path("../", __FILE__))
 require "jets/version"
 require "jets/camelizer"
-require "active_support/core_ext/string"
+require "active_support"
+require "active_support/core_ext"
+require "active_support/dependencies"
 require "active_support/ordered_hash"
+require "active_support/ordered_options"
+require "active_support/concern"
 require "colorize"
 require "fileutils"
 require "memoist"

data/lib/jets/application.rb

@@ -1,4 +1,3 @@
-require "active_support/ordered_options"
 require "singleton"
 require "rack"
 
@@ -13,7 +12,10 @@ class Jets::Application
   end
 
   def setup!
-    load_configs # load config object so following methods can use it
+    load_configs
+  end
+
+  def finish!
     load_inflections
     setup_auto_load_paths
     load_routes
@@ -31,14 +33,7 @@ class Jets::Application
     config = ActiveSupport::OrderedOptions.new
     config.project_name = project_name
     config.cors = true
-    config.autoload_paths = %w[
-                              app/controllers
-                              app/models
-                              app/jobs
-                              app/rules
-                              app/helpers
-                              app/shared/resources
-                            ]
+    config.autoload_paths = default_autoload_paths
     config.extra_autoload_paths = []
 
     # function properties defaults
@@ -80,8 +75,14 @@ class Jets::Application
 
     config.api = ActiveSupport::OrderedOptions.new
     config.api.authorization_type = "NONE"
+    config.api.binary_media_types = ['multipart/form-data']
     config.api.endpoint_type = 'EDGE' # PRIVATE, EDGE, REGIONAL
 
+    config.domain = ActiveSupport::OrderedOptions.new
+    # config.domain.name = "#{Jets.project_namespace}.coolapp.com" # Default is nil
+    # config.domain.cert_arn = "..."
+    config.domain.endpoint_type = "REGIONAL" # EDGE or REGIONAL. Default to EDGE because CloudFormation update is faster
+
     config
   end
 
@@ -110,7 +111,14 @@ class Jets::Application
 
   def eval_app_config
     app_config = "#{Jets.root}config/application.rb"
-    require app_config
+    load app_config # use load instead of require so reload_configs! works
+  end
+
+  # After the mimimal template gets build, we need to reload it for the full stack
+  # creation. This allows us to reference IAM policies configs that depend on the
+  # creation of the s3 bucket.
+  def reload_configs!
+    load_configs
   end
 
   def load_environments_config
@@ -129,12 +137,31 @@ class Jets::Application
 
   def setup_auto_load_paths
     autoload_paths = config.autoload_paths + config.extra_autoload_paths
-    autoload_paths = autoload_paths.uniq.map { |p| "#{Jets.root}#{p}" }
     # internal_autoload_paths are last
     autoload_paths += internal_autoload_paths
     ActiveSupport::Dependencies.autoload_paths += autoload_paths
   end
 
+  # Essentially folders under app folder will be the default_autoload_paths. Example:
+  #   app/controllers
+  #   app/helpers
+  #   app/jobs
+  #   app/models
+  #   app/rules
+  #   app/shared/resources
+  def default_autoload_paths
+    paths = []
+    Dir.glob("#{Jets.root}app/*").each do |p|
+      p.sub!('./','')
+      paths << p unless exclude_autoload_path?(p)
+    end
+    paths
+  end
+
+  def exclude_autoload_path?(path)
+    path =~ %r{app/javascript} || path =~ %r{app/views}
+  end
+
   def internal_autoload_paths
     internal = File.expand_path("../internal", __FILE__)
     paths = %w[
@@ -175,13 +202,6 @@ class Jets::Application
     config.managed_policy_definitions ||= [] # default empty
   end
 
-  # After the mimimal template gets build, we need to reload it for the full stack
-  # creation. This allows us to reference IAM policies configs that depend on the
-  # creation of the s3 bucket.
-  def reload_configs!
-    load_configs
-  end
-
   def self.default_iam_policy
     project_namespace = Jets.project_namespace
     logs = {

data/lib/jets/aws_services.rb

@@ -1,3 +1,4 @@
+require "aws-sdk-apigateway"
 require "aws-sdk-cloudformation"
 require "aws-sdk-cloudwatchlogs"
 require "aws-sdk-lambda"
@@ -11,21 +12,26 @@ module Jets::AwsServices
   include StackStatus
   extend Memoist
 
+  def apigateway
+    Aws::APIGateway::Client.new
+  end
+  memoize :apigateway
+
   def cfn
     Aws::CloudFormation::Client.new
   end
   memoize :cfn
 
-  def logs
-    Aws::CloudWatchLogs::Client.new
-  end
-  memoize :logs
-
   def lambda
     Aws::Lambda::Client.new
   end
   memoize :lambda
 
+  def logs
+    Aws::CloudWatchLogs::Client.new
+  end
+  memoize :logs
+
   def s3
     Aws::S3::Client.new
   end
@@ -36,13 +42,13 @@ module Jets::AwsServices
   end
   memoize :s3_resource
 
-  def sts
-    Aws::STS::Client.new
-  end
-  memoize :sts
-
   def sns
     Aws::SNS::Client.new
   end
   memoize :sns
+
+  def sts
+    Aws::STS::Client.new
+  end
+  memoize :sts
 end

data/lib/jets/aws_services/stack_status.rb

@@ -48,5 +48,12 @@ module Jets::AwsServices
         true
       end
     end
+
+    # Lookup output value.
+    # Used in Jets::Resource::ApiGateway::RestApi::* andJets::Commands::Url
+    def lookup(outputs, key)
+      out = outputs.find { |o| o.output_key == key }
+      out&.output_value
+    end
   end
 end

data/lib/jets/booter.rb

@@ -7,10 +7,14 @@ class Jets::Booter
       confirm_jets_project!
       require_bundle_gems
       Jets::Dotenv.load!
-      Jets.application # triggers Application.instance setup # autoload_paths, routes, etc
-      setup_db
+
+      Jets.application.setup!
       app_initializers
       turbine_initializers
+      Jets.application.finish!
+
+      Jets.eager_load!
+      setup_db
       # build_middleware_stack # TODO: figure out how to build middleware during Jets.boot without breaking jets new and webpacker:install
 
       @booted = true

data/lib/jets/builders/code_builder.rb

@@ -165,12 +165,26 @@ class Jets::Builders
       update_lazy_load_config # at the top, must be called before Jets.lazy_load? is used
       store_s3_base_url
       disable_webpacker_middleware
+      copy_internal_jets_code
       setup_tmp
       calculate_md5s # must be called before generate_node_shims and create_zip_files
       generate_node_shims
       create_zip_files
     end
 
+    # We copy the files into the project because we cannot require simple functions
+    # directly since they are wrapped by an anonymous class.
+    # TODO: Do this with the other files we required the same way.
+    def copy_internal_jets_code
+      files = []
+      files.each do |relative_path|
+        src = File.expand_path("../internal/#{relative_path}", File.dirname(__FILE__))
+        dest = "#{full(tmp_code)}/#{relative_path}"
+        FileUtils.mkdir_p(File.dirname(dest))
+        FileUtils.cp(src, dest)
+      end
+    end
+
     def update_lazy_load_config
       size_limit = AWS_CODE_SIZE_LIMIT
       code_size = dir_size(full(tmp_code))

data/lib/jets/builders/handler_generator.rb

@@ -18,6 +18,7 @@ class Jets::Builders
       app_ruby_shims
       poly_shims
       shared_shims
+      internal_shims
     end
 
     def app_ruby_shims
@@ -67,6 +68,20 @@ class Jets::Builders
       end
     end
 
+    def internal_shims
+      jets_base_path if Jets.custom_domain?
+    end
+
+    def jets_base_path
+      path = "jets/base_path.rb"
+      internal = File.expand_path("../internal", File.dirname(__FILE__))
+      src = "#{internal}/app/functions/#{path}"
+      result = Jets::Erb.result(src, stage_name: Jets::Resource::ApiGateway::Deployment.stage_name)
+      dest = "#{tmp_code}/handlers/functions/#{path}"
+      FileUtils.mkdir_p(File.dirname(dest))
+      IO.write(dest, result)
+    end
+
     # app/shared/functions/kevin.py => /tmp/jets/demo/app_root/handlers/shared/functions/kevin.py
     def copy_source_as_handler(fun)
       source_path = fun.source_file

data/lib/jets/builders/shim_vars/app.rb

@@ -6,9 +6,9 @@
 #
 # Implements:
 #
-#   functions
-#   handler_for(function_name)
-#   js_path
+#   functions: IE [:index, :show]
+#   handler_for(function_name): IE handlers/controllers/posts_controller.index
+#   js_path: IE: handlers/controllers/posts_controller.js
 #
 module Jets::Builders::ShimVars
   class App < Base
@@ -61,6 +61,7 @@ module Jets::Builders::ShimVars
     end
 
     # This gets called in the node shim js template
+    # IE handlers/controllers/posts_controller.index
     def handler_for(meth)
       # possibly not include _function
       underscored_name = @relative_path.sub(%r{app/(\w+)/},'').sub('.rb','')

data/lib/jets/builders/shim_vars/shared.rb

@@ -6,9 +6,9 @@
 #
 # Implements:
 #
-#   functions
-#   handler_for(function_name)
-#   js_path
+#   functions: IE [:index, :show]
+#   handler_for(function_name): IE handlers/controllers/posts_controller.index
+#   js_path: IE: handlers/controllers/posts_controller.js
 #
 module Jets::Builders::ShimVars
   class Shared < Base
@@ -17,15 +17,19 @@ module Jets::Builders::ShimVars
       @fun = fun
     end
 
+    # Always only one element for shared functions
+    # functions: IE [:handle]
     def functions
       [@fun.meth] # function_names
     end
 
-    # dont need function_name arg but keeping the same interface as parent class
+    # Dont need function_name arg but keeping the same interface as parent class
+    # IE handlers/shared/functions/bob.handle
     def handler_for(function_name)
       @fun.handler_dest
     end
 
+    # IE handlers/shared/functions/bob.js
     def js_path
       @fun.handler_dest
     end

data/lib/jets/builders/templates/shim.js

@@ -179,23 +179,27 @@ const once = async () => {
 // currying function to make handler code prettier
 function handler(full_handler_name) {
   return function(event, context, callback) {
-    request(event, full_handler_name, callback);
+    request(event, context, full_handler_name, callback);
   };
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // main logic for handler
-function request(event, handler, callback) {
+function request(event, context, handler, callback) {
   truncate(JETS_OUTPUT);
   truncate(TMP_LOG_PATH);
 
   log("event:");
   log(event);
+  log("context:");
+  log(context);
   var client = new net.Socket();
   client.connect(8080, '127.0.0.01', function() {
     log('Connected to socket');
     client.write(JSON.stringify(event));
     client.write("\r\n"); // important: \r\n is how server knows input is done
+    client.write(JSON.stringify(context));
+    client.write("\r\n"); // important: \r\n is how server knows input is done
     client.write(handler);
     client.write("\r\n"); // important: \r\n is how server knows input is done
   });
@@ -260,7 +264,7 @@ function request(event, handler, callback) {
       truncate(TMP_LOG_PATH);
 
       log("Retrying request NOW");
-      request(event, handler, callback);
+      request(event, context, handler, callback);
     }, 500);
   });
 }