jets 4.0.17 → 5.0.0.beta1

data/lib/jets/{resource → cfn/resource}/sns/topic.rb

@@ -1,6 +1,6 @@
 # CloudFormation SNS Topic docs: https://amzn.to/2MYbUZc
-module Jets::Resource::Sns
-  class Topic < Jets::Resource::Base
+module Jets::Cfn::Resource::Sns
+  class Topic < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -8,28 +8,28 @@ module Jets::Resource::Sns
     def definition
       {
         topic_logical_id => {
-          type: "AWS::SNS::Topic",
-          properties: merged_properties,
+          Type: "AWS::SNS::Topic",
+          Properties: merged_properties,
         }
       }
     end
 
-    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    # Do not name this method properties, that is a computed method of `Jets::Cfn::Resource`
     def merged_properties
       display_name = "{namespace} Topic"[0..99] # limit is 100 chars
       {
-        display_name: display_name,
+        DisplayName: display_name,
         # Not setting subscription this way but instead with a SNS::Subscription resource so the interface
         # is consistent. Leaving comment in here to remind me and in case decide to change this.
-        # subscription: [
-        #   endpoint: "!GetAtt {namespace}LambdaFunction.Arn",
-        #   protocol: "lambda"
+        # Subscription: [
+        #   Endpoint: "!GetAtt {namespace}LambdaFunction.Arn",
+        #   Protocol: "lambda"
         # ]
       }.deep_merge(@props)
     end
 
     def topic_logical_id
-      "{namespace}_sns_topic"
+      "{namespace}SnsTopic"
     end
   end
 end

data/lib/jets/{resource → cfn/resource}/sns/topic_policy.rb

@@ -1,6 +1,6 @@
 # CloudFormation SNS TopicPolicy docs: https://amzn.to/2SBMq9v
-module Jets::Resource::Sns
-  class TopicPolicy < Jets::Resource::Base
+module Jets::Cfn::Resource::Sns
+  class TopicPolicy < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -8,22 +8,22 @@ module Jets::Resource::Sns
     def definition
       {
         policy_logical_id => {
-          type: "AWS::SNS::TopicPolicy",
-          properties: merged_properties,
+          Type: "AWS::SNS::TopicPolicy",
+          Properties: merged_properties,
         }
       }
     end
 
-    # Do not name this method properties, that is a computed method of `Jets::Resource::Base`
+    # Do not name this method properties, that is a computed method of `Jets::Cfn::Resource`
     def merged_properties
       {
-        policy_document: {
-          version: "2012-10-17",
-          statement: {
-            effect: "Allow",
-            principal: { service: "s3.amazonaws.com"},
-            action: "sns:Publish",
-            resource: "*", # TODO: figure out good syntax to limit easily
+        PolicyDocument: {
+          Version: "2012-10-17",
+          Statement: {
+            Effect: "Allow",
+            Principal: { Service: "s3.amazonaws.com"},
+            Action: "sns:Publish",
+            Resource: "*", # TODO: figure out good syntax to limit easily
             # Condition:
             #   ArnLike:
             #     aws:SourceArn: arn:aws:s3:::aa-test-95872017
@@ -34,7 +34,7 @@ module Jets::Resource::Sns
     end
 
     def policy_logical_id
-      "{namespace}_sns_topic_policy"
+      "{namespace}SnsTopicPolicy"
     end
   end
 end

data/lib/jets/{resource → cfn/resource}/sqs/queue.rb

@@ -1,6 +1,6 @@
 # CloudFormation SQS Queue docs: https://amzn.to/2MVWk0j
-module Jets::Resource::Sqs
-  class Queue < Jets::Resource::Base
+module Jets::Cfn::Resource::Sqs
+  class Queue < Jets::Cfn::Base
     def initialize(props={})
       @props = props # associated_properties from dsl.rb
     end
@@ -8,14 +8,14 @@ module Jets::Resource::Sqs
     def definition
       {
         queue_logical_id => {
-          type: "AWS::SQS::Queue",
-          properties: @props,
+          Type: "AWS::SQS::Queue",
+          Properties: @props,
         }
       }
     end
 
     def queue_logical_id
-      "{namespace}_sqs_queue"
+      "{namespace}SqsQueue"
     end
   end
 end

data/lib/jets/{resource → cfn/resource}/standardizer.rb

@@ -1,5 +1,7 @@
-class Jets::Resource
+class Jets::Cfn::Resource
   class Standardizer
+    include Jets::Util::Camelize
+
     attr_reader :definition
     def initialize(*definition)
       @definition = definition.flatten
@@ -9,30 +11,27 @@ class Jets::Resource
       camelize(standarize(@definition))
     end
 
-    def camelize(attributes)
-      Jets::Camelizer.transform(attributes)
-    end
-
     def standarize(definition)
+      definition = camelize(definition)
       first, second, third, _ = definition
       if definition.size == 1 && first.is_a?(Hash) # long form
         first # pass through
       elsif definition.size == 2 && second.is_a?(Hash) # medium form
         logical_id, attributes = first, second
-        attributes.delete(:properties) if attributes[:properties].nil? || attributes[:properties].empty?
+        attributes.delete(:Properties) if attributes[:Properties].nil? || attributes[:Properties].empty?
         { logical_id => attributes }
       elsif definition.size == 2 && second.is_a?(String) # short form
         logical_id, type = first, second
         { logical_id => {
-            type: type
+            Type: type
         }}
       elsif definition.size == 3 && (second.is_a?(String) || second.is_a?(NilClass))# short form
         logical_id, type, properties = first, second, third
         template = { logical_id => {
-                       type: type
+                       Type: type
                     }}
         attributes = template.values.first
-        attributes[:properties] = properties unless properties.empty?
+        attributes[:Properties] = properties unless properties.empty?
         template
       else # Dont understand this form
         raise "Invalid form provided. definition #{definition.inspect}"

data/lib/jets/cfn/resource.rb

@@ -0,0 +1,8 @@
+module Jets::Cfn
+  class Resource < Base
+    attr_reader :definition
+    def initialize(definition, replacements)
+      @definition, @replacements = definition, replacements
+    end
+  end
+end

data/lib/jets/cfn/ship.rb

@@ -48,10 +48,20 @@ module Jets::Cfn
       clean_deploy_logs
       show_api_endpoint
       show_custom_domain
+      create_deployment_record
+    end
+
+    def create_deployment_record
+      return if @options[:stack_type] == :minimal
+      resp = Jets::Cfn::Deployment.new(@options.merge(stack_name: @parent_stack_name)).create
+      if resp
+        version = resp["version"]
+        Jets::Cfn::Upload.new.upload_cfn_templates(version) if version
+      end
     end
 
     def set_resource_tags
-      @tags = Jets.config.resource_tags.map { |key, value| { key: key, value: value } }
+      @tags = Jets.config.cfn.build.resource_tags.map { |key, value| { key: key, value: value } }
     end
 
     def save_stack
@@ -83,11 +93,11 @@ module Jets::Cfn
         capabilities: capabilities, # ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
         # disable_rollback: !@options[:rollback],
         tags: @tags,
-      }.merge!(template.to_h)
+      }.merge!(template.stack_option)
     end
 
     def template
-      @template ||= TemplateSource.new(Jets::Names.parent_template_path, @options)
+      @template ||= Template.new(Jets::Names.parent_template_path, @options)
     end
 
     # check for /(_COMPLETE|_FAILED)$/ status
@@ -96,9 +106,7 @@ module Jets::Cfn
     end
 
     def save_apigw_state
-      state = Jets::Router::State.new
-      state.save("pages", Jets::Cfn::Builders::PageBuilder.pages)
-      state.save("routes", Jets::Router.routes)
+      Jets::Router::State.save_apigw_state
     end
 
     def prewarm
@@ -120,7 +128,7 @@ module Jets::Cfn
 
     def endpoint_unavailable?
       return true unless @options[:stack_type] == :full # s3 bucket is available
-      return true if Jets::Router.routes.empty?
+      return true if Jets::Router.no_routes?
       _, status = stack_status
       return true if status.include?("ROLLBACK")
       return true unless api_gateway
@@ -154,12 +162,12 @@ module Jets::Cfn
     def show_custom_domain
       return unless endpoint_available? && Jets.custom_domain? && Jets.config.domain.route53
 
-      domain_name = Jets::Resource::ApiGateway::DomainName.new
+      domain_name = Jets::Cfn::Resource::ApiGateway::DomainName.new
       # Looks funny but its right.
-      # domain_name is a method on the Jets::Resource::ApiGateway::Domain instance
+      # domain_name is a method on the Jets::Cfn::Resource::ApiGateway::Domain instance
       url = "https://#{domain_name.domain_name}"
       puts "Custom Domain: #{url}"
-      puts "App Domain: #{Jets.config.app.domain}" if Jets.config.app.domain
+      puts "App Domain: https://#{Jets.config.app.domain}" if Jets.config.app.domain
     end
 
     # All CloudFormation states listed here:
@@ -183,19 +191,12 @@ module Jets::Cfn
     end
 
     def capabilities
-      ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"] # TODO: remove capabilities hardcode
-      # return @options[:capabilities] if @options[:capabilities]
-      # if @options[:iam]
-      #   ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
-      # end
+      ["CAPABILITY_IAM", "CAPABILITY_NAMED_IAM"]
     end
 
     # Upload both code and child templates to s3
     def upload_to_s3
-      raise "Did not specify @options[:s3_bucket] #{@options[:s3_bucket].inspect}" unless @options[:s3_bucket]
-
-      uploader = Upload.new(@options[:s3_bucket])
-      uploader.upload
+      Upload.new.upload
     end
   end
 end

data/lib/jets/cfn/template.rb

@@ -0,0 +1,89 @@
+module Jets::Cfn
+  class Template
+    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 stack_option
+      if upload_to_s3?
+        from_s3
+      else
+        from_path
+      end
+    end
+
+  private
+    def upload_to_s3?
+      return false if @options[:stack_type] == :minimal # bucket not yet available
+      bucket_name.present?
+    end
+
+    def bucket_name
+      Jets.s3_bucket
+    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 s3_key
+      @s3_key ||= "jets/cfn-templates/#{File.basename(path)}"
+    end
+
+    class << self
+      # Caches reduce filesystem IO calls
+      @@cache = {}
+      def load_file(path)
+        if @@cache[path]
+          @@cache[path]
+        else
+          @@cache[path] = Jets::Util::Yamler.load_file(path).deep_symbolize_keys
+        end
+      end
+
+      # Jets::Cfn::Template.lookup_logical_id(template_name, key)
+      # Jets::Cfn::Template.lookup_logical_id("api-resources", "UpApiResource")
+      def lookup_logical_id(template_name, key)
+        expr = "#{Jets::Names.templates_folder}/#{template_name}-*"
+        template_paths = Dir.glob(expr).sort.to_a
+        found_template = template_paths.detect do |path|
+          next unless File.file?(path)
+
+          template = Jets::Cfn::Template.load_file(path)
+          template[:Outputs].keys.include?(key.to_sym)
+        end
+
+        name = File.basename(found_template).sub(/\.yml$/,'')
+        name.underscore.camelize # IE: ApiResources1
+      end
+    end
+  end
+end

data/lib/jets/cfn/upload.rb

@@ -1,21 +1,11 @@
-require "action_view"
-require "digest"
-require "rack/mime"
+require 'active_support/number_helper'
+require 'digest'
+require 'rack/mime'
 
 module Jets::Cfn
   class Upload
     include Jets::AwsServices
-    include ActionView::Helpers::NumberHelper # number_to_human_size
-
-    attr_reader :bucket_name
-
-    def initialize(bucket_name)
-      @bucket_name = bucket_name
-    end
-
-    def transfer_manager
-      @transfer_manager ||= Aws::S3::TransferManager.new
-    end
+    include ActiveSupport::NumberHelper # number_to_human_size
 
     def upload
       upload_cfn_templates
@@ -23,14 +13,26 @@ module Jets::Cfn
       upload_assets
     end
 
-    def upload_cfn_templates
-      puts "Uploading CloudFormation templates to S3."
-      expression = "#{Jets::Names.template_path_prefix}-*"
+    def bucket_name
+      Jets.s3_bucket
+    end
+
+    def upload_cfn_templates(version=nil)
+      puts "Uploading CloudFormation templates to S3." unless version # hide message when version is passed in
+      expression = "#{Jets::Names.templates_folder}/*"
+      if version # outside of each loop to avoid repeating
+        version = "versions/#{version}"
+      else
+        checksum = Jets::Builders::Md5.checksums["stage/code"]
+        version = "shas/#{checksum}"
+      end
+      checksum = Jets::Builders::Md5.checksums["stage/code"]
       Dir.glob(expression).each do |path|
         next unless File.file?(path)
-
-        key = "jets/cfn-templates/#{File.basename(path)}"
-        transfer_manager.upload_file(path, bucket: bucket_name, key: key)
+        key = ["jets/cfn-templates", version, File.basename(path)].compact.join('/')
+        obj = s3_resource.bucket(bucket_name).object(key)
+        puts "Uploading #{path} to s3://#{bucket_name}/#{key}".color(:green) if ENV['JETS_DEBUG']
+        obj.upload_file(path)
       end
     end
 
@@ -48,31 +50,26 @@ module Jets::Cfn
       puts "Uploading #{path} (#{file_size}) to S3"
       start_time = Time.now
       s3_key = "jets/code/#{File.basename(path)}"
-      transfer_manager.upload_file(path, bucket: bucket_name, key: s3_key)
+      obj = s3_resource.bucket(bucket_name).object(s3_key)
+      obj.upload_file(path)
       puts "Uploaded to s3://#{bucket_name}/#{s3_key}".color(:green)
-      puts "Time to upload code to s3: #{pretty_time(Time.now - start_time).color(:green)}"
+      puts "Time to upload code to s3: #{pretty_time(Time.now-start_time).color(:green)}"
     end
 
     def upload_assets
       puts "Checking for modified public assets and uploading to S3."
       start_time = Time.now
       upload_public_assets
-      puts "Time for public assets to s3: #{pretty_time(Time.now - start_time).color(:green)}"
+      puts "Time for public assets to s3: #{pretty_time(Time.now-start_time).color(:green)}"
     end
 
     def upload_public_assets
       public_folders = %w[public]
-      public_folders = add_rack_assets(public_folders)
       public_folders.each do |folder|
         upload_asset_folder(folder)
       end
     end
 
-    def add_rack_assets(public_folders)
-      return public_folders unless Jets.rack?
-      public_folders + %w[rack/public]
-    end
-
     def upload_asset_folder(folder)
       expression = "#{Jets.root}/#{folder}/**/*"
       group_size = 10
@@ -90,31 +87,37 @@ module Jets::Cfn
     end
 
     def upload_to_s3(full_path)
-      return if identical_on_s3?(full_path) && !ENV["JETS_ASSET_UPLOAD_FORCE"]
+      if identical_on_s3?(full_path) && !ENV['JETS_ASSET_UPLOAD_FORCE']
+        puts "Asset is identical on s3: #{full_path}" if ENV['JETS_DEBUG_ASSETS']
+        return
+      end
 
       key = s3_key(full_path)
+      obj = s3_resource.bucket(bucket_name).object(key)
       content_type = content_type_headers(full_path)
-      Jets.logger.debug "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
-      transfer_manager.upload_file(full_path, bucket: bucket_name, key: key, acl: "public-read", cache_control: cache_control, **content_type)
+      if ENV['JETS_DEBUG_ASSETS']
+        puts "Uploading and setting content type for s3://#{bucket_name}/#{key} content_type #{content_type[:content_type].inspect}"
+      end
+      obj.upload_file(full_path, { acl: "public-read", cache_control: cache_control }.merge(content_type))
     end
 
     CONTENT_TYPES_BY_EXTENSION = {
-      ".css" => "text/css",
-      ".html" => "text/html",
-      ".js" => "application/javascript"
+      '.css'  => 'text/css',
+      '.html' => 'text/html',
+      '.js'   => 'application/javascript',
     }
     def content_type_headers(full_path)
       ext = File.extname(full_path)
       content_type = CONTENT_TYPES_BY_EXTENSION[ext] || Rack::Mime.mime_type(ext)
       if content_type
-        {content_type: content_type}
+        { content_type: content_type }
       else
         {}
       end
     end
 
     def s3_key(full_path)
-      relative_path = full_path.sub("#{Jets.root}/", "")
+      relative_path = full_path.sub("#{Jets.root}/", '')
       "jets/#{relative_path}"
     end