jets 2.3.0 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80c5f0edcf627cb62ec53f7db4daac61b8b6f917d455e7c89c232fdb9c3dcfb9
-  data.tar.gz: bba8a0fd1a5d236142183032b4831ccfaaad6f13d54da14a17523ddb594131c5
+  metadata.gz: edcc031b3ecbf752200590a6b964983604f0fd95e15d0270abe26341a3013cfe
+  data.tar.gz: 2b12ab8e0dcd3d7ad5cddb5169a32b189968d946ccc8fbe059dd0a3e37541f3d
 SHA512:
-  metadata.gz: 799c0964c8c2dca73780688ca0fd648ce659aa23882918694504151d340d0a499dceb8850b91d5ff007c712dbdce830c5857763bf991d4a7a0075a35e4c0bf48
-  data.tar.gz: 0c3197ba7f2914a12e4fa919dd08d629b56bc3c08d56942a4c372c53373441a632e0223810719f34d90d0a41bae0c8adbf36eb5173d86c0fc2e15df8bfc4f708
+  metadata.gz: 778038a7c6b3d5deb3e78d65061095ffa2c52add54d66aba17abdf1feefcea29e37a9f673eb96ced091f5d58ece36781ac7e72e12e0a4bc99f542f0046d6038d
+  data.tar.gz: f6e6aebfe968362c36083e3dc6d60a4ace9772a6135aff0bfc7e138618f43050503010014ad61d1c12425b4f071fd7fca2cdea4797ab3f82da1ead1c98da3977

data/CHANGELOG.md

@@ -3,6 +3,15 @@
 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.1]
+- #378 use JETS_TEST=1 env var instead of TEST=1 and favor Jets.env.test? method
+- #382 associated resources support for controllers
+- #383 add jets and code version to parent template description
+- #384 upload template to s3
+- #386 Allow Jets.once to be called in simple function
+- #387 remove .bundle/config instead of BUNDLE_IGNORE_CONFIG=1
+- allow accidental mount at / to work also
+
 ## [2.3.0]
 - #377 routes mount support
 

data/lib/jets/aws_info.rb

@@ -5,7 +5,7 @@ module Jets
     include AwsServices
 
     def region
-      return 'us-east-1' if test?
+      return 'us-east-1' if Jets.env.test?
 
       return ENV['JETS_AWS_REGION'] if ENV['JETS_AWS_REGION'] # highest precedence
       return ENV['AWS_REGION'] if ENV['AWS_REGION']
@@ -48,7 +48,7 @@ module Jets
 
     # aws sts get-caller-identity
     def account
-      return '123456789' if test?
+      return '123456789' if Jets.env.test?
       return ENV['JETS_AWS_ACCOUNT'] if ENV['JETS_AWS_ACCOUNT']
 
       # ensure region set, required for sts.get_caller_identity.account to work
@@ -70,7 +70,7 @@ module Jets
     BUCKET_DOES_NOT_YET_EXIST = "bucket-does-not-yet-exist" # use const to save from misspellings
     @@s3_bucket = BUCKET_DOES_NOT_YET_EXIST
     def s3_bucket
-      return "fake-test-s3-bucket" if ENV['TEST']
+      return "fake-test-s3-bucket" if Jets.env.test?
       return @@s3_bucket unless @@s3_bucket == BUCKET_DOES_NOT_YET_EXIST
 
       resp = cfn.describe_stacks(stack_name: Jets::Naming.parent_stack_name)
@@ -90,10 +90,6 @@ module Jets
       BUCKET_DOES_NOT_YET_EXIST
     end
 
-    def test?
-      ENV['TEST'] || Jets.env.test?
-    end
-
     private
 
     # Cross-platform way of finding an executable in the $PATH.

data/lib/jets/aws_services/stack_status.rb

@@ -3,7 +3,7 @@ module Jets::AwsServices
     # Only cache if it is true because the initial deploy checks live status until a stack exists.
     @@stack_exists_cache = [] # helps with CloudFormation rate limit
     def stack_exists?(stack_name)
-      return false if ENV['TEST']
+      return false if Jets.env.test?
       return true if ENV['JETS_BUILD_NO_INTERNET']
       return true if @@stack_exists_cache.include?(stack_name)
 

data/lib/jets/builders/code_size.rb

@@ -36,7 +36,7 @@ module Jets::Builders
       say "Total Package: #{megabytes(total_size)}"
       say "Over limit by: #{megabytes(overlimit)}"
       say "Sometimes blowing away the /tmp/jets cache will reduce the size: rm -rf /tmp/jets"
-      # sh "du -kcsh #{stage_area}/*" unless ENV['TEST'] # uncomment to debug
+      # sh "du -kcsh #{stage_area}/*" unless Jets.env.test? # uncomment to debug
     end
 
     def compute_size(path)
@@ -51,7 +51,7 @@ module Jets::Builders
     end
 
     def say(message)
-      puts message unless ENV['TEST']
+      puts message unless Jets.env.test?
     end
   end
 end

data/lib/jets/builders/ruby_packager.rb

@@ -50,11 +50,19 @@ module Jets::Builders
       # Uncomment out to always remove the cache/vendor/gems to debug
       # FileUtils.rm_rf("#{cache_area}/vendor/gems")
 
+      # Remove .bundle folder so .bundle/config doesnt affect how Jets packages gems.
+      # Not using BUNDLE_IGNORE_CONFIG=1 to allow home ~/.bundle/config to affect bundling though.
+      # This is useful if you have private gems sources that require authentication. Example:
+      #
+      #    bundle config gems.myprivatesource.com user:pass
+      #
+
+      FileUtils.rm_rf("#{cache_area}/.bundle")
       require "bundler" # dynamically require bundler so user can use any bundler
       Bundler.with_clean_env do
         sh(
           "cd #{cache_area} && " \
-          "env BUNDLE_IGNORE_CONFIG=1 bundle install --path #{cache_area}/vendor/gems --without development test"
+          "env bundle install --path #{cache_area}/vendor/gems --without development test"
         )
       end
 

data/lib/jets/cfn/builders/controller_builder.rb

@@ -11,6 +11,7 @@ module Jets::Cfn::Builders
       add_api_gateway_parameters
       add_functions
       add_routes
+      add_resources
     end
 
     def add_api_gateway_parameters

data/lib/jets/cfn/builders/interface.rb

@@ -50,6 +50,10 @@ module Jets::Cfn::Builders
       results.join("\n") + "\n"
     end
 
+    def add_description(desc)
+      @template[:Description] = desc
+    end
+
     def add_parameters(attributes)
       attributes.each do |name,value|
         add_parameter(name.to_s.camelize, Description: value)

data/lib/jets/cfn/builders/parent_builder.rb

@@ -23,6 +23,8 @@ module Jets::Cfn::Builders
     end
 
     def build_minimal_resources
+      add_description("Jets: #{Jets.version} Code: #{Util::Source.version}")
+
       # Initial s3 bucket, used to store code zipfile and templates Jets generates
       resource = Jets::Resource::S3::Bucket.new(logical_id: "s3_bucket")
       add_resource(resource)

data/lib/jets/cfn/builders/util/source.rb

@@ -0,0 +1,21 @@
+module Jets::Cfn::Builders::Util
+  class Source
+    class << self
+      def version
+        return '' unless git_installed?
+        sha = sh "git rev-parse HEAD 2>/dev/null"
+        return '' if sha == ''  # if its not a git repo, it'll be an empty string
+        sha[0..7]
+      end
+
+    private
+      def git_installed?
+        system("type git > /dev/null 2>&1")
+      end
+
+      def sh(command)
+        `#{command}`.strip
+      end
+    end
+  end
+end

data/lib/jets/cfn/ship.rb

@@ -6,7 +6,6 @@ module Jets::Cfn
     def initialize(options)
       @options = options
       @parent_stack_name = Jets::Naming.parent_stack_name
-      @template_path = Jets::Naming.parent_template_path
     end
 
     def run
@@ -75,10 +74,13 @@ module Jets::Cfn
     def stack_options
       {
         stack_name: @parent_stack_name,
-        template_body: IO.read(@template_path),
         capabilities: capabilities, # ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
         # disable_rollback: !@options[:rollback],
-      }
+      }.merge!(template.to_h)
+    end
+
+    def template
+      @template ||= TemplateSource.new(Jets::Naming.parent_template_path, @options)
     end
 
     # check for /(_COMPLETE|_FAILED)$/ status

data/lib/jets/cfn/status.rb

@@ -96,7 +96,7 @@ module Jets::Cfn
       end
 
       return if final
-      sleep 5 unless ENV['TEST']
+      sleep 5 unless Jets.env.test?
       refresh_events
     end
 

data/lib/jets/cfn/template_source.rb

@@ -0,0 +1,61 @@
+module Jets::Cfn
+  class TemplateSource
+    include Jets::AwsServices
+
+    attr_reader :path
+
+    def initialize(path, options)
+      @path = path
+      @options = options
+    end
+
+    def body
+      @body ||= IO.read(path)
+    end
+
+    def url
+      @url ||= upload_file_to_s3
+    end
+
+    def to_h
+      if upload_to_s3?
+        from_s3
+      else
+        from_path
+      end
+    end
+
+    private
+
+    def upload_to_s3?
+      bucket_name.present?
+    end
+
+    def from_s3
+      {
+        template_url: url
+      }
+    end
+
+    def from_path
+      {
+        template_body: body
+      }
+    end
+
+    def upload_file_to_s3
+      obj = s3_resource.bucket(bucket_name).object(s3_key)
+      obj.upload_file(path)
+
+      "https://s3.amazonaws.com/#{bucket_name}/#{s3_key}"
+    end
+
+    def bucket_name
+      @options[:s3_bucket]
+    end
+
+    def s3_key
+      @s3_key ||= "jets/cfn-templates/#{File.basename(path)}"
+    end
+  end
+end

data/lib/jets/commands/dynamodb/migrator.rb

@@ -20,7 +20,7 @@ class Jets::Commands::Dynamodb::Migrator
     path = "#{Jets.root}/#{@path}"
     unless File.exist?(path)
       puts "Unable to find the migration file: #{path}"
-      exit 1 unless ENV['TEST']
+      exit 1 unless Jets.env.test?
     end
 
     require path

data/lib/jets/commands/templates/skeleton/spec/spec_helper.rb.tt

@@ -1,5 +1,5 @@
-ENV["TEST"] = "1"
-ENV["JETS_ENV"] ||= "test"
+ENV['JETS_TEST'] = "1"
+ENV['JETS_ENV'] ||= "test"
 # Ensures aws api never called. Fixture home folder does not contain ~/.aws/credentails
 ENV['HOME'] = "spec/fixtures/home"
 

data/lib/jets/controller/forgery_protection.rb

@@ -30,7 +30,7 @@ class Jets::Controller
 
     # Instance methods
     def verify_authenticity_token
-      return true if ENV['TEST'] || request.get? || request.head?
+      return true if Jets.env.test? || request.get? || request.head?
 
       token = session[:authenticity_token]
       verified = !token.nil? && (token == params[:authenticity_token] || token == request.headers["x-csrf-token"])

data/lib/jets/controller/middleware/local.rb

@@ -69,7 +69,7 @@ module Jets::Controller::Middleware
     end
 
     def on_aws?(env)
-      return false if ENV['TEST'] # usually with test we're passing in full API Gateway fixtures with the HTTP_X_AMZN_TRACE_ID
+      return false if Jets.env.test? # usually with test we're passing in full API Gateway fixtures with the HTTP_X_AMZN_TRACE_ID
       on_cloud9 = !!(env['HTTP_HOST'] =~ /cloud9\..*\.amazonaws\.com/)
       !!env['HTTP_X_AMZN_TRACE_ID'] && !on_cloud9
     end

data/lib/jets/erb.rb

@@ -38,7 +38,7 @@ class Jets::Erb
             printf("%#{spacing}d %s\n", line_number, line_content)
           end
         end
-        exit 1 unless ENV['TEST']
+        exit 1 unless Jets.env.test?
       end
     end
 

data/lib/jets/internal/app/jobs/jets/preheat_job.rb

@@ -34,7 +34,7 @@ class Jets::PreheatJob < ApplicationJob
         function_name = "jets-preheat_job-warm"
         event_json = JSON.dump(event)
         options = call_options(event[:quiet])
-        Jets::Commands::Call.new(function_name, event_json, options).run unless ENV['TEST']
+        Jets::Commands::Call.new(function_name, event_json, options).run unless Jets.env.test?
       end
     end
     threads.each { |t| t.join }

data/lib/jets/preheat.rb

@@ -23,7 +23,7 @@ module Jets
 
     # Makes remote call to the Lambda function.
     def warm(function_name)
-      Jets::Commands::Call.new(function_name, '{"_prewarm": "1"}', @options).run unless ENV['TEST']
+      Jets::Commands::Call.new(function_name, '{"_prewarm": "1"}', @options).run unless Jets.env.test?
     end
 
     # Loop through all methods for each class and makes special prewarm call to each method.

data/lib/jets/processors/main_processor.rb

@@ -43,7 +43,7 @@ class Jets::Processors::MainProcessor
 
       result
     rescue Exception => e
-      unless ENV['TEST']
+      unless Jets.env.test?
         # Customize error message slightly so nodejs shim can process the
         # returned error message.
         # The "RubyError: " is a marker that the javascript shim scans for.

data/lib/jets/router/dsl/mount.rb

@@ -3,6 +3,7 @@ module Jets::Router::Dsl
     # The mounted class must be a Rack compatiable class
     def mount(klass, at:)
       options = {to: "jets/mount#call", mount_class: klass}
+      at = at[1..-1] if at.starts_with?('/') # be more forgiving if / accidentally included
       at_wildcard = at.blank? ? "*path" : "#{at}/*path"
 
       any at, options

data/lib/jets/tmp_loader.rb

@@ -8,7 +8,7 @@ module Jets
 
     def initialize(yaml_path=nil)
       yaml_path ||= "#{Jets.root}/handlers/data.yml"
-      @data = YAML.load_file(yaml_path)
+      @data = YAML.load_file(yaml_path) if File.exist?(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.0"
+  VERSION = "2.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jets
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.3.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-30 00:00:00.000000000 Z
+date: 2019-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -635,9 +635,11 @@ files:
 - lib/jets/cfn/builders/parent_builder/stagger.rb
 - lib/jets/cfn/builders/rule_builder.rb
 - lib/jets/cfn/builders/shared_builder.rb
+- lib/jets/cfn/builders/util/source.rb
 - lib/jets/cfn/built_template.rb
 - lib/jets/cfn/ship.rb
 - lib/jets/cfn/status.rb
+- lib/jets/cfn/template_source.rb
 - lib/jets/cfn/upload.rb
 - lib/jets/cli.rb
 - lib/jets/commands/base.rb