lucid-cumulus 0.11.6 → 0.11.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Y2FhNDkzYjc3ZDQzOTgwYjhhYzMxZTI0Y2U5NGM0MzRmYjYyM2JjNg==
+    ZTllODkxZjdiMWFjYTg1N2Y2ODE0NTdjZDBjZGFiMjgwYjg0MDMzZA==
   data.tar.gz: !binary |-
-    NGQzNjUzZGIyYjhkZWI1ZGNjZDJkNjk5OTg4NTI2MjhjMGIxMmE3MA==
+    YzljZmYwNDE0MDAzNzBmNzgxNDY0NDkzYjgxOGM1NjdiNTMzZTc2ZQ==
 SHA512:
   metadata.gz: !binary |-
-    OGQzNGFiODQ5ZWJhYTg1YWM2NGE2YTUxZDFkMGExYTVhZTYzNjJkYzQ2OTFh
-    Zjg1YmYzMWZkZWE3NDNiNGQ0NjRkZjc4OTU3OTUxMzNmNWQyMjU5ZGRkZDFl
-    NGY1NTBkZjU5YjQxZDIzZTg4MDg0MmFlNDBjZTIzMWQ4ZTc4ZjQ=
+    YTczZTEwYzlhYWI2M2RmNzUzNmZkNzNmNjEzYjFjNjVjYjNlMzY1MzA4YjUw
+    ZjM4ZTAwNmIwMjg3MzkzNDAxYTY0MTM2NGViMGFmOWUxOTMzYzFlYzkzMWMw
+    MDkwZWMzZDliNzA1ZmY3Y2JhZDFiOWE2NjkwZGQ3NTYwYjQyYzc=
   data.tar.gz: !binary |-
-    MjgyZjhmZTBmODRjMzc5NjZmZDM2MjA1ZTkyYmIxNzY5MmNmMzM5OTdkMzc3
-    ZWZjMWYwM2M2MWRhN2E1NzEwNzRiODMzODVjZWNlNDMwOWE3ZjU2ODRmYzg5
-    NjU4MThhMThlNTE3MmJmMjg3NGNjMDdhMjMzNjcyOTRmOTU4MjA=
+    OTNhYjA2ZTI2OWRlNzBlYjNhNzc3NjA5ZTVkMjBmZDI1MDFhOGQ4N2Y5MGEz
+    YWI2MDUwMThkOTJmMzlmZTFjNzM0MWUyYTY1ZGRlZDE4NGFhYmJkZGMzYjgx
+    NjZlY2FjNDk1ZDhlNDE0Y2Y0Y2UxZDgzYjJkNDUyYjZhNmMxYjk=

data/Gemfile.lock

@@ -1,21 +1,21 @@
 PATH
   remote: .
   specs:
-    lucid-cumulus (0.11.6)
-      aws-sdk (= 2.2.30)
+    lucid-cumulus (0.11.7)
+      aws-sdk (~> 2.6.3)
       deepsort (~> 0.1)
       parse-cron (~> 0.1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.2.30)
-      aws-sdk-resources (= 2.2.30)
-    aws-sdk-core (2.2.30)
+    aws-sdk (2.6.3)
+      aws-sdk-resources (= 2.6.3)
+    aws-sdk-core (2.6.3)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.2.30)
-      aws-sdk-core (= 2.2.30)
-    deepsort (0.3.1)
+    aws-sdk-resources (2.6.3)
+      aws-sdk-core (= 2.6.3)
+    deepsort (0.4.0)
     diff-lcs (1.2.5)
     jmespath (1.3.1)
     parse-cron (0.1.4)
@@ -43,4 +43,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.12.5
+   1.13.1

data/lib/cloudfront/manager/Manager.rb

@@ -105,6 +105,8 @@ module Cumulus
             if e.message =~ /OriginSslProtocols is required/
               puts Colors.red("Distribution #{local.name} must specify $.custom-origin-config.origin-ssl-protocols when \"protocol-policy\" is \"https-only\". Distribution not updated")
               StatusCodes.set_status(StatusCodes::EXCEPTION)
+            else
+              throw e
             end
           end
         end

data/lib/cloudfront/models/CacheBehaviorConfig.rb

@@ -1,5 +1,6 @@
 require "conf/Configuration"
 require "cloudfront/models/CacheBehaviorDiff"
+require "util/AwsUtil"
 
 require "json"
 
@@ -37,6 +38,7 @@ module Cumulus
           @path_pattern = json["path-pattern"] if !default
           @target_origin_id = json["target-origin-id"]
           @forward_query_strings = json["forward-query-strings"]
+          @forward_query_string_cache_keys = json["forward-query-strings-cache-keys"] || []
           @forwarded_cookies = json["forwarded-cookies"]
           @forwarded_cookies_whitelist = json["forwarded-cookies-whitelist"] || []
           @forward_headers = json["forward-headers"] || []
@@ -57,6 +59,7 @@ module Cumulus
         @path_pattern = aws.path_pattern if !default
         @target_origin_id = aws.target_origin_id
         @forward_query_strings = aws.forwarded_values.query_string
+        @forward_query_string_cache_keys =  aws.forwarded_valued.query_string_cache_keys.items || []
         @forwarded_cookies = aws.forwarded_values.cookies.forward
         @forwarded_cookies_whitelist = if aws.forwarded_values.cookies.whitelisted_names.nil? then [] else aws.forwarded_values.cookies.whitelisted_names.items end
         @forward_headers = if aws.forwarded_values.headers.nil? then [] else aws.forwarded_values.headers.items end
@@ -79,6 +82,7 @@ module Cumulus
           "path-pattern" => @path_pattern,
           "target-origin-id" => @target_origin_id,
           "forward-query-strings" => @forward_query_strings,
+          "forward-query-string-cache-keys" => @forward_query_string_cache_keys,
           "forwarded-cookies" => @forwarded_cookies,
           "forwarded-cookies-whitelist" => @forwarded_cookies_whitelist,
           "forward-headers" => @forward_headers,
@@ -103,22 +107,17 @@ module Cumulus
           target_origin_id: @target_origin_id,
           forwarded_values: {
             query_string: @forward_query_strings,
+            query_string_cache_keys: AwsUtil.aws_array(@forward_query_string_cache_keys),
             cookies: {
               forward: @forwarded_cookies,
-              whitelisted_names: {
-                quantity: @forwarded_cookies_whitelist.size,
-                items: if @forwarded_cookies_whitelist.empty? then nil else @forwarded_cookies_whitelist end
-              }
+              whitelisted_names: AwsUtil.aws_array(@forwarded_cookies_whitelist),
             },
-            headers: {
-              quantity: @forward_headers.size,
-              items: if @forward_headers.empty? then nil else @forward_headers end
-            }
+            headers: AwsUtil.aws_array(@forward_headers)
           },
           trusted_signers: {
             enabled: !@trusted_signers.empty?,
             quantity: @trusted_signers.size,
-            items: if @trusted_signers.empty? then nil else @trusted_signers end
+            items: AwsUtil.array_or_nil(@trusted_signers)
           },
           viewer_protocol_policy: @viewer_protocol_policy,
           min_ttl: @min_ttl,
@@ -127,11 +126,8 @@ module Cumulus
           smooth_streaming: @smooth_streaming,
           allowed_methods: {
             quantity: @allowed_methods.size,
-            items: if @allowed_methods.empty? then nil else @allowed_methods end,
-            cached_methods: {
-              quantity: @cached_methods.size,
-              items: if @cached_methods.empty? then nil else @cached_methods end
-            }
+            items: AwsUtil.array_or_nil(@allowed_methods),
+            cached_methods: AwsUtil.aws_array(@cached_methods)
           },
           compress: @compress
         }
@@ -177,6 +173,13 @@ module Cumulus
           diffs << CacheBehaviorDiff.cookies_whitelist(added_cookies, removed_cookies, self)
         end
 
+        aws_query_string_cache_keys = aws.forwarded_values.query_string_cache_keys.items || []
+        added_keys = (@forward_query_string_cache_keys - aws_query_string_cache_keys)
+        removed_keys = (aws_query_string_cache_keys - @forward_query_string_cache_keys)
+        if !(added_keys.empty? && removed_keys.empty?)
+          diffs << CacheBehaviorDiff.query_string_cache_keys(added_keys, removed_keys, self)
+        end
+
         aws_headers = if aws.forwarded_values.headers.nil? then [] else aws.forwarded_values.headers.items end
         added_headers = (@forward_headers - aws_headers)
         removed_headers = (aws_headers - @forward_headers)

data/lib/cloudfront/models/CacheBehaviorDiff.rb

@@ -14,6 +14,7 @@ module Cumulus
       QUERY = Common::DiffChange::next_change_id
       COOKIES = Common::DiffChange::next_change_id
       COOKIES_WHITELIST = Common::DiffChange::next_change_id
+      QUERY_STRING_CACHE_KEYS = Common::DiffChange::next_change_id
       HEADERS = Common::DiffChange::next_change_id
       SIGNERS = Common::DiffChange::next_change_id
       VIEWER_PROTOCOL = Common::DiffChange::next_change_id
@@ -32,6 +33,7 @@ module Cumulus
       include CacheBehaviorChange
 
       attr_accessor :cookies
+      attr_accessor :query_string_cache_keys
       attr_accessor :headers
       attr_accessor :signers
       attr_accessor :allowed_methods
@@ -50,6 +52,20 @@ module Cumulus
         diff
       end
 
+      # Public: Static method that produces a diff representing changes in CacheBehavior query string
+      # cache keys
+      #
+      # added_keys - the keys that were added
+      # removed_keys - the keys that were removed
+      # local - the local configuration for the zone
+      #
+      # Returns the diff
+      def self.query_string_cache_keys(added_keys, removed_keys, local)
+        diff = CacheBehaviorDiff.new(QUERY_STRING_CACHE_KEYS, nil, local)
+        diff.query_string_cache_keys = Common::ListChange.new(added_keys, removed_keys)
+        diff
+      end
+
       # Public: Static method that produces a diff representing changes in CacheBehavior headers
       #
       # added_headers   - the headers that were added
@@ -134,6 +150,12 @@ module Cumulus
             cookies.removed.map{ |removed| Colors.removed("\t#{removed}")},
             cookies.added.map{ |added| Colors.added("\t#{added}")},
           ].flatten.join("\n")
+        when QUERY_STRING_CACHE_KEYS
+          [
+            "Query String Cache Keys:",
+            query_string_cache_keys.removed.map{ |removed| Colors.removed("\t#{removed}") },
+            query_string_cache_keys.added.map{ |added| Colors.added("\t#{added}")}
+          ].flatten.join("\n")
         when HEADERS
           [
             "forwarded headers:",

data/lib/cloudfront/models/CustomHeaderConfig.rb

@@ -0,0 +1,30 @@
+require 'cloudfront/models/CustomHeaderDiff'
+
+module Cumulus
+  module CloudFront
+    CustomHeaderConfig = Struct.new(:name, :value) do
+      def diff(aws)
+        diffs = []
+
+        aws_name = aws && aws.header_name
+        if self.name != aws_name
+          diffs << CustomHeaderDiff.new(CustomHeaderDiff::NAME, aws, self)
+        end
+
+        aws_value = aws && aws.header_value
+        if self.value != aws_value
+          diffs << CustomHeaderDiff.new(CustomHeaderDiff::VALUE, aws, self)
+        end
+
+        diffs
+      end
+
+      def to_aws
+        {
+          header_name: self.name,
+          header_value: self.value
+        }
+      end
+    end
+  end
+end

data/lib/cloudfront/models/CustomHeaderDiff.rb

@@ -0,0 +1,46 @@
+require "common/models/Diff"
+require 'util/Colors'
+
+module Cumulus
+  module CloudFront
+    module CustomHeaderChange
+      include Common::DiffChange
+
+      NAME = Common::DiffChange::next_change_id
+      VALUE = Common::DiffChange::next_change_id
+    end
+
+    class CustomHeaderDiff < Common::Diff
+      include CustomHeaderChange
+
+      def diff_string
+        case @type
+        when NAME
+          [
+            "name:",
+            Colors.aws_changes("\tAWS - #{@aws.header_name}"),
+            Colors.local_changes("\tLocal - #{@local.name}")
+          ].join("\n")
+        when VALUE
+          [
+            "value:",
+            Colors.aws_changes("\tAWS - #{@aws.header_value}"),
+            Colors.local_changes("\tLocal - #{@local.value}")
+          ].join("\n")
+        end
+      end
+
+      def asset_type
+        "Custom Origin Header"
+      end
+
+      def aws_name
+        @aws.header_name
+      end
+
+      def local_name
+        @local.name
+      end
+    end
+  end
+end

data/lib/cloudfront/models/OriginConfig.rb

@@ -1,7 +1,10 @@
 require "conf/Configuration"
+require "cloudfront/models/CustomHeaderConfig"
+require "cloudfront/models/CustomHeaderDiff"
 require "cloudfront/models/CustomOriginConfig"
 require "cloudfront/models/OriginDiff"
 require "cloudfront/models/OriginSslProtocols"
+require "util/AwsUtil"
 
 require "json"
 
@@ -15,6 +18,7 @@ module Cumulus
       attr_reader :origin_path
       attr_reader :s3_access_origin_identity
       attr_reader :custom_origin_config
+      attr_reader :custom_origin_headers
 
       # Public: Constructor
       #
@@ -37,6 +41,13 @@ module Cumulus
               )
             )
           end
+          @custom_headers = if json["custom-headers"].nil?
+            []
+          else
+            json["custom-headers"].map do |name, value|
+              CustomHeaderConfig.new(name, value)
+            end
+          end
           @name = @id
         end
       end
@@ -56,6 +67,9 @@ module Cumulus
             )
           )
         end
+        @custom_headers = (aws.custom_headers.items || []).map do |header|
+          CustomHeaderConfig.new(header.header_name, header.header_value)
+        end
         @name = @id
       end
 
@@ -68,7 +82,10 @@ module Cumulus
           "domain-name" => @domain_name,
           "origin-path" => @origin_path,
           "s3-origin-access-identity" => @s3_access_origin_identity,
-          "custom-origin-config" => if @custom_origin_config.nil? then nil else @custom_origin_config.to_local end
+          "custom-origin-config" => if @custom_origin_config.nil? then nil else @custom_origin_config.to_local end,
+          "custom-headers" => Hash[@custom_headers.map do |header|
+              [header.name, header.value]
+            end]
         }.reject { |k, v| v.nil? }
       end
 
@@ -94,7 +111,8 @@ module Cumulus
                 }
               end
             }
-          end
+          end,
+         custom_headers: AwsUtil.aws_array(@custom_headers.map(&:to_aws))
         }
       end
 
@@ -136,9 +154,44 @@ module Cumulus
           diffs << OriginDiff.custom(custom_diffs, aws, self) if !custom_diffs.empty?
         end
 
+        header_diffs = diff_custom_headers(aws.custom_headers.items)
+        if !header_diffs.empty?
+          diffs << OriginDiff.headers(header_diffs, self)
+        end
+
         diffs.flatten
       end
 
+      # Internal : Produce an array of difference between local and remove custom origin headers
+      #
+      # aws_headers - the custom origin headers
+      #
+      # Returns an array of CustomHeaderDiffs that were found
+      def diff_custom_headers(aws_headers)
+        diffs = []
+
+        #map headers to their names
+        aws = Hash[aws_headers.map { |o| [o.header_name, o] }]
+        local = Hash[@custom_headers.map { |o| [o.name, o] }]
+
+        # find headers not configured locally
+        aws.each do |header_name, header|
+          if !local.include?(header_name)
+            diffs << CustomHeaderDiff.unmanaged(header)
+          end
+        end
+
+        local.each do |header_name, header|
+          if !aws.include?(header_name)
+            diffs << CustomHeaderDiff.added(header)
+          else
+            diffs += header.diff(aws[header_name])
+          end
+        end
+
+        diffs
+      end
+
     end
   end
 end

data/lib/cloudfront/models/OriginDiff.rb

@@ -12,6 +12,7 @@ module Cumulus
       PATH = Common::DiffChange::next_change_id
       S3 = Common::DiffChange::next_change_id
       CUSTOM = Common::DiffChange::next_change_id
+      HEADERS = Common::DiffChange::next_change_id
     end
 
     # Public: Represents a single difference between local configuration and AWS
@@ -20,6 +21,7 @@ module Cumulus
       include OriginChange
 
       attr_accessor :custom_changes
+      attr_accessor :changed_headers
 
       # Public: Static method that produces a diff representing changes in custom origin
       #
@@ -33,6 +35,12 @@ module Cumulus
         diff
       end
 
+      def self.headers(changes, local)
+        diff = OriginDiff.new(HEADERS, nil, local)
+        diff.changed_headers = changes
+        diff
+      end
+
       def diff_string
         case @type
         when DOMAIN
@@ -61,6 +69,20 @@ module Cumulus
               c.to_s.lines.map { |l| "\t#{l.chomp}"}
             end).join("\n"),
           ].join("\n")
+        when HEADERS
+          [
+            "custom headers:",
+            @changed_headers.map do |h|
+              if h.type == ADD or h.type == UNMANAGED
+                h.to_s.lines.map{ |l| "\t#{l}".chomp("\n") }
+              else
+                [
+                  "\t#{h.local_name}",
+                  h.to_s.lines.map { |l| "\t\t#{l}".chomp("\n")}
+                ]
+              end
+            end
+          ].flatten.join("\n")
         end
       end
 

data/lib/util/AwsUtil.rb

@@ -0,0 +1,34 @@
+module AwsUtil
+  # Public: Static method that converts an array to an object that can be used in the
+  # AWS API (with quantity and items)
+  #
+  # arr - the array to convert
+  #
+  # Returns an object with quantity and items
+  def self.aws_array(arr)
+    if arr.nil? || arr.empty?
+      {
+        quantity: 0,
+        items: nil
+      }
+    else
+      {
+        quantity: arr.size,
+        items: arr
+      }
+    end
+  end
+
+  # Public: Static method that returns nil if an array is empty
+  #
+  # arr - an array to conver
+  #
+  # Returns nil if the array is empty, or the original array otherwise
+  def self.array_or_nil(arr)
+    if arr.nil? || arr.empty?
+      nil
+    else
+      arr
+    end
+  end
+end

data/lucid-cumulus.gemspec

@@ -4,7 +4,7 @@ require "bundler"
 
 Gem::Specification.new do |s|
   s.name                      = "lucid-cumulus"
-  s.version                   = "0.11.6"
+  s.version                   = "0.11.7"
   s.platform                  = Gem::Platform::RUBY
   s.authors                   = ["Keilan Jackson", "Mark Siebert"]
   s.email                     = "cumulus@lucidchart.com"
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.executables               = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.license                   = "Apache-2.0"
 
-  s.add_runtime_dependency "aws-sdk", "2.2.30"
+  s.add_runtime_dependency "aws-sdk", "~> 2.6.3"
   s.add_runtime_dependency "parse-cron", "~> 0.1.4"
   s.add_runtime_dependency "deepsort", "~> 0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lucid-cumulus
 version: !ruby/object:Gem::Version
-  version: 0.11.6
+  version: 0.11.7
 platform: ruby
 authors:
 - Keilan Jackson
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-17 00:00:00.000000000 Z
+date: 2016-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.30
+        version: 2.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.2.30
+        version: 2.6.3
 - !ruby/object:Gem::Dependency
   name: parse-cron
   requirement: !ruby/object:Gem::Requirement
@@ -114,6 +114,8 @@ files:
 - lib/cloudfront/manager/Manager.rb
 - lib/cloudfront/models/CacheBehaviorConfig.rb
 - lib/cloudfront/models/CacheBehaviorDiff.rb
+- lib/cloudfront/models/CustomHeaderConfig.rb
+- lib/cloudfront/models/CustomHeaderDiff.rb
 - lib/cloudfront/models/CustomOriginConfig.rb
 - lib/cloudfront/models/CustomOriginDiff.rb
 - lib/cloudfront/models/DistributionConfig.rb
@@ -221,6 +223,7 @@ files:
 - lib/sqs/models/DeadLetterDiff.rb
 - lib/sqs/models/QueueConfig.rb
 - lib/sqs/models/QueueDiff.rb
+- lib/util/AwsUtil.rb
 - lib/util/Colors.rb
 - lib/util/StatusCodes.rb
 - lib/vpc/Commands.rb