jets 2.3.11 → 2.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb54ab2c1991990d3be85c4e2d94f72c1f73b0e12f5a8044d379c6159709227
-  data.tar.gz: 49c29bf31948637c8a7eb32996dfa6abfb05bf9cc01b225a870b4eb101b03ebc
+  metadata.gz: 14f4e12068a48f8ff8d9114f69f9b01da482d89c78a4f7027a42c4c33995de93
+  data.tar.gz: 2a078028215d546115310857ec3c37ec629b0be726182e4c6a4f1d6ddd2f9dd2
 SHA512:
-  metadata.gz: 42b38a1514b00fb9cf3ddaecb38aee24d684ce8cee488d165632cc583ed01fa12b74501f0ec6391c2353d495f13a8fca85670c514915295af28c7e9cfe0059f9
-  data.tar.gz: ae08ef47dd5c96e0017d6a04151d63993dc686203c74f19cf84638822d9c3bbb7b3054e333d152bdd01942f87d6126d63c3a77d79aae7e300ed97c8ea29cd328
+  metadata.gz: ae698eaaba985b224cb01b43e2ac90015ae5e7a5fd1eaf4a4c9a97e76303b9fc700fe3e251843bc7fb6c209a94c51f7a07743a98203bdb27e79c6dc19c18c026
+  data.tar.gz: 40142abe6a735a848f1931fa1f044f5964191b1c0326cce0b00d3850b05023ab238b97b5c793d13e7c7b78bf5e4e3a1baa747f0fb233c7fd5f4e3535c9207e44

data/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 This project *loosely tries* to adhere to [Semantic Versioning](http://semver.org/).
 
+## [2.3.12]
+- #421 use underscore for database name in database.yml
+- #422 url_for: allow any activemodel compatiable object to work
+- #423 add apex domain support
+- #424 md5 fix subtle bug when code doesnt get uploaded from newly generated shims
+- #425 add hosted zone id support
+- #426 use headers origin for actual host in case of cloudfront in front
+- #428 fixes to JETS_BUILD_NO_INTERNET env var option
+- #429 fix simple function tmp_loader
+
 ## [2.3.11]
 - #419 Added forward slash before script_name env variable, so that correct path get generated. As it happens Rails
 

data/README.md

@@ -4,7 +4,7 @@
 
 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=eyJlbmNyeXB0ZWREYXRhIjoiRXY0bzFlZS93TUF0cXhDaGdEY2FIbTVtdW43YjB0andmbnRTL3VvbWJOcTBOM3IxWDZPSFh2OHpvczBmdU5QcHpjUThvd084RERORFlvZVI4QWVKcis0PSIsIml2UGFyYW1ldGVyU3BlYyI6IllBZk0xTmVWZ3c2K3VWdTYiLCJtYXRlcmlhbFNldFNlcmlhbCI6MX0%3D&branch=master)
+![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)
 [![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/)

data/lib/jets/builders/code_builder.rb

@@ -77,6 +77,7 @@ module Jets::Builders
     end
 
     def exist_on_s3?(filename)
+      return false if ENV['JETS_BUILD_NO_INTERNET']
       s3_key = "jets/code/#{filename}"
       begin
         s3.head_object(bucket: s3_bucket, key: s3_key)
@@ -98,8 +99,8 @@ module Jets::Builders
 
       # Code prep and zipping
       check_code_size!
-      calculate_md5s # must be called before generate_shims and create_zip_files
       generate_shims
+      calculate_md5s # must be called before create_zip_files because checksums need to be populated
       create_zip_files
     end
 

data/lib/jets/commands/deploy.rb

@@ -152,6 +152,8 @@ module Jets::Commands
 
     # All CloudFormation states listed here: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-describing-stacks.html
     def exit_unless_updateable!
+      return if ENV['JETS_FORCE_UPDATEABLE'] # useful for debugging if stack stack updating
+
       stack_name = Jets::Naming.parent_stack_name
       exists = stack_exists?(stack_name)
       return unless exists # continue because stack could be updating

data/lib/jets/commands/new.rb

@@ -24,6 +24,7 @@ module Jets::Commands
 
     def set_initial_variables
       @project_name = project_folder == '.' ? File.basename(Dir.pwd) : project_folder
+      @database_name = @project_name.gsub('-','_')
 
       # options is a frozen hash by Thor so cannot modify it.
       # Also had trouble unfreezing it with .dup. So using instance variables instead

data/lib/jets/commands/templates/skeleton/config/database.yml.tt

@@ -2,7 +2,7 @@ default: &default
   adapter: <%= @database == 'mysql' ? 'mysql2' : 'postgresql' %>
   encoding: <%= @database == 'mysql' ? 'utf8mb4' : 'unicode' %>
   pool: <%%= ENV["DB_POOL"] || 5  %>
-  database: <%%= ENV['DB_NAME'] || '<%= @project_name %>_development' %>
+  database: <%%= ENV['DB_NAME'] || '<%= @database_name %>_development' %>
 <% if @database == 'mysql' -%>
   username: <%%= ENV['DB_USER'] || 'root' %>
 <% else -%>
@@ -15,13 +15,13 @@ default: &default
 
 development:
   <<: *default
-  database: <%%= ENV['DB_NAME'] || '<%= @project_name %>_development' %>
+  database: <%%= ENV['DB_NAME'] || '<%= @database_name %>_development' %>
 
 test:
   <<: *default
-  database: <%= @project_name %>_test
+  database: <%= @database_name %>_test
 
 production:
   <<: *default
-  database: <%= @project_name %>_production
+  database: <%= @database_name %>_production
   url: <%%= ENV['DATABASE_URL'] %>

data/lib/jets/controller/rendering.rb

@@ -72,7 +72,8 @@ class Jets::Controller
     end
 
     def actual_host
-      headers["host"]
+      # actually host is in headers["origin"] when cloudfront is in front
+      headers["origin"] || headers["host"]
     end
 
   end

data/lib/jets/job/dsl/dynamodb_event.rb

@@ -1,6 +1,8 @@
 module Jets::Job::Dsl
   module DynamodbEvent
     def dynamodb_event(table_name, options={})
+      return if ENV['JETS_BUILD_NO_INTERNET'] # Disable during build since jets build tries to init this
+
       stream_arn = full_dynamodb_stream_arn(table_name)
       default_iam_policy = default_dynamodb_stream_policy(stream_arn)
 

data/lib/jets/lambda/function_constructor.rb

@@ -35,7 +35,7 @@ module Jets::Lambda
     def build
       code = IO.read(@code_path)
       function_klass = Class.new(Jets::Lambda::Function)
-      function_klass.module_eval(code)
+      function_klass.module_eval(code, @code_path)
       adjust_tasks(function_klass)
       function_klass # assign this to a Constant for a pretty class name
     end

data/lib/jets/overrides/rails/url_helper.rb

@@ -6,17 +6,16 @@ module Jets::UrlHelper
 
   # Basic implementation of url_for to allow use helpers without routes existence
   def url_for(options = nil) # :nodoc:
-    url = case options
-          when String
+    url = if options.is_a?(String)
             options
-          when :back
+          elsif options == :back
             _back_url
-          when ActiveRecord::Base
+          elsif options.respond_to?(:to_model)
             _handle_model(options)
-          when Array
+          elsif options.is_a?(Array)
             _handle_array(options)
           else
-            raise ArgumentError, "Please provided a String or ActiveRecord model to link_to as the the second argument. The Jets link_to helper takes as the second argument."
+            raise ArgumentError, "The Jets link_to helper only supports some types of arguments. Please provided a String or an object that supports ActiveModel to link_to as the the second argument."
           end
 
     add_stage_name(url)

data/lib/jets/resource/api_gateway/domain_name.rb

@@ -40,9 +40,15 @@ module Jets::Resource::ApiGateway
     end
 
     def domain_name
-      subdomain = Jets.project_namespace
-      managed_domain_name = "#{subdomain}.#{Jets.config.domain.hosted_zone_name}"
-      name = Jets.config.domain.name || managed_domain_name
+      name = Jets.config.domain.name
+      if Jets.config.domain.apex
+        name ||= Jets.config.domain.hosted_zone_name
+      else
+        subdomain = Jets.project_namespace
+        managed_domain_name = "#{subdomain}.#{Jets.config.domain.hosted_zone_name}"
+        name ||= managed_domain_name
+      end
+
       # Strip trailing period if there is one set accidentally or else get this error
       #   Trailing period should be omitted from domain name (Service: AmazonApiGateway; Status Code: 400; Error Code: BadRequestException
       name.sub(/\.$/,'')

data/lib/jets/resource/route53/record_set.rb

@@ -18,20 +18,48 @@ module Jets::Resource::Route53
       {
         dns_record: {
           type: "AWS::Route53::RecordSet",
-          properties: {
-            hosted_zone_name: hosted_zone_name,
-            comment: "DNS record managed by Jets",
-            name: name,
-            type: "CNAME",
-            ttl: "60",
-            resource_records: [
-              cname,
-            ],
-          }
+          properties: record_set_properties
         }
       }
     end
 
+    def record_set_properties
+      base = {
+        comment: "DNS record managed by Jets",
+        name: name,
+      }
+      hosted_zone_id = Jets.config.domain.hosted_zone_id
+      if hosted_zone_id
+        base[:hosted_zone_id] = hosted_zone_id
+      else
+        base[:hosted_zone_name] = hosted_zone_name
+      end
+
+      if Jets.config.domain.apex
+        base.merge(
+          alias_target: {
+            dns_name: cname,
+            hosted_zone_id: domain_name_hosted_zone,
+          },
+          type: "A",
+        )
+      else
+        base.merge({
+          type: "CNAME",
+          ttl: "60",
+          resource_records: [cname],
+        })
+      end
+    end
+
+    def domain_name_hosted_zone
+      if endpoint_types.include?("REGIONAL")
+        "!GetAtt DomainName.RegionalHostedZoneId"
+      else
+        "!GetAtt DomainName.DistributionHostedZoneId"
+      end
+    end
+
     def cname
       if endpoint_types.include?("REGIONAL")
         "!GetAtt DomainName.RegionalDomainName"

data/lib/jets/tmp_loader.rb

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

data/lib/jets/version.rb

@@ -1,3 +1,3 @@
 module Jets
-  VERSION = "2.3.11"
+  VERSION = "2.3.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.11
+  version: 2.3.12
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-02 00:00:00.000000000 Z
+date: 2020-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -1101,7 +1101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Ruby Serverless Framework