skull_island 2.2.1 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '08939c35fee9b8e4c4365c3f723fd72613ab4f5294df58e8f1d4512f67a3f259'
-  data.tar.gz: 180ef4c7198571533c8c1744224014df3fb40b0546b085b941bb13aa119f2821
+  metadata.gz: 4c60e10eb38126c1a9f4cf6d513f1f7570021bb58ef4ebe5269c8b07899f912b
+  data.tar.gz: 5d9a98c6c61df6d7c4785d65a7204bdd7fdbe42693dce28b965c391207111f38
 SHA512:
-  metadata.gz: ca8d64d98746acb99b690cdfa363eee82faf8e08c4046ef5916cdd8db70d578e98ef34e8a31800064aa37c6b11fa01540d205b60757ebdfa634be8f132a3d4a7
-  data.tar.gz: f31992f4bc045905976ce6b73920605dec99a138fe4cfefde2f061b3f601d3a86ba9b0f202548aebfac54ff9daad61673a1114d53e73f308781b2961e5795c72
+  metadata.gz: c488e0fc70f8e06c93615a40e74b628354340f7e07289bca47129eca487275f6a448811537c48ce3a92d495ae1fcf96bdbc494ba7f5f7bb3edf39334c02c02fc
+  data.tar.gz: 84f97ff13a4f91dcb0f8c47781cb961c544b5954d65c05d69b3a545e26ddacaa59e8f841a039fd9d3a5c2352e930dcb999db5a3438554636280e9b007d42b516

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 3.0
   NewCops: enable
 
 Metrics/MethodLength:

data/.travis.yml

@@ -1,10 +1,23 @@
+env:
+  global:
+  - CC_TEST_REPORTER_ID=403b284cf8ed6f468a3d861a70b02c6cdec30225dfb435861b19a12cafbef426
 language: ruby
 cache: bundler
 rvm:
-- 2.5
-- 2.6
-- 2.7
-before_install: gem install bundler -v '~> 2.0'
+- 3.0
+
+before_install: gem install bundler -v '~> 2.2'
+
+before_script:
+  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+  - chmod +x ./cc-test-reporter
+  - ./cc-test-reporter before-build
+
+after_script:
+  - ./cc-test-reporter format-coverage -t cobertura coverage/coverage.xml
+  - ./cc-test-reporter upload-coverage
+  - exit $TRAVIS_TEST_RESULT
+
 deploy:
   provider: rubygems
   api_key:
@@ -12,5 +25,5 @@ deploy:
   gem: skull_island
   on:
     tags: true
-    rvm: 2.6
+    rvm: 3.0
     repo: jgnagy/skull_island

data/Dockerfile

@@ -1,4 +1,4 @@
-FROM ruby:2.5-alpine
+FROM ruby:3.0-alpine
 LABEL maintainer="Jonathan Gnagy <jonathan.gnagy@gmail.com>"
 
 COPY . /install

data/Gemfile.lock

@@ -1,33 +1,32 @@
 PATH
   remote: .
   specs:
-    skull_island (2.2.1)
+    skull_island (2.3.3)
       deepsort (~> 0.4)
       erubi (~> 1.8)
-      json (~> 2.1)
       linguistics (~> 2.1)
       rest-client (~> 2.1)
       thor (~> 1.0)
       will_paginate (~> 3.1)
+      yajl-ruby (~> 1.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.4.4)
+    activesupport (5.2.4.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    ast (2.4.1)
+    ast (2.4.2)
     concurrent-ruby (1.1.8)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
+    coveralls_reborn (0.20.0)
+      simplecov (>= 0.18.1, < 0.22.0)
+      term-ansicolor (~> 1.6)
+      thor (>= 0.20.3, < 2.0)
+      tins (~> 1.16)
     deepsort (0.4.5)
     diff-lcs (1.4.4)
     docile (1.3.5)
@@ -53,7 +52,7 @@ GEM
     http-accept (1.7.0)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    i18n (1.8.7)
+    i18n (1.8.9)
       concurrent-ruby (~> 1.0)
     json (2.5.1)
     json_pure (2.5.1)
@@ -64,7 +63,7 @@ GEM
     loggability (0.18.2)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0212)
     minitest (5.14.3)
     multi_json (1.15.0)
     multipart-post (2.1.1)
@@ -96,10 +95,10 @@ GEM
     rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-support (3.10.1)
+    rspec-support (3.10.2)
     rubocop (0.93.1)
       parallel (~> 1.10)
       parser (>= 2.7.1.5)
@@ -109,7 +108,7 @@ GEM
       rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (1.4.0)
+    rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
     ruby2_keywords (0.0.4)
@@ -117,12 +116,14 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
+    simplecov-cobertura (1.4.2)
+      simplecov (~> 0.8)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
     sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
     tins (1.28.0)
       sync
@@ -142,6 +143,7 @@ GEM
     unicode-display_width (1.7.0)
     websocket (1.2.9)
     will_paginate (3.3.0)
+    yajl-ruby (1.4.1)
     yard (0.9.26)
 
 PLATFORMS
@@ -149,14 +151,15 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  coveralls (~> 0.7)
+  coveralls_reborn (~> 0.20)
   rake (~> 13.0)
   rspec (~> 3.0)
   rubocop (~> 0.50)
-  simplecov (~> 0.17)
+  simplecov (~> 0.21)
+  simplecov-cobertura (~> 1.3)
   skull_island!
   travis (~> 1.8)
   yard (~> 0.9.20)
 
 BUNDLED WITH
-   2.2.6
+   2.2.11

data/README.md

@@ -1,6 +1,6 @@
 # Skull Island
 
-A full-featured SDK for [Kong](https://konghq.com/kong/) 2.2.x (with support 2.0.x and 2.1.x, and for migrating from 0.14.x, 1.1.x, 1.2.x, 1.4.x, and 1.5.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).
+A full-featured SDK for [Kong](https://konghq.com/kong/) 2.3.x (with support 2.0.x, 2.1.x, and 2.2.x, and for migrating from 0.14.x, 1.1.x, 1.2.x, 1.4.x, and 1.5.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)
@@ -21,7 +21,9 @@ skull_island help
 
 ### Ruby Gem Install / SDK
 
-Either:
+**Note:** Starting with 2.3.0, Skull Island only supports Ruby 3.0+. If you need to use Ruby 2.x, you'll need to use a gem version < 2.3.0. I'll maintain the 2.2.x line for Ruby 2.x compatibility for 2021.
+
+To use the Skull Island gem, either:
 
 ```sh
 gem install skull_island
@@ -30,7 +32,7 @@ gem install skull_island
 Or add this to your Gemfile:
 
 ```ruby
-gem 'skull_island',  '~> 2.2'
+gem 'skull_island',  '~> 2.3'
 ```
 
 Or add this to your .gemspec:
@@ -38,7 +40,7 @@ Or add this to your .gemspec:
 ```ruby
 Gem::Specification.new do |spec|
  # ...
- spec.add_runtime_dependency 'skull_island', '~> 2.2'
+ spec.add_runtime_dependency 'skull_island', '~> 2.3'
  # ...
 end
 ```
@@ -149,7 +151,7 @@ When using the `project` feature of Skull Island, the CLI tool will automaticall
 
 ### Migrating
 
-With Skull Island, it is possible to migrate a configuration from a 0.14.x, 1.1.x, 1.2.x, 1.4.x, or 1.5.x gateway to the most recent compatible gateway. If you have a previous export, you can just run `skull_island migrate /path/to/export.yml` and you'll receive a 2.2 compatible config on standard out. If you'd prefer, you can have that config written to a file as well (just like the export command) like so:
+With Skull Island, it is possible to migrate a configuration from a 0.14.x, 1.1.x, 1.2.x, 1.4.x, or 1.5.x gateway to the most recent compatible gateway. If you have a previous export, you can just run `skull_island migrate /path/to/export.yml` and you'll receive a 2.3 compatible config on standard out. If you'd prefer, you can have that config written to a file as well (just like the export command) like so:
 
 ```sh
 skull_island migrate /path/to/export.yml /output/location/migrated.yml
@@ -159,7 +161,7 @@ While this hasn't been heavily tested for all possible use-cases, any configurat
 
 If you don't have a previous export, you'll need to install an older version of this gem using something like `gem install --version '~> 0.14' skull_island`, then perform an `export`, then you can switch back to the latest version of the gem for migrating and importing.
 
-While it would be possible to make migration _automatic_ for the `import` command, `skull_island` intentionally doesn't do this to avoid the appearance that the config is losslessly compatible across versions. In reality, the newer config version has additional features (like tagging) that are used heavily by skull_island. It makes sense to this author to maintain the migration component and the normal functionality as distinct features to encourage the use of the newer capabilities in 1.1 and beyond. That said, Skull Island does allow 1.x, 2.0.x, and 2.1.x version configurations to be applied to 2.2 gateways, but not the opposite.
+While it would be possible to make migration _automatic_ for the `import` command, `skull_island` intentionally doesn't do this to avoid the appearance that the config is losslessly compatible across versions. In reality, the newer config version has additional features (like tagging) that are used heavily by skull_island. It makes sense to this author to maintain the migration component and the normal functionality as distinct features to encourage the use of the newer capabilities in 1.1 and beyond. That said, Skull Island does allow 1.x, 2.0.x, 2.1.x, and 2.2.x version configurations to be applied to 2.3 gateways, but not the opposite.
 
 ### Reset A Gateway
 
@@ -188,7 +190,7 @@ If you're wondering what version of `skull_island` is installed, use:
 ```sh
 $ skull_island version
 
-SkullIsland Version: 2.2.0
+SkullIsland Version: 2.3.0
 ```
 
 ### File Format
@@ -197,7 +199,7 @@ The import/export/migrate CLI functions produce YAML with support for embedded R
 
 ```yaml
 ---
-version: '2.2'
+version: '2.3'
 project: FooV2
 certificates: []
 ca_certificates:
@@ -398,7 +400,7 @@ service.routes.size
 # => 4
 ```
 
-From here, the SDK mostly wraps the attributes described in the [Kong API Docs](https://docs.konghq.com/2.2.x/admin-api/). For simplicity, I'll go over the resource types and attributes this SDK supports manipulating. Rely on the API documentation to determine which attributes are required and under which conditions.
+From here, the SDK mostly wraps the attributes described in the [Kong API Docs](https://docs.konghq.com/2.3.x/admin-api/). For simplicity, I'll go over the resource types and attributes this SDK supports manipulating. Rely on the API documentation to determine which attributes are required and under which conditions.
 
 #### CA Certificates
 

data/lib/skull_island.rb

@@ -9,7 +9,6 @@ Hash.include CoreExtensions::Hash::Pruning
 # Standard Library Requirements
 require 'date'
 require 'digest'
-require 'json'
 require 'singleton'
 require 'uri'
 require 'yaml'
@@ -22,6 +21,7 @@ Linguistics.use(:en)
 require 'rest-client'
 require 'will_paginate'
 require 'will_paginate/array'
+require 'yajl/json_gem'
 
 # Internal Requirements
 require 'skull_island/version'

data/lib/skull_island/cli.rb

@@ -30,7 +30,7 @@ module SkullIsland
 
       validate_server_version
 
-      output = { 'version' => '2.2' }
+      output = { 'version' => '2.3' }
       output['project'] = options['project'] if options['project']
 
       [
@@ -191,7 +191,7 @@ module SkullIsland
     end
 
     def validate_config_version(version)
-      if version && ['1.1', '1.2', '1.4', '1.5', '2.0', '2.1', '2.2'].include?(version)
+      if version && ['1.1', '1.2', '1.4', '1.5', '2.0', '2.1', '2.2', '2.3'].include?(version)
         validate_server_version
       elsif version && ['0.14', '1.0'].include?(version)
         warn '[CRITICAL] Config version is too old. Try `migrate` instead of `import`.'
@@ -214,7 +214,7 @@ module SkullIsland
     def validate_server_version
       server_version = SkullIsland::APIClient.about_service['version']
       case server_version
-      when /^2.[12]/
+      when /^2.[123]/
         true
       when /^2.0/
         warn "[WARN] Older server version #{server_version} detected! " \

data/lib/skull_island/helpers/resource.rb

@@ -215,6 +215,9 @@ module SkullIsland
         @api_client.invalidate_cache_for(self.class.relative_uri.to_s) # clear any collection class
         @tainted = false
         true
+      rescue RestClient::BadRequest => e
+        warn "[WARN] Failed to save #{self.class} via #{new? ? save_uri : relative_uri} with " \
+             "'#{e.message}':\n#{saveable_data.to_yaml}\n\nReceived: #{e.inspect}"
       end
 
       def save_uri

data/lib/skull_island/lru_cache.rb

@@ -11,7 +11,7 @@ module SkullIsland
     attr_reader :max_size, :keys
 
     # @raise [Exceptions::InvalidCacheSize] if the max_size isn't an Integer
-    def initialize(max_size = 100)
+    def initialize(max_size = 10_000)
       raise Exceptions::InvalidCacheSize unless max_size.is_a?(Integer)
 
       @max_size     = max_size

data/lib/skull_island/validations/resource.rb

@@ -16,7 +16,7 @@ module SkullIsland
       # Ensure that required properties are set before saving
       def validate_required_properties(data)
         required_properties.each do |name, _value|
-          raise Exceptions::InvalidArguments if data[name.to_s].nil?
+          raise Exceptions::InvalidArguments, "Missing argument: #{name}" if data[name.to_s].nil?
         end
       end
 

data/lib/skull_island/version.rb

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

data/skull_island.gemspec

@@ -24,22 +24,23 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 2.5'
+  spec.required_ruby_version = '~> 3.0'
 
   spec.add_runtime_dependency 'deepsort', '~> 0.4'
   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.1'
   spec.add_runtime_dependency 'thor', '~> 1.0'
   spec.add_runtime_dependency 'will_paginate', '~> 3.1'
+  spec.add_runtime_dependency 'yajl-ruby', '~> 1.4'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
-  spec.add_development_dependency 'coveralls', '~> 0.7'
+  spec.add_development_dependency 'coveralls_reborn', '~> 0.20'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.50'
-  spec.add_development_dependency 'simplecov', '~> 0.17'
+  spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.add_development_dependency 'simplecov-cobertura', '~> 1.3'
   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: 2.2.1
+  version: 2.3.3
 platform: ruby
 authors:
 - Jonathan Gnagy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-01-20 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deepsort
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: linguistics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: linguistics
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: will_paginate
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
-  name: will_paginate
+  name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: coveralls_reborn
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.20'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '0.21'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.21'
+- !ruby/object:Gem::Dependency
+  name: simplecov-cobertura
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.17'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: travis
   requirement: !ruby/object:Gem::Requirement
@@ -299,7 +313,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="