skull_island 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a5d7af669323fdbe1216566cf8baeba91724c2292de92a283d39cd3bd1aac4e
-  data.tar.gz: 55cf31d7419e2cb52f132bf906a02de85d5f79c97bbb2c63f3b8d25889c92af1
+  metadata.gz: eff79cef47f9764701711c87bef82cded9cc3b7e58b4a21bc245042dbb77600f
+  data.tar.gz: 6f433b14ac328bd48fba2c7eadfdeff256b5f1c97c3f298665c2f25fc1a14327
 SHA512:
-  metadata.gz: 335c95cdfbb85ba6979b1d2460ea317fb5aff1207edcd24ebda4fb1974b9e0204bed1e52fd99ad703a809fbaef65517095c1521341e857c5e09be50223393553
-  data.tar.gz: 002752d03a6dfd2ce7caae75389765608f24dcbfdef00bf7ed85a3fa5c18b82e58de35f9466bce9e7d7f77976af8d17d17d73e6407b41783e6f7d29565c87c27
+  metadata.gz: f2422ea1ebd93c4b3f62c8b9229ca8bb8277abef46c036a79ac2a35fa7cd29e4c829a5eaea3df5917c74f1758ed73310f39580c7ce91617574e2127bd118c82e
+  data.tar.gz: 9b6026082b5d2811617cda731a4887eb1d54a89935f3c78a06ecce61a399b9b20d432613510428edab0e99372bcc5b4f359842f2ea4ccbc18fee7615bbb825e8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (2.0.1)
+    skull_island (2.0.3)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)
@@ -62,7 +62,7 @@ GEM
     net-http-pipeline (1.0.1)
     netrc (0.11.0)
     parallel (1.19.1)
-    parser (2.7.0.2)
+    parser (2.7.0.3)
       ast (~> 2.4.0)
     pusher-client (0.6.2)
       json
@@ -88,7 +88,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.80.0)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.7.0.1)
@@ -97,7 +97,7 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    simplecov (0.18.4)
+    simplecov (0.18.5)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
     simplecov-html (0.12.1)
@@ -123,7 +123,7 @@ GEM
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.1)
     websocket (1.2.8)
-    will_paginate (3.2.1)
+    will_paginate (3.3.0)
     yard (0.9.24)
 
 PLATFORMS

data/README.md

@@ -270,7 +270,7 @@ plugins:
   service: "<%= lookup :service, 'search_api' %>"
 ```
 
-All top-level keys (other than `version` and `project`) require an Array as a parameter, either by providing a list of entries or an empty Array (`[]`), or they can be omitted entirely which is the same as providing an empty Array. The above shows how to use the `lookup()` function to refer to another resource. This "looks up" the resource type (`service` in this case) by `name` (`search_api` in this case) and resolves its `id`. This function can also be used to lookup a `route` or `upstream` by its `name`, or a `consumer` by its `username`. Note that Kong itself doesn't _require_ `route` resources to have unique names, so you'll need to enforce that practice yourself for `lookup` to be useful for Routes.
+All top-level keys (other than `version` and `project`) require an Array as a parameter, either by providing a list of entries or an empty Array (`[]`), or they can be omitted entirely which is the same as providing an empty Array. The above shows how to use the `lookup()` function to refer to another resource. This "looks up" the resource type (`service` in this case) by `name` (`search_api` in this case) and resolves its `id`. This function can also be used to lookup a `route` or `upstream` by its `name`, or a `consumer` by its `username`. Note that Kong itself doesn't _require_ `route` resources to have unique names, so you'll need to enforce that practice yourself for `lookup` to be useful for Routes. The `lookup` function also supports a third parameter to provide just the `id` value, rather than wrapping it in a key/value pair of `id: 9992...`. Simple call `lookup` like `lookup :service, 'search_api', true` to turn on this "raw id mode".
 
 Note that while this configuration looks a lot like the [DB-less](https://docs.konghq.com/1.4.x/db-less-and-declarative-config/) configuration (and even may, at times, be interchangeable), this is merely a coincidence. **Skull Island doesn't support the DB-less mode for Kong.** This may potentially change in the future, but for now it is not a goal of this project.
 

data/lib/skull_island/helpers/cli_erb.rb

@@ -12,8 +12,8 @@ module SkullIsland
       end
 
       # At this phase, we want to leave this alone...
-      def lookup(type, value)
-        "<%= lookup :#{type}, '#{value}' %>"
+      def lookup(type, value, raw = false)
+        "<%= lookup :#{type}, '#{value}', #{raw} %>"
       end
     end
   end

data/lib/skull_island/helpers/resource.rb

@@ -105,19 +105,22 @@ module SkullIsland
       # rubocop:enable Metrics/CyclomaticComplexity
       # rubocop:enable Metrics/PerceivedComplexity
 
-      def lookup(type, value)
-        case type
-        when :consumer
-          { 'id' => Resources::Consumer.find(:username, value).id }
-        when :route
-          { 'id' => Resources::Route.find(:name, value).id }
-        when :service
-          { 'id' => Resources::Service.find(:name, value).id }
-        when :upstream
-          { 'id' => Resources::Upstream.find(:name, value).id }
-        else
-          raise Exceptions::InvalidArguments, "#{type} is not a valid lookup type"
-        end
+      # Looks up IDs (and usually wraps them in a Hash)
+      def lookup(type, value, raw = false)
+        id_value = case type
+                   when :consumer
+                     Resources::Consumer.find(:username, value).id
+                   when :route
+                     Resources::Route.find(:name, value).id
+                   when :service
+                     Resources::Service.find(:name, value).id
+                   when :upstream
+                     Resources::Upstream.find(:name, value).id
+                   else
+                     raise Exceptions::InvalidArguments, "#{type} is not a valid lookup type"
+                   end
+
+        raw ? id_value : { 'id' => id_value }
       end
 
       # ActiveRecord ActiveModel::Name compatibility method

data/lib/skull_island/resources/route.rb

@@ -20,6 +20,7 @@ module SkullIsland
       property :strip_path,     type: :boolean
       property :preserve_host,  type: :boolean
       property :snis,           validate: true
+      property :path_handling,  validate: true
       property :sources
       property :destinations
       property :service, validate: true, preprocess: true, postprocess: true
@@ -135,6 +136,12 @@ module SkullIsland
         end
       end
 
+      # Used to validate {#path_handling} on set
+      def validate_path_handling(value)
+        valid_values = %w[v0 v1]
+        valid_values.include?(value)
+      end
+
       # Used to validate {#protocols} on set
       def validate_protocols(value)
         valid_protos = %w[http https tls tcp grpc grpcs]

data/lib/skull_island/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-25 00:00:00.000000000 Z
+date: 2020-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort