skull_island 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f268c820dcd42d72c73df67cb9cda9440704fd4d4ad18bab086497b4eff049f1
-  data.tar.gz: 9dc739be3c2cd49f6f2babdc88f7156018f3ca5c97c373ede064be3d6a4e4724
+  metadata.gz: cc28c229371cd2d9f0cfef962e87ac95f27da4bd38d4a1990d2ba43ff0b9c275
+  data.tar.gz: 2d61dbedf12cca6c6d05c4b587a842dd0251d04182db207b14767f6b1aa34f1d
 SHA512:
-  metadata.gz: 41be4de3f825f795d9354c3164c27ff2046fbbfb4705fc20dbf218f39590c5aff190d66aa9ec5e2dc45110c1711f011da39631a8e47c2cb4b2133b598f3140c1
-  data.tar.gz: 1b5172d9079706284c70495a3d69b4b7a0c8875ef03df9e93aae896a98d13007051687da4004fe66f4236e473172e33c9b71c67d8eb74c93f2bc84e43d937e17
+  metadata.gz: 100978336f6bbb9b8c7ef129c84ce98cf32139564e44818024ba4026118bbd5e75895a03e1ecd66bea299ef7bc0d9d3f7c424340d1676850e11b6af44bba5a1d
+  data.tar.gz: f1b508505ac2dbbfaab2e1091cc4c59f9b7be19337b44ee38de9132bc6ef05c3db5306563d0fe40c7350e3bf3041c93316759f51cacb470812e5163d8c35204b

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    skull_island (1.2.9)
+    skull_island (1.2.10)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)
       linguistics (~> 2.1)
-      rest-client (~> 2.0)
+      rest-client (~> 2.1)
       thor (~> 0.20)
       will_paginate (~> 3.1)
 
@@ -16,6 +16,12 @@ GEM
     addressable (2.4.0)
     ast (2.4.0)
     backports (3.15.0)
+    coveralls (0.7.1)
+      multi_json (~> 1.3)
+      rest-client
+      simplecov (>= 0.7)
+      term-ansicolor
+      thor
     deepsort (0.4.2)
     diff-lcs (1.3)
     docile (1.3.2)
@@ -37,6 +43,7 @@ GEM
       net-http-persistent (~> 2.9)
       net-http-pipeline
     highline (1.7.10)
+    http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
     jaro_winkler (1.5.3)
@@ -46,23 +53,24 @@ GEM
     linguistics (2.1.0)
       loggability (~> 0.11)
     loggability (0.14.0)
-    mime-types (3.2.2)
+    mime-types (3.3)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2019.0331)
+    mime-types-data (3.2019.0904)
     multi_json (1.13.1)
     multipart-post (2.1.1)
     net-http-persistent (2.9.4)
     net-http-pipeline (1.0.1)
     netrc (0.11.0)
     parallel (1.17.0)
-    parser (2.6.3.0)
+    parser (2.6.4.0)
       ast (~> 2.4.0)
     pusher-client (0.6.2)
       json
       websocket (~> 1.0)
     rainbow (3.0.0)
-    rake (10.5.0)
-    rest-client (2.0.2)
+    rake (12.3.3)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
@@ -92,7 +100,10 @@ GEM
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
+    term-ansicolor (1.7.1)
+      tins (~> 1.0)
     thor (0.20.3)
+    tins (1.21.1)
     travis (1.8.10)
       backports
       faraday (~> 0.9)
@@ -109,7 +120,7 @@ GEM
     unf_ext (0.0.7.6)
     unicode-display_width (1.6.0)
     websocket (1.2.8)
-    will_paginate (3.1.7)
+    will_paginate (3.1.8)
     yard (0.9.20)
 
 PLATFORMS
@@ -117,10 +128,11 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  rake (~> 10.0)
+  coveralls (~> 0.7)
+  rake (~> 12.0)
   rspec (~> 3.0)
   rubocop (~> 0.50)
-  simplecov (~> 0.15)
+  simplecov (~> 0.17)
   skull_island!
   travis (~> 1.8)
   yard (~> 0.9.20)

data/README.md

@@ -2,6 +2,11 @@
 
 A full-featured SDK for [Kong](https://konghq.com/kong/) 1.1.x/1.2.x (with support for migrating from 0.14.x). Note that this is unofficial (meaning this project is in no way officially endorsed, recommended, or related to Kong [as a company](https://konghq.com/) or an [open-source project](https://github.com/Kong/kong)). It is also in no way related to the [pet toy company](https://www.kongcompany.com/) by the same name (but hopefully that was obvious).
 
+![Gem](https://img.shields.io/gem/v/skull_island)
+![Travis (.org)](https://img.shields.io/travis/jgnagy/skull_island)
+![Depfu](https://img.shields.io/depfu/jgnagy/skull_island)
+![Docker Cloud Build Status](https://img.shields.io/docker/cloud/build/jgnagy/skull_island)
+
 ## Installation
 
 ### CLI Tool
@@ -262,9 +267,15 @@ plugins:
 
 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 (`[]`). 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.
 
+Note that while this configuration looks a lot like the [DB-less](https://docs.konghq.com/1.1.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.
+
+#### Embedded Ruby
+
 While technically _any_ Ruby is valid, the following are pretty helpful for templating your YAML files:
 
-* `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`.
+* `lookup(:service, 'foo')` -  This function resolves the ID of a `service` named `foo`. Lookup supports `:consumer` (looking up the `username` attribute), `:service`, `:route`, or `:upstream` (resolving the `name` attribute).
+
+* `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.
 
 ## SDK Usage
 

data/lib/skull_island/api_client_base.rb

@@ -31,12 +31,25 @@ module SkullIsland
 
     def get(uri, data = nil)
       client_action do |client|
-        # TODO: Support the API's pagination through the "next" top-level key
-        if data
-          JSON.parse client[uri].get(json_headers.merge(params: data))
-        else
-          JSON.parse client[uri].get(json_headers)
+        results = nil
+        params = {}
+        params.merge(data) if data
+        # OPTIMIZE: Move to an Enumerable
+        loop do
+          follow_up = JSON.parse client[uri].get(json_headers.merge(params: params))
+
+          if results
+            results['data'] += follow_up['data']
+          else
+            results = follow_up.dup
+            results.delete('offset')
+            results.delete('next')
+          end
+
+          params = params.merge('offset' => follow_up['offset']) if follow_up.key?('offset')
+          raise StopIteration unless follow_up.key?('offset')
         end
+        results
       end
     end
 

data/lib/skull_island/resources/access_control_list.rb

@@ -70,7 +70,8 @@ module SkullIsland
           Consumer.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value

data/lib/skull_island/resources/basicauth_credential.rb

@@ -111,7 +111,8 @@ module SkullIsland
           Consumer.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value

data/lib/skull_island/resources/jwt_credential.rb

@@ -81,7 +81,8 @@ module SkullIsland
           Consumer.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value

data/lib/skull_island/resources/keyauth_credential.rb

@@ -70,7 +70,8 @@ module SkullIsland
           Consumer.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value

data/lib/skull_island/resources/plugin.rb

@@ -125,13 +125,15 @@ module SkullIsland
           Consumer.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         elsif value.is_a?(String)
           Consumer.new(
             entity: { 'id' => value },
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value
@@ -153,13 +155,15 @@ module SkullIsland
           Route.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         elsif value.is_a?(String)
           Route.new(
             entity: { 'id' => value },
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value
@@ -181,13 +185,15 @@ module SkullIsland
           Service.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         elsif value.is_a?(String)
           Service.new(
             entity: { 'id' => value },
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value

data/lib/skull_island/resources/route.rb

@@ -111,7 +111,8 @@ module SkullIsland
           Service.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value

data/lib/skull_island/resources/upstream.rb

@@ -89,7 +89,7 @@ module SkullIsland
       end
 
       def target(target_id)
-        targets.where(id: target_id).first
+        targets.where(:id, target_id).first
       end
 
       def targets

data/lib/skull_island/resources/upstream_target.rb

@@ -120,7 +120,8 @@ module SkullIsland
           Upstream.new(
             entity: value,
             lazy: true,
-            tainted: false
+            tainted: false,
+            api_client: api_client
           )
         else
           value

data/lib/skull_island/version.rb

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

data/skull_island.gemspec

@@ -30,15 +30,16 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'erubi', '~> 1.8'
   spec.add_runtime_dependency 'json', '~> 2.1'
   spec.add_runtime_dependency 'linguistics', '~> 2.1'
-  spec.add_runtime_dependency 'rest-client', '~> 2.0'
+  spec.add_runtime_dependency 'rest-client', '~> 2.1'
   spec.add_runtime_dependency 'thor', '~> 0.20'
   spec.add_runtime_dependency 'will_paginate', '~> 3.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'coveralls', '~> 0.7'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.50'
-  spec.add_development_dependency 'simplecov', '~> 0.15'
+  spec.add_development_dependency 'simplecov', '~> 0.17'
   spec.add_development_dependency 'travis', '~> 1.8'
   spec.add_development_dependency 'yard', '~> 0.9.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skull_island
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-08 00:00:00.000000000 Z
+date: 2019-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: coveralls
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +184,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: '0.17'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement