skull_island 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00a7b4f233be82c0837c704cc2db5e07ede909632c2e54e413962f4343908974
-  data.tar.gz: 28589bf89713ddc2a039b861d7a1290677b6c69b5bdfe2f5a7ea62bce05fa52e
+  metadata.gz: 5a5d7af669323fdbe1216566cf8baeba91724c2292de92a283d39cd3bd1aac4e
+  data.tar.gz: 55cf31d7419e2cb52f132bf906a02de85d5f79c97bbb2c63f3b8d25889c92af1
 SHA512:
-  metadata.gz: b2530b37d2f914b1f6c6c419fa9b0c8dfb39dd9c760c51f0135bc9267eea4aab94ea3e8ae1c6058731356125a63ca1aafe5a6e97ac74ad5feb440849a28bb45b
-  data.tar.gz: c5231a55b789eb6cd602f34c7643585a8142adb81f722e96a805b0b91509d16f05df7708f811d61cfa6b76ce67dfbb0c898506b014c7395634a40c4f95808968
+  metadata.gz: 335c95cdfbb85ba6979b1d2460ea317fb5aff1207edcd24ebda4fb1974b9e0204bed1e52fd99ad703a809fbaef65517095c1521341e857c5e09be50223393553
+  data.tar.gz: 002752d03a6dfd2ce7caae75389765608f24dcbfdef00bf7ed85a3fa5c18b82e58de35f9466bce9e7d7f77976af8d17d17d73e6407b41783e6f7d29565c87c27

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (2.0.0)
+    skull_island (2.0.1)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)

data/README.md

@@ -282,7 +282,7 @@ While technically _any_ Ruby is valid, the following are pretty helpful for temp
 
 * `ENV.fetch('VARIABLE_NAME', 'default value')` - This allows looking up the environment variable `VARIABLE_NAME` and using its value, or, if it isn't defined, it uses `default value` as the value. With this we could change `host: api.example.com` to `host: <%= ENV.fetch('API_HOST', 'api.example.com') %>`. With this, if `API_HOST` is provided, it'll use that, otherwise it will default to `api.example.com`. This is especially helpful for sensitive information; you can version control the configuration but pass in things like credentials via environment variables at runtime.
 
-Note also that 1.4.x and beyond of Skull Island support two phases of embedded ruby: first, a simple phase that treats the **entire file** as just text, allowing you to use the full power of ruby for things like loops, conditional logic, and more; the second phase is applied for individual attributes within the rendered YAML document. This is where the `lookup()` function above is used. 
+Note also that 1.4.x and beyond of Skull Island support two phases of embedded ruby: first, a simple phase that treats the **entire file** as just text, allowing you to use the full power of ruby for things like loops, conditional logic, and more; the second phase is applied for individual attributes within the rendered YAML document. This is where the `lookup()` function above is used.
 
 ## SDK Usage
 

data/lib/core_extensions/hash/pruning.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module CoreExtensions
+  module Hash
+    # Monkey-patches for Hash to add some recursive pruning options
+    module Pruning
+      # Recursively strips empty and nil elements from a Hash
+      # @return [Hash]
+      def prune
+        newhash = {}
+
+        each do |k, v|
+          if v.is_a?(Hash)
+            newvalue = v.prune
+            newhash[k] = newvalue unless newvalue.empty?
+          elsif v.respond_to?(:empty?)
+            newhash[k] = v unless v.empty?
+          else
+            newhash[k] = v unless v.nil?
+          end
+        end
+
+        newhash
+      end
+    end
+  end
+end

data/lib/skull_island/resources/plugin.rb

@@ -117,7 +117,7 @@ module SkullIsland
       end
 
       def postprocess_config(value)
-        value.deep_sort.compact
+        value.deep_sort.prune.compact
       end
 
       def postprocess_consumer(value)

data/lib/skull_island/resources/upstream.rb

@@ -18,7 +18,7 @@ module SkullIsland
       property :hash_fallback_header, validate: true
       property :hash_on_cookie, validate: true
       property :hash_on_cookie_path, validate: true
-      property :healthchecks, validate: true
+      property :healthchecks, validate: true, postprocess: true
       property :host_header, validate: true
       property :created_at, read_only: true, postprocess: true
       property :tags, validate: true, preprocess: true, postprocess: true
@@ -160,6 +160,11 @@ module SkullIsland
 
       private
 
+      # Prunes empty values from the healthchecks Hash
+      def postprocess_healthchecks(value)
+        value.is_a?(Hash) ? value.prune : value
+      end
+
       # Validates the upstream balancing {#algorithm}
       def validate_algorithm(value)
         %w[round-robin consistent-hashing least-connections].include?(value)

data/lib/skull_island/version.rb

@@ -4,6 +4,6 @@ module SkullIsland
   VERSION = [
     2, # Major
     0, # Minor
-    0  # Patch
+    1  # Patch
   ].join('.')
 end

data/lib/skull_island.rb

@@ -2,7 +2,9 @@
 
 # Core Extensions
 require 'core_extensions/string/transformations'
+require 'core_extensions/hash/pruning'
 String.include CoreExtensions::String::Transformations
+Hash.include CoreExtensions::Hash::Pruning
 
 # Standard Library Requirements
 require 'date'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jonathan Gnagy
@@ -241,6 +241,7 @@ files:
 - bin/console
 - bin/setup
 - exe/skull_island
+- lib/core_extensions/hash/pruning.rb
 - lib/core_extensions/string/transformations.rb
 - lib/skull_island.rb
 - lib/skull_island/api_client.rb