kong_schema 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56388720452c27b138d09075b6a7ca674a4e27df
-  data.tar.gz: 2d4c6ed17dc53298e5108314edc480952ffb228f
+  metadata.gz: 07c38fd45ad857c1d106e563a717e1adad472b83
+  data.tar.gz: b000dc659c55e8d550a49ad003d0359592380235
 SHA512:
-  metadata.gz: 8822ffaa4136733d90bc2b25f2633b75e37b97e72393b140c2c953e5912859ba2b9951800ab4d2606cca79084d0afecfb54cb9af42f97b93a897fa6de8453a33
-  data.tar.gz: 6e654285ffdd18cfd8ee7f64240d936da6a6d89b80d3dd819df933d5cee6e959f4cef2d0ea34958bdd7fd36f421f97889c12d64a5d3f5e992add5e97b8528374
+  metadata.gz: 97da9bea2762e350dc5d8ec6beb65ba340dbcd65caf19fab44baa872542f5ee72e531d63605dec04d08084e8b2a0bd13034e3861006d43ddf24f7f3ae88dc58b
+  data.tar.gz: 0d0c6a0770c4a78d4ab1bb9c7cb3417cb3f3a2afe5183cb327a50670b6c377ca9fb82d3a7359d8ae54337686b1b25137accda471f010755c3c8b2a3a0639a0b9

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 1.3.4
+
+- Fixed an issue that was causing Api objects to appear empty in a diff when in
+  fact there were changed attributes
+- Fixed another issue in reporting diffs of Api objects where the "methods"
+  property was reported to be changed when in fact, it won't
+
 ## 1.3.3
 
 - Fixing bad release 1.3.2 ...

data/Gemfile.lock

@@ -1,24 +1,24 @@
 PATH
   remote: .
   specs:
-    kong_schema (1.3.3)
-      diffy (~> 3.1)
+    kong_schema (1.3.4)
+      diffy (~> 3.2)
       gli (~> 2.16)
       json (~> 2.1)
       kong (~> 0.3)
-      tty-prompt (~> 0.13)
-      tty-table (~> 0.8)
+      tty-prompt (~> 0.16)
+      tty-table (~> 0.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.3)
-    diffy (3.2.0)
+    diffy (3.2.1)
     docile (1.1.5)
     equatable (0.5.0)
     excon (0.62.0)
     gli (2.17.1)
-    hitimes (1.2.6)
+    hitimes (1.3.0)
     json (2.1.0)
     kong (0.3.2)
       excon
@@ -69,7 +69,7 @@ GEM
       pastel (~> 0.7.2)
       strings (~> 0.1.0)
       tty-screen (~> 0.6.4)
-    unicode-display_width (1.3.2)
+    unicode-display_width (1.3.3)
     unicode_utils (1.4.0)
     wisper (2.0.0)
 

data/lib/kong_schema/reporter.rb

@@ -64,8 +64,9 @@ module KongSchema
           map
         end
 
-        changed_attributes = pretty_print.call(change.params)
+        changed_attributes = pretty_print.call(normalize_api_attributes(change.record, change.params))
         current_attributes = pretty_print.call(current_attributes)
+
         diff = Diffy::Diff.new(current_attributes, changed_attributes)
 
         [ "Update #{resource_name}", diff.to_s(:color) ]
@@ -77,6 +78,15 @@ module KongSchema
       end
     end
 
+    def normalize_api_attributes(record, attrs)
+      case record
+      when Kong::Api
+        attrs.merge('methods' => attrs['methods'].split(','))
+      else
+        attrs
+      end
+    end
+
     # This warrants some explanation.
     #
     # For some Kong API objects like Target, the API will accept "indirect"
@@ -91,6 +101,8 @@ module KongSchema
     # meant to input (e.g. target.upstream_id -> target.upstream.name)
     def rewrite_record_attributes(record)
       case record
+      when Kong::Api
+        record.attributes
       when Kong::Target
         record.attributes.merge('upstream_id' => record.upstream.name)
       else

data/lib/kong_schema/resource/api.rb

@@ -45,7 +45,22 @@ module KongSchema
           map
         end
 
-        Adapter.for(Kong::Api).changed?(current, attributes)
+        normal_attributes = attributes.keys.reduce({}) do |map, key|
+          value = attributes[key]
+
+          case key
+          # sometimes the API reports it an array, sometimes a string, sometimes
+          # nil...
+          when 'methods'
+            map[key] = Array(value).join(',').split(',')
+          else
+            map[key] = value
+          end
+
+          map
+        end
+
+        Adapter.for(Kong::Api).changed?(current, normal_attributes)
       end
 
       def update(record, partial_attributes)

data/lib/kong_schema/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module KongSchema
-  VERSION = "1.3.3".freeze
+  VERSION = "1.3.4".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kong_schema
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - Ahmad Amireh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-03 00:00:00.000000000 Z
+date: 2018-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -72,28 +72,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.16'
 - !ruby/object:Gem::Dependency
   name: tty-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -158,10 +158,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -169,7 +165,6 @@ files:
 - README.md
 - bin/kong_schema
 - ext/kong/upstream.rb
-- kong_schema.gemspec
 - lib/kong_schema.rb
 - lib/kong_schema/actions.rb
 - lib/kong_schema/adapter.rb
@@ -184,18 +179,6 @@ files:
 - lib/kong_schema/resource/upstream.rb
 - lib/kong_schema/schema.rb
 - lib/kong_schema/version.rb
-- spec/examples.txt
-- spec/fixtures/.gitkeep
-- spec/kong_schema/cli_spec.rb
-- spec/kong_schema/client_spec.rb
-- spec/kong_schema/reporter_spec.rb
-- spec/kong_schema/resource/api_spec.rb
-- spec/kong_schema/resource/plugin_spec.rb
-- spec/kong_schema/resource/target_spec.rb
-- spec/kong_schema/resource/upstream_spec.rb
-- spec/spec_helper.rb
-- spec/support/coverage.rb
-- spec/support/kong_schema_test_utils.rb
 homepage: https://github.com/amireh/kong_schema
 licenses:
 - AGPL-3.0
@@ -220,17 +203,5 @@ rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Configure Kong from a file using its REST API.
-test_files:
-- spec/examples.txt
-- spec/fixtures/.gitkeep
-- spec/kong_schema/cli_spec.rb
-- spec/kong_schema/client_spec.rb
-- spec/kong_schema/reporter_spec.rb
-- spec/kong_schema/resource/api_spec.rb
-- spec/kong_schema/resource/plugin_spec.rb
-- spec/kong_schema/resource/target_spec.rb
-- spec/kong_schema/resource/upstream_spec.rb
-- spec/spec_helper.rb
-- spec/support/coverage.rb
-- spec/support/kong_schema_test_utils.rb
+test_files: []
 has_rdoc: 

data/.gitignore

@@ -1,3 +0,0 @@
-/.bundle
-/coverage
-/*.gem

data/.rspec

@@ -1 +0,0 @@
---require spec_helper

data/.rubocop.yml

@@ -1,31 +0,0 @@
-AllCops:
-  Exclude:
-    - 'spec/**/*_spec.rb'
-    - 'lib/kong_schema/cli.rb'
-
-Lint/EndAlignment:
-  AlignWith: variable
-
-Style/EachWithObject:
-  Enabled: false
-
-Style/SpaceInsideBrackets:
-  Enabled: false
-
-Style/Documentation:
-  Enabled: false
-
-Style/StringLiterals:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/SignalException:
-  Enabled: false
-
-Metrics/MethodLength:
-  Max: 25
-
-Style/ModuleFunction:
-  EnforcedStyle: extend_self

data/.ruby-version

@@ -1 +0,0 @@
-2.3.4

data/kong_schema.gemspec

@@ -1,30 +0,0 @@
-# coding: utf-8
-
-require_relative "./lib/kong_schema/version"
-
-Gem::Specification.new do |spec|
-  spec.name          = "kong_schema"
-  spec.version       = KongSchema::VERSION
-  spec.authors       = ["Ahmad Amireh"]
-  spec.email         = ["ahmad@instructure.com"]
-  spec.summary       = "Configure Kong from a file using its REST API."
-  spec.license       = 'AGPL-3.0'
-  spec.homepage      = 'https://github.com/amireh/kong_schema'
-
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = %w(kong_schema)
-  spec.test_files    = spec.files.grep(%r{^spec/})
-  spec.require_paths = %w(lib)
-
-  spec.add_dependency "gli", "~> 2.16"
-  spec.add_dependency "diffy", "~> 3.1"
-  spec.add_dependency "json", "~> 2.1"
-  spec.add_dependency "kong", "~> 0.3"
-  spec.add_dependency "tty-prompt", "~> 0.13"
-  spec.add_dependency "tty-table", "~> 0.8"
-
-  spec.add_development_dependency "bundler", "~> 1.15"
-  spec.add_development_dependency "rspec", "~> 3.6"
-  spec.add_development_dependency "simplecov", "~> 0.15"
-  spec.add_development_dependency "simplecov_compact_json", "~> 1.0"
-end

data/spec/kong_schema/cli_spec.rb

@@ -1,135 +0,0 @@
-describe KongSchema::CLI do
-  let(:test_utils) { KongSchemaTestUtils.new }
-  let(:schema) { KongSchema::Schema }
-  let(:client) { KongSchema::Client }
-
-  let(:config) do
-    test_utils.generate_config({
-      apis: [{
-        name: 'my-api',
-        hosts: [ 'example.com' ],
-        upstream_url: 'http://example'
-      }]
-    })
-  end
-
-  let(:keyed_config) do
-    {
-      "kong" => config
-    }
-  end
-
-  describe 'up' do
-    it 'complains if no file was passed' do
-      expect(subject).to receive(:bail!)
-        .with('Missing path to .yml or .json config file')
-        .and_call_original
-
-      expect {
-        subject.run(["up"])
-      }.to  output(/Missing path to/).to_stderr_from_any_process
-       .and output(/SYNOPSIS/).to_stdout_from_any_process # help listing
-    end
-
-    it 'works' do
-      test_utils.generate_config_file(config) do |filepath|
-        expect {
-          subject.run(["up", filepath, "--no-confirm", "--key", ""])
-        }.to  change { client.connect(config) { Kong::Api.all.count } }.by(1)
-         .and output(/Kong has been reconfigured!/).to_stdout
-      end
-    end
-
-    it 'works (with a JSON file)' do
-      test_utils.generate_config_file(config, format: :json) do |filepath|
-        expect {
-          subject.run(["up", filepath, "--no-confirm", "--key", ""])
-        }.to  change { client.connect(config) { Kong::Api.all.count } }.by(1)
-         .and output(/Kong has been reconfigured!/).to_stdout
-      end
-    end
-
-    it 'accepts config file using -c for consistency with Kong' do
-      test_utils.generate_config_file(keyed_config) do |filepath|
-        expect {
-          subject.run(["up", "-c", filepath, "--no-confirm"])
-        }.to  change { client.connect(config) { Kong::Api.all.count } }.by(1)
-         .and output(/Kong has been reconfigured!/).to_stdout
-      end
-    end
-
-    it 'accepts config file using -c (globally) for convenience' do
-      test_utils.generate_config_file(keyed_config) do |filepath|
-        expect {
-          subject.run(["-c", filepath, "up", "--no-confirm"])
-        }.to  change { client.connect(config) { Kong::Api.all.count } }.by(1)
-         .and output(/Kong has been reconfigured!/).to_stdout
-      end
-    end
-
-    it 'reads config from a custom key' do
-      test_utils.generate_config_file(keyed_config) do |filepath|
-        expect {
-          subject.run(["up", filepath, "--no-confirm", "--key", "kong"])
-        }.to  change { client.connect(config) { Kong::Api.all.count } }.by(1)
-         .and output(/Kong has been reconfigured!/).to_stdout
-      end
-    end
-
-    it 'prompts for confirmation' do
-      test_utils.fake_stdin(["y"]) do
-        test_utils.generate_config_file(keyed_config) do |filepath|
-          expect {
-            subject.run(["up", filepath])
-          }.to  change { client.connect(config) { Kong::Api.all.count } }.by(1)
-           .and output(/Kong has been reconfigured!/).to_stdout
-        end
-      end
-    end
-
-    it 'aborts if not confirmed' do
-      test_utils.fake_stdin(["n"]) do
-        test_utils.generate_config_file(keyed_config) do |filepath|
-          expect {
-            subject.run(["up", filepath])
-          }.to  change { client.connect(config) { Kong::Api.all.count } }.by(0)
-           .and output.to_stdout
-        end
-      end
-    end
-
-    it 'does nothing if there are no changes to commit' do
-      config = test_utils.generate_config({})
-
-      test_utils.generate_config_file(config) do |filepath|
-        expect {
-          subject.run(["up", filepath, "--no-confirm", "--key", ""])
-        }.to output(/Nothing to update./).to_stdout
-      end
-    end
-  end
-
-  describe 'down' do
-    it 'complains if no file was passed' do
-      expect(subject).to receive(:bail!)
-        .with('Missing path to .yml or .json config file')
-        .and_call_original
-
-      expect {
-        subject.run(["down"])
-      }.to  output(/Missing path to/).to_stderr_from_any_process
-       .and output(/SYNOPSIS/).to_stdout_from_any_process # help listing
-    end
-
-    it 'works' do
-      KongSchema::Schema.commit(config, KongSchema::Schema.scan(config))
-
-      test_utils.generate_config_file(config) do |filepath|
-        expect {
-          subject.run(["down", filepath, "--no-confirm", "--key", ""])
-        }.to  change { client.connect(config) { Kong::Api.all.count } }.by(-1)
-         .and output(/Kong reset\./).to_stdout
-      end
-    end
-  end
-end

data/spec/kong_schema/client_spec.rb

@@ -1,9 +0,0 @@
-describe KongSchema::Client do
-  describe 'connect' do
-    it 'whines if "admin_host" is undefined' do
-      expect {
-        described_class.connect({})
-      }.to raise_error("Missing 'admin_host' property; can not connect to Kong admin!")
-    end
-  end
-end

data/spec/kong_schema/reporter_spec.rb

@@ -1,85 +0,0 @@
-describe KongSchema::Reporter do
-  subject { described_class }
-
-  let(:test_utils) { KongSchemaTestUtils.new }
-  let(:schema) { KongSchema::Schema }
-
-  let :config do
-    test_utils.generate_config({
-      upstreams: [{ name: 'bridge-learn.kong-service' }]
-    })
-  end
-
-  let :with_updated_config do
-    test_utils.generate_config({
-      upstreams: [{
-        name: 'bridge-learn.kong-service',
-        slots: 50,
-        orderlist: nil
-      }]
-    })
-  end
-
-  let :with_deleted_config do
-    test_utils.generate_config({
-      upstreams: []
-    })
-  end
-
-  it 'reports a resource to be created' do
-    report = subject.report(schema.scan(config))
-
-    expect(report).to include('Create Upstream')
-  end
-
-  it 'reports a resource to be updated [JSON]' do
-    schema.commit(config, schema.scan(config))
-
-    report = subject.report(schema.scan(with_updated_config))
-
-    expect(report).to include('Update Upstream')
-    expect(report).to match(/\-[ ]*"slots": 100/)
-    expect(report).to match(/\+[ ]*"slots": 50/)
-  end
-
-  it 'reports a resource to be updated [YAML]' do
-    schema.commit(config, schema.scan(config))
-
-    report = subject.report(schema.scan(with_updated_config), object_format: :yaml)
-
-    expect(report).to include('Update Upstream')
-    expect(report).to include('-slots: 100')
-    expect(report).to include('+slots: 50')
-  end
-
-  it 'reports a resource to be deleted' do
-    schema.commit(config, schema.scan(config))
-
-    report = subject.report(schema.scan(with_deleted_config))
-
-    expect(report).to include('Delete Upstream')
-  end
-
-  describe '.extract_record_attributes' do
-    context 'Kong::Target' do
-      it 'it rewrites "upstream_id" into the upstream name' do
-        with_target = test_utils.generate_config({
-          upstreams: [{ name: 'foo' }],
-          targets:   [{ upstream_id: 'foo', target: '127.0.0.1' }]
-        })
-
-        with_updated_target = test_utils.generate_config({
-          upstreams: [{ name: 'foo' }],
-          targets:   []
-        })
-
-        schema.commit(with_target, schema.scan(with_target))
-
-        next_changes = schema.scan(with_updated_target)
-        report = subject.report(next_changes, object_format: :yml)
-
-        expect(report).to include('upstream_id: foo')
-      end
-    end
-  end
-end

data/spec/kong_schema/resource/api_spec.rb

@@ -1,121 +0,0 @@
-describe KongSchema::Resource::Api do
-  let(:schema) { KongSchema::Schema }
-  let(:test_utils) { KongSchemaTestUtils.new }
-
-  describe 'creating APIs' do
-    let :config do
-      test_utils.generate_config({
-        apis: [{
-          name: 'bridge-learn',
-          hosts: ['bridgeapp.com'],
-          upstream_url: 'http://bridge-learn.kong-service'
-        }]
-      })
-    end
-
-    it 'adds an API if it does not exist' do
-      directives = schema.scan(config)
-
-      expect(directives.map(&:class)).to include(KongSchema::Actions::Create)
-    end
-
-    it 'does add an API' do
-      directives = schema.scan(config)
-
-      expect {
-        schema.commit(config, directives)
-      }.to change {
-        KongSchema::Client.connect(config) { Kong::Api.all.count }
-      }.by(1)
-    end
-
-    it 'does not add an API if it exists' do
-      directives = schema.scan(config)
-
-      schema.commit(config, directives)
-
-      next_directives = schema.scan(config)
-
-      expect(next_directives.map(&:class)).not_to include(KongSchema::Actions::Create)
-    end
-  end
-
-  describe 'updating APIs' do
-    let :config do
-      test_utils.generate_config({
-        apis: [{
-          name: 'bridge-learn',
-          hosts: ['bridgeapp.com'],
-          upstream_url: 'http://bridge-learn.kong-service'
-        }]
-      })
-    end
-
-    let :with_updated_config do
-      test_utils.generate_config({
-        apis: [{
-          name: 'bridge-learn',
-          hosts: ['bar.com'],
-          upstream_url: 'http://bridge-learn.kong-service'
-        }]
-      })
-    end
-
-    before(:each) do
-      schema.commit(config, schema.scan(config))
-    end
-
-    it 'updates an API' do
-      directives = schema.scan(with_updated_config)
-      expect(directives.map(&:class)).to include(KongSchema::Actions::Update)
-    end
-
-    it 'does update an API' do
-      directives = schema.scan(with_updated_config)
-
-      expect {
-        schema.commit(with_updated_config, directives)
-      }.to change {
-        KongSchema::Client.connect(config) { Kong::Api.all[0].hosts[0] }
-      }.from('bridgeapp.com').to('bar.com')
-    end
-  end
-
-  describe 'deleting APIs' do
-    let :config do
-      test_utils.generate_config({
-        apis: [{
-          name: 'bridge-learn',
-          hosts: ['bar.com'],
-          upstream_url: 'http://bridge-learn.kong-service'
-        }]
-      })
-    end
-
-    let :with_deleted_config do
-      test_utils.generate_config({
-        apis: []
-      })
-    end
-
-    before(:each) do
-      schema.commit(config, schema.scan(config))
-    end
-
-    it 'deletes an API' do
-      directives = schema.scan(with_deleted_config)
-
-      expect(directives.map(&:class)).to include(KongSchema::Actions::Delete)
-    end
-
-    it 'does delete an API' do
-      directives = schema.scan(with_deleted_config)
-
-      expect {
-        schema.commit(with_deleted_config, directives)
-      }.to change {
-        KongSchema::Client.connect(config) { Kong::Api.all.count }
-      }.from(1).to(0)
-    end
-  end
-end

data/spec/kong_schema/resource/plugin_spec.rb

@@ -1,126 +0,0 @@
-describe KongSchema::Resource::Plugin do
-  let(:schema) { KongSchema::Schema }
-  let(:test_utils) { KongSchemaTestUtils.new }
-
-  let :plugin_config do
-    {
-      second: 120
-    }
-  end
-
-  let :config do
-    test_utils.generate_config({
-      plugins: [{
-        name: 'rate-limiting',
-        enabled: true,
-        config: plugin_config
-      }]
-    })
-  end
-
-  let :config_with_custom_options do
-    test_utils.generate_config({
-      plugins: [{
-        name: 'rate-limiting',
-        enabled: true,
-        config: plugin_config.merge({ second: 60 }),
-      }]
-    })
-  end
-
-  let :config_with_api do
-    test_utils.generate_config({
-      apis: [{
-        name: 'my-api',
-        upstream_url: 'http://example.com',
-        hosts: [ 'example.com' ]
-      }],
-
-      plugins: [{
-        name: 'rate-limiting',
-        api_id: 'my-api',
-        enabled: true,
-        config: plugin_config
-      }]
-    })
-  end
-
-  it 'identifies plugins to be added' do
-    directives = schema.scan(config)
-
-    expect(directives.map(&:class)).to eq([ KongSchema::Actions::Create ])
-  end
-
-  it 'adds a plugin' do
-    directives = schema.scan(config)
-
-    expect {
-      schema.commit(config, directives)
-    }.to change {
-      KongSchema::Client.connect(config) {
-        Kong::Plugin.all.count
-      }
-    }.by(1)
-  end
-
-  it 'adds a plugin with an api' do
-    directives = schema.scan(config_with_api)
-
-    expect {
-      schema.commit(config_with_api, directives)
-    }.to change {
-      KongSchema::Client.connect(config_with_api) {
-        Kong::Plugin.all.count
-      }
-    }.by(1)
-  end
-
-  it 'identifies plugins to be updated' do
-    schema.commit(config, schema.scan(config))
-    changes = schema.scan(config_with_custom_options)
-
-    expect(changes.map(&:class)).to eq([ KongSchema::Actions::Update ])
-  end
-
-  it 'updates a plugin' do
-    schema.commit(config, schema.scan(config))
-
-    expect { schema.commit(config, schema.scan(config_with_custom_options)) }.to change {
-      KongSchema::Client.connect(config) {
-        Kong::Plugin.find_by_name('rate-limiting').config['second']
-      }
-    }.from(120).to(60)
-  end
-
-  it 'removes the plugin if enabled is set to false' do
-    schema.commit(config, schema.scan(config))
-
-    with_update = test_utils.generate_config({
-      plugins: [{
-        name: 'rate-limiting',
-        config: plugin_config,
-        enabled: false
-      }]
-    })
-
-    expect { schema.commit(config, schema.scan(with_update)) }.to change {
-      KongSchema::Client.connect(config) {
-        Kong::Plugin.all.count
-      }
-    }.by(-1)
-  end
-
-  it 'removes the plugin if it is no longer specified' do
-    schema.commit(config, schema.scan(config))
-
-    with_removal = test_utils.generate_config({
-      plugins: []
-    })
-
-    expect { schema.commit(config, schema.scan(with_removal)) }.to change {
-      KongSchema::Client.connect(config) {
-        Kong::Plugin.all.count
-      }
-    }.by(-1)
-  end
-end

data/spec/kong_schema/resource/target_spec.rb

@@ -1,205 +0,0 @@
-describe KongSchema::Resource::Target do
-  let(:schema) { KongSchema::Schema }
-  let(:test_utils) { KongSchemaTestUtils.new }
-
-  describe 'creating targets' do
-    let :config do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service'
-        }],
-
-        targets: [{
-          upstream_id: 'bridge-learn.kong-service',
-          target: '127.0.0.1:3000'
-        }]
-      })
-    end
-
-    it 'adds a target if it does not exist' do
-      directives = schema.scan(config)
-
-      expect(directives.map(&:class)).to eq([ KongSchema::Actions::Create, KongSchema::Actions::Create ])
-    end
-
-    it 'does add a target' do
-      directives = schema.scan(config)
-
-      expect {
-        schema.commit(config, directives)
-      }.to change {
-        KongSchema::Client.connect(config) { Kong::Upstream.all.count }
-      }.by(1)
-    end
-
-    it 'does not add a target if it exists' do
-      directives = schema.scan(config)
-
-      schema.commit(config, directives)
-
-      next_directives = schema.scan(config)
-
-      expect(next_directives.map(&:class)).not_to include(KongSchema::Actions::Create)
-    end
-
-    it 'does not allow defining a target without an upstream_id' do
-      directives = schema.scan(test_utils.generate_config({
-        targets: [{ target: '127.0.0.1:3000' }]
-      }))
-
-      expect {
-        schema.commit(config, directives)
-      }.to raise_error(/Can not add a target without an upstream!/)
-    end
-  end
-
-  describe "changing a target's target" do
-    let :config do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service'
-        }],
-
-        targets: [{
-          upstream_id: 'bridge-learn.kong-service',
-          target: '127.0.0.1:3000'
-        }]
-      })
-    end
-
-    let :with_updated do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service'
-        }],
-
-        targets: [{
-          upstream_id: 'bridge-learn.kong-service',
-          target: '127.0.0.1:9999'
-        }]
-      })
-    end
-
-    before(:each) do
-      schema.commit(config, schema.scan(config))
-    end
-
-    it 'identifies targets to be updated' do
-      directives = schema.scan(with_updated)
-
-      expect(directives.map(&:class)).to eq([KongSchema::Actions::Create, KongSchema::Actions::Delete])
-    end
-
-    it 'updates a target' do
-      expect {
-        schema.commit(with_updated, schema.scan(with_updated))
-      }.to change {
-        KongSchema::Client.connect(config) {
-          KongSchema::Resource::Target.all.map { |x| [ x.weight, x.target ] }
-        }
-      }.from([
-        [ 100, '127.0.0.1:3000' ]
-      ]).to([
-        [ 100,  '127.0.0.1:9999' ]
-      ])
-    end
-  end
-
-  describe "changing a target's weight" do
-    let :config do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service'
-        }],
-
-        targets: [{
-          upstream_id: 'bridge-learn.kong-service',
-          target: '127.0.0.1:3000'
-        }]
-      })
-    end
-
-    let :with_different_weight do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service'
-        }],
-
-        targets: [{
-          upstream_id: 'bridge-learn.kong-service',
-          target: '127.0.0.1:3000',
-          weight: 20
-        }]
-      })
-    end
-
-    before(:each) do
-      schema.commit(config, schema.scan(config))
-    end
-
-    it 'updates the existing target' do
-      directives = schema.scan(with_different_weight)
-
-      expect(directives.map(&:class)).to eq([ KongSchema::Actions::Update ])
-    end
-
-    it 'updates a target' do
-      expect {
-        schema.commit(with_different_weight, schema.scan(with_different_weight))
-      }.to change {
-        KongSchema::Client.connect(config) {
-          KongSchema::Resource::Target.all.map { |x| [ x.weight, x.target ] }
-        }
-      }.from([
-        [ 100, '127.0.0.1:3000' ]
-      ]).to([
-        [ 20,  '127.0.0.1:3000' ]
-      ])
-    end
-  end
-
-  describe 'deleting targets' do
-    let :config do
-      test_utils.generate_config(
-        upstreams: [{
-          name: 'bridge-learn.kong-service'
-        }],
-
-        targets: [{
-          upstream_id: 'bridge-learn.kong-service',
-          target: '127.0.0.1:3000'
-        }]
-      )
-    end
-
-    let :with_deleted do
-      test_utils.generate_config(
-        upstreams: [{ name: 'bridge-learn.kong-service' }],
-        targets: []
-      )
-    end
-
-    before(:each) do
-      schema.commit(config, schema.scan(config))
-    end
-
-    it 'identifies targets to be deleted' do
-      directives = schema.scan(with_deleted)
-
-      expect(directives.map(&:class)).to include(KongSchema::Actions::Delete)
-    end
-
-    it 'deletes a target' do
-      expect {
-        schema.commit(with_deleted, schema.scan(with_deleted))
-      }.to change {
-        KongSchema::Client.connect(config) {
-          KongSchema::Resource::Target.all.map { |x| [ x.target, x.weight ] }
-        }
-      }.from([
-        [ '127.0.0.1:3000', 100 ]
-      ]).to([
-      ])
-    end
-  end
-end

data/spec/kong_schema/resource/upstream_spec.rb

@@ -1,118 +0,0 @@
-describe KongSchema::Resource::Upstream do
-  let(:schema) { KongSchema::Schema }
-  let(:test_utils) { KongSchemaTestUtils.new }
-
-  describe 'creating upstreams' do
-    let :config do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service'
-        }]
-      })
-    end
-
-    it 'adds an upstream if it does not exist' do
-      changes = schema.scan(config)
-
-      expect(changes.map(&:class)).to include(KongSchema::Actions::Create)
-    end
-
-    it 'does add an upstream' do
-      changes = schema.scan(config)
-
-      expect {
-        schema.commit(config, changes)
-      }.to change {
-        KongSchema::Client.connect(config) { Kong::Upstream.all.count }
-      }.by(1)
-    end
-
-    it 'does not add an upstream if it exists' do
-      changes = schema.scan(config)
-
-      schema.commit(config, changes)
-
-      next_changes = schema.scan(config)
-
-      expect(next_changes.map(&:class)).not_to include(KongSchema::Actions::Create)
-    end
-  end
-
-  describe 'updating upstreams' do
-    let :config do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service',
-        }]
-      })
-    end
-
-    let :with_updated_config do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service',
-          slots: 50,
-          orderlist: nil
-        }]
-      })
-    end
-
-    before(:each) do
-      schema.commit(config, schema.scan(config))
-    end
-
-    it 'updates an upstream' do
-      changes = schema.scan(with_updated_config)
-
-      expect(changes.map(&:class)).to eq([ KongSchema::Actions::Update ])
-    end
-
-    it 'does update an upstream' do
-      changes = schema.scan(with_updated_config)
-
-      expect {
-        schema.commit(with_updated_config, changes)
-      }.to change {
-        KongSchema::Client.connect(config) {
-          Kong::Upstream.all.first.slots
-        }
-      }.from(100).to(50)
-    end
-  end
-
-  describe 'deleting upstreams' do
-    let :config do
-      test_utils.generate_config({
-        upstreams: [{
-          name: 'bridge-learn.kong-service',
-        }]
-      })
-    end
-
-    let :with_deleted_config do
-      test_utils.generate_config({
-        upstreams: []
-      })
-    end
-
-    before(:each) do
-      schema.commit(config, schema.scan(config))
-    end
-
-    it 'deletes an upstream' do
-      changes = schema.scan(with_deleted_config)
-
-      expect(changes.map(&:class)).to include(KongSchema::Actions::Delete)
-    end
-
-    it 'does delete an upstream' do
-      changes = schema.scan(with_deleted_config)
-
-      expect {
-        schema.commit(with_deleted_config, changes)
-      }.to change {
-        KongSchema::Client.connect(config) { Kong::Upstream.all.count }
-      }.from(1).to(0)
-    end
-  end
-end

data/spec/spec_helper.rb

@@ -1,115 +0,0 @@
-require_relative './support/coverage' if ENV["COVERAGE"] == "1"
-require_relative './support/kong_schema_test_utils'
-
-require 'kong_schema'
-
-# This file was generated by the `rspec --init` command. Conventionally, all
-# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
-# The generated `.rspec` file contains `--require spec_helper` which will cause
-# this file to always be loaded, without a need to explicitly require it in any
-# files.
-#
-# Given that it is always loaded, you are encouraged to keep this file as
-# light-weight as possible. Requiring heavyweight dependencies from this file
-# will add to the boot time of your test suite on EVERY test run, even for an
-# individual file that may not need all of that loaded. Instead, consider making
-# a separate helper file that requires the additional dependencies and performs
-# the additional setup, and require it from the spec files that actually need
-# it.
-#
-# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
-RSpec.configure do |config|
-  test_utils = KongSchemaTestUtils.new
-
-  config.before(:each) do
-    test_utils.reset_kong
-  end
-
-  config.after(:each) do
-    test_utils.reset_kong
-  end
-
-  # rspec-expectations config goes here. You can use an alternate
-  # assertion/expectation library such as wrong or the stdlib/minitest
-  # assertions if you prefer.
-  config.expect_with :rspec do |expectations|
-    # This option will default to `true` in RSpec 4. It makes the `description`
-    # and `failure_message` of custom matchers include text for helper methods
-    # defined using `chain`, e.g.:
-    #     be_bigger_than(2).and_smaller_than(4).description
-    #     # => "be bigger than 2 and smaller than 4"
-    # ...rather than:
-    #     # => "be bigger than 2"
-    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
-  end
-
-  # rspec-mocks config goes here. You can use an alternate test double
-  # library (such as bogus or mocha) by changing the `mock_with` option here.
-  config.mock_with :rspec do |mocks|
-    # Prevents you from mocking or stubbing a method that does not exist on
-    # a real object. This is generally recommended, and will default to
-    # `true` in RSpec 4.
-    mocks.verify_partial_doubles = true
-  end
-
-  # This option will default to `:apply_to_host_groups` in RSpec 4 (and will
-  # have no way to turn it off -- the option exists only for backwards
-  # compatibility in RSpec 3). It causes shared context metadata to be
-  # inherited by the metadata hash of host groups and examples, rather than
-  # triggering implicit auto-inclusion in groups with matching metadata.
-  config.shared_context_metadata_behavior = :apply_to_host_groups
-
-# The settings below are suggested to provide a good initial experience
-# with RSpec, but feel free to customize to your heart's content.
-  config.filter_run_when_matching :focus
-=begin
-  # This allows you to limit a spec run to individual examples or groups
-  # you care about by tagging them with `:focus` metadata. When nothing
-  # is tagged with `:focus`, all examples get run. RSpec also provides
-  # aliases for `it`, `describe`, and `context` that include `:focus`
-  # metadata: `fit`, `fdescribe` and `fcontext`, respectively.
-
-  # Allows RSpec to persist some state between runs in order to support
-  # the `--only-failures` and `--next-failure` CLI options. We recommend
-  # you configure your source control system to ignore this file.
-  config.example_status_persistence_file_path = "spec/examples.txt"
-
-  # Limits the available syntax to the non-monkey patched syntax that is
-  # recommended. For more details, see:
-  #   - http://rspec.info/blog/2012/06/rspecs-new-expectation-syntax/
-  #   - http://www.teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
-  #   - http://rspec.info/blog/2014/05/notable-changes-in-rspec-3/#zero-monkey-patching-mode
-  config.disable_monkey_patching!
-
-  # This setting enables warnings. It's recommended, but in some cases may
-  # be too noisy due to issues in dependencies.
-  config.warnings = true
-
-  # Many RSpec users commonly either run the entire suite or an individual
-  # file, and it's useful to allow more verbose output when running an
-  # individual spec file.
-  if config.files_to_run.one?
-    # Use the documentation formatter for detailed output,
-    # unless a formatter has already been configured
-    # (e.g. via a command-line flag).
-    config.default_formatter = "doc"
-  end
-
-  # Print the 10 slowest examples and example groups at the
-  # end of the spec run, to help surface which specs are running
-  # particularly slow.
-  config.profile_examples = 10
-
-  # Run specs in random order to surface order dependencies. If you find an
-  # order dependency and want to debug it, you can fix the order by providing
-  # the seed, which is printed after each run.
-  #     --seed 1234
-  config.order = :random
-
-  # Seed global randomization in this process using the `--seed` CLI option.
-  # Setting this allows you to use `--seed` to deterministically reproduce
-  # test failures related to randomization by passing the same `--seed` value
-  # as the one that triggered the failure.
-  Kernel.srand config.seed
-=end
-end

data/spec/support/coverage.rb

@@ -1,18 +0,0 @@
-require "simplecov"
-require "simplecov_compact_json"
-
-SimpleCov.at_exit do
-  SimpleCov.minimum_coverage(95)
-  SimpleCov.maximum_coverage_drop(1)
-  SimpleCov.formatters = [
-    SimpleCov::Formatter::CompactJSON,
-    SimpleCov::Formatter::HTMLFormatter
-  ]
-  SimpleCov.result.format!
-end
-
-SimpleCov.start do
-  add_filter "/.gem/"
-  add_filter "/bin/"
-  add_filter "/spec/"
-end

data/spec/support/kong_schema_test_utils.rb

@@ -1,50 +0,0 @@
-require 'kong_schema'
-require 'fileutils'
-
-class KongSchemaTestUtils
-  attr_reader :host
-
-  def initialize(host: ENV.fetch('KONG_URI', '127.0.0.1:9712'))
-    @host = host
-  end
-
-  def generate_config(config = {})
-    JSON.parse(JSON.dump({ admin_host: host }.merge(config)))
-  end
-
-  def generate_config_file(config = {}, format: :yaml)
-    buffer = case format
-    when :json
-      JSON.dump(config)
-    else
-      YAML.dump(config)
-    end
-
-    filename = case format
-    when :json
-      'config.json'
-    else
-      'config.yaml'
-    end
-
-    filepath = File.join(Dir.pwd, 'spec', 'fixtures', filename)
-
-    File.write(filepath, buffer)
-    yield filepath
-  ensure
-    FileUtils.rm(filepath)
-  end
-
-  def fake_stdin(*args)
-    $stdin = StringIO.new
-    $stdin.puts(args.shift) until args.empty?
-    $stdin.rewind
-    yield
-  ensure
-    $stdin = STDIN
-  end
-
-  def reset_kong
-    KongSchema::Client.purge(generate_config)
-  end
-end