skull_island 1.4.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1368bb27e59c1efea87a3c608ab8afaba131c643d7f41a0d147f6b0653c7f0f
-  data.tar.gz: b2155ce735516a165f71e64b6b76a7e6f061e7b57a73837071fa63f8beddd164
+  metadata.gz: 00a7b4f233be82c0837c704cc2db5e07ede909632c2e54e413962f4343908974
+  data.tar.gz: 28589bf89713ddc2a039b861d7a1290677b6c69b5bdfe2f5a7ea62bce05fa52e
 SHA512:
-  metadata.gz: cf93677edc3c084fdb33640fcd0558e606108303dd5974bdb754dafda4f39d15b1275488e8558a863f2162c1972425edbd764a295661b87de7e8b120de670db8
-  data.tar.gz: 718910ec788b7020da841603e1cb1e703d01391177de1b4209fca348ba1e6bb197c21ee4aa9117ab8929965db87cdcf5149576b15be520cf3060bc59d56a0d46
+  metadata.gz: b2530b37d2f914b1f6c6c419fa9b0c8dfb39dd9c760c51f0135bc9267eea4aab94ea3e8ae1c6058731356125a63ca1aafe5a6e97ac74ad5feb440849a28bb45b
+  data.tar.gz: c5231a55b789eb6cd602f34c7643585a8142adb81f722e96a805b0b91509d16f05df7708f811d61cfa6b76ce67dfbb0c898506b014c7395634a40c4f95808968

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    skull_island (1.4.2)
+    skull_island (2.0.0)
       deepsort (~> 0.4)
       erubi (~> 1.8)
       json (~> 2.1)
@@ -15,14 +15,14 @@ GEM
   specs:
     addressable (2.4.0)
     ast (2.4.0)
-    backports (3.15.0)
+    backports (3.16.1)
     coveralls (0.7.1)
       multi_json (~> 1.3)
       rest-client
       simplecov (>= 0.7)
       term-ansicolor
       thor
-    deepsort (0.4.2)
+    deepsort (0.4.3)
     diff-lcs (1.3)
     docile (1.3.2)
     domain_name (0.5.20190701)
@@ -30,11 +30,11 @@ GEM
     erubi (1.9.0)
     ethon (0.12.0)
       ffi (>= 1.3.0)
-    faraday (0.17.1)
+    faraday (0.17.3)
       multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.13.1)
+    faraday_middleware (0.14.0)
       faraday (>= 0.7.4, < 1.0)
-    ffi (1.11.3)
+    ffi (1.12.2)
     gh (0.15.1)
       addressable (~> 2.4.0)
       backports
@@ -52,7 +52,7 @@ GEM
       addressable (~> 2.3)
     linguistics (2.1.0)
       loggability (~> 0.11)
-    loggability (0.14.0)
+    loggability (0.15.1)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2019.1009)
@@ -62,7 +62,7 @@ GEM
     net-http-pipeline (1.0.1)
     netrc (0.11.0)
     parallel (1.19.1)
-    parser (2.7.0.1)
+    parser (2.7.0.2)
       ast (~> 2.4.0)
     pusher-client (0.6.2)
       json
@@ -74,6 +74,7 @@ GEM
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -83,27 +84,29 @@ GEM
     rspec-expectations (3.9.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.2)
-    rubocop (0.78.0)
+    rubocop (0.80.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
-    simplecov (0.17.1)
+    simplecov (0.18.4)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.1)
+    sync (0.5.0)
     term-ansicolor (1.7.1)
       tins (~> 1.0)
     thor (0.20.3)
-    tins (1.22.2)
+    tins (1.24.1)
+      sync
     travis (1.8.10)
       backports
       faraday (~> 0.9)
@@ -118,10 +121,10 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.6)
-    unicode-display_width (1.6.0)
+    unicode-display_width (1.6.1)
     websocket (1.2.8)
     will_paginate (3.2.1)
-    yard (0.9.20)
+    yard (0.9.24)
 
 PLATFORMS
   ruby

data/README.md

@@ -1,6 +1,6 @@
 # Skull Island
 
-A full-featured SDK for [Kong](https://konghq.com/kong/) 1.4.x (with support for migrating from 0.14.x, 1.1.x, and 1.2.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.0.x (with support 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)
@@ -30,7 +30,7 @@ gem install skull_island
 Or add this to your Gemfile:
 
 ```ruby
-gem 'skull_island',  '~> 1.4'
+gem 'skull_island',  '~> 2.0'
 ```
 
 Or add this to your .gemspec:
@@ -38,7 +38,7 @@ Or add this to your .gemspec:
 ```ruby
 Gem::Specification.new do |spec|
  # ...
- spec.add_runtime_dependency 'skull_island', '~> 1.4'
+ spec.add_runtime_dependency 'skull_island', '~> 2.0'
  # ...
 end
 ```
@@ -149,17 +149,17 @@ 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, or 1.2.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 1.4 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.0 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
 ```
 
-While this hasn't been heavily tested for all possible use-cases, any configuration generated or usable by the `'~> 0.14'` or `'~> 1.2'` version of this gem should safely convert using the migration command. This tool also makes no guarantees about plugin functionality, configuration compatibility across versions, or that the same plugins are installed and available in your newer gateway. It should go without saying that you should **test and confirm** that all of your functionality was successfully migrated.
+While this hasn't been heavily tested for all possible use-cases, any configuration generated or usable by the `'~> 0.14'`, `'~> 1.2'`, or `~> 1.4` version of this gem should safely convert using the migration command. This tool also makes no guarantees about plugin functionality, configuration compatibility across versions, or that the same plugins are installed and available in your newer gateway. It should go without saying that you should **test and confirm** that all of your functionality was successfully migrated.
 
 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.1 and 1.2 version configurations to be applied to 1.4 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.1, 1.2, and 1.4 version configurations to be applied to 2.0 gateways, but not the opposite.
 
 ### Reset A Gateway
 
@@ -188,7 +188,7 @@ If you're wondering what version of `skull_island` is installed, use:
 ```sh
 $ skull_island version
 
-SkullIsland Version: 1.4.1
+SkullIsland Version: 2.0.0
 ```
 
 ### File Format
@@ -197,7 +197,7 @@ The import/export/migrate CLI functions produce YAML with support for embedded R
 
 ```yaml
 ---
-version: '1.4'
+version: '2.0'
 project: FooV2
 certificates: []
 ca_certificates:
@@ -398,7 +398,7 @@ service.routes.size
 # => 4
 ```
 
-From here, the SDK mostly wraps the attributes described in the [Kong API Docs](https://docs.konghq.com/1.4.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.0.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/cli.rb

@@ -30,7 +30,7 @@ module SkullIsland
 
       validate_server_version
 
-      output = { 'version' => '1.4' }
+      output = { 'version' => '2.0' }
       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'].include?(version)
+      if version && ['1.1', '1.2', '1.4', '1.5', '2.0'].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`.'
@@ -203,17 +203,17 @@ module SkullIsland
     end
 
     def validate_migrate_version(version)
-      if version && ['0.14', '1.0', '1.1', '1.2'].include?(version)
+      if version && ['0.14', '1.0', '1.1', '1.2', '1.4', '1.5'].include?(version)
         true
       else
-        warn '[CRITICAL] Config version must be 0.14 or 1.0-1.2 for migration.'
+        warn '[CRITICAL] Config version must be 0.14 or 1.0-1.5 for migration.'
         exit 4
       end
     end
 
     def validate_server_version
       server_version = SkullIsland::APIClient.about_service['version']
-      if server_version.match?(/^1.[4]/)
+      if server_version.match?(/^2.0/)
         true
       else
         warn '[CRITICAL] Server version mismatch!'

data/lib/skull_island/helpers/migration.rb

@@ -8,7 +8,11 @@ module SkullIsland
         if config['version'] == '0.14'
           migrate_config migrate_0_14_to_1_1(config)
         elsif ['1.0', '1.1', '1.2', '1.3'].include?(config['version'])
-          migrate_1_1_to_1_4(config)
+          migrate_config migrate_1_1_to_1_4(config)
+        elsif config['version'] == '1.4'
+          migrate_config migrate_1_4_to_1_5(config)
+        elsif config['version'] == '1.5'
+          migrate_1_5_to_2_0(config)
         else
           false # Just return false if it can't be migrated
         end
@@ -37,6 +41,18 @@ module SkullIsland
         new_config['version'] = '1.4'
         new_config
       end
+
+      def migrate_1_4_to_1_5(config)
+        new_config = config.dup
+        new_config['version'] = '1.5'
+        new_config
+      end
+
+      def migrate_1_5_to_2_0(config)
+        new_config = config.dup
+        new_config['version'] = '2.0'
+        new_config
+      end
     end
   end
 end

data/lib/skull_island/resources/plugin.rb

@@ -52,7 +52,7 @@ module SkullIsland
       end
 
       def self.schema(name, api_client: APIClient.instance)
-        api_client.get("#{relative_uri}/schema/#{name}")
+        api_client.get("/schemas/plugins/#{name}")
       end
 
       def digest_properties

data/lib/skull_island/version.rb

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

data/lib/skull_island.rb

@@ -1,5 +1,9 @@
 # frozen_string_literal: true
 
+# Core Extensions
+require 'core_extensions/string/transformations'
+String.include CoreExtensions::String::Transformations
+
 # Standard Library Requirements
 require 'date'
 require 'digest'
@@ -18,9 +22,6 @@ require 'will_paginate'
 require 'will_paginate/array'
 
 # Internal Requirements
-require 'core_extensions/string/transformations'
-String.include CoreExtensions::String::Transformations
-
 require 'skull_island/version'
 require 'skull_island/api_exception'
 require 'skull_island/exceptions/ambiguous_find'

metadata

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