kong_schema 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a77eb790a5c2e9bc9041918244f463890a598b48
-  data.tar.gz: 76815d46d5c50a3d6cc01aee03d13b6b0f870ee0
+  metadata.gz: 48d76ad569bf581b7da42eb3f0d82b2c777bc256
+  data.tar.gz: f21ff4a308efbd39ecd22d65a3dd0d20ba5b9b26
 SHA512:
-  metadata.gz: 8186d7fb699bf6ae80f6534fc66aeedc735dcef9594f063d498361d02375a152fb0efb9e33080ee025928333c9cb1662d8b91ef76647a378fd341d3b9d440edf
-  data.tar.gz: 8522830249a8c888dd7ab6dcc5712921e80c8fedc13ffb152f250574e8d405fa94d7da9cea8760348376696e0a3b58fefb3c3a02a91b6c720260a0d7ff421817
+  metadata.gz: 7f5281d2c489ebced5f8b9b9353c943b928f128bad0f203b1e30b9e8d726012b92a45b21df7c1833131ae9fdb2a26d2c51290a4d686b749eb2dcd62ad06b31c9
+  data.tar.gz: d3d1eeb1f5658d4e8687c0da35f6853c408d6d09a6435d43778e31b524f4ac71c3733693dd2e0b2729863cbd4ec688601bf6c30d13328e0b387b40d0a51c0dde

data/.gitignore

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

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.3.1
+
+- Fixed an issue that was preventing Kong::Plugin objects from being created
+  without an api
+
 ## 1.3.0
 
 - Added support for Kong::Plugin objects.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kong_schema (1.2.0)
+    kong_schema (1.3.1)
       diffy (~> 3.1)
       gli (~> 2.16)
       kong (~> 0.3)

data/lib/kong_schema/resource/plugin.rb

@@ -13,9 +13,17 @@ module KongSchema
       def identify(record)
         case record
         when Kong::Plugin
-          [ record.name, try(record.api, :name), record.consumer_id ]
+          [
+            record.name,
+            api_bound?(record) ? record.api.name : nil,
+            consumer_bound?(record) ? record.consumer_id : nil
+          ]
         when Hash
-          [ record['name'], record['api_id'], record['consumer_id'] ]
+          [
+            record['name'],
+            record['api_id'] || nil,
+            record['consumer_id'] || nil
+          ]
         end
       end
 
@@ -52,7 +60,9 @@ module KongSchema
         else
           Adapter.for(Kong::Plugin).update(
             record,
-            partial_attributes.merge('api_id' => record.api.id)
+            partial_attributes.merge(
+              'api_id' => api_bound?(record) ? record.api.id : nil
+            )
           )
         end
       end
@@ -60,6 +70,16 @@ module KongSchema
       def delete(record)
         Adapter.for(Kong::Plugin).delete(record)
       end
+
+      private
+
+      def api_bound?(record)
+        !blank?(record.api_id)
+      end
+
+      def consumer_bound?(record)
+        !blank?(record.consumer_id)
+      end
     end
   end
 end

data/lib/kong_schema/version.rb

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

data/spec/kong_schema/resource/plugin_spec.rb

@@ -9,6 +9,26 @@ describe KongSchema::Resource::Plugin do
   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',
@@ -25,16 +45,13 @@ describe KongSchema::Resource::Plugin do
     })
   end
 
-  it 'adds a plugin if it does not exist' do
+  it 'identifies plugins to be added' do
     directives = schema.scan(config)
 
-    expect(directives.map(&:class)).to eq([
-      KongSchema::Actions::Create,
-      KongSchema::Actions::Create
-    ])
+    expect(directives.map(&:class)).to eq([ KongSchema::Actions::Create ])
   end
 
-  it 'does add a plugin' do
+  it 'adds a plugin' do
     directives = schema.scan(config)
 
     expect {
@@ -46,24 +63,29 @@ describe KongSchema::Resource::Plugin do
     }.by(1)
   end
 
-  it 'updates a plugin' do
+  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)
 
-    with_update = test_utils.generate_config({
-      apis: [{
-        name: 'my-api',
-        upstream_url: 'http://example.com',
-        hosts: [ 'example.com' ]
-      }],
+    expect(changes.map(&:class)).to eq([ KongSchema::Actions::Update ])
+  end
 
-      plugins: [{
-        config: plugin_config.merge({ second: 60 }),
-        name: 'rate-limiting',
-        api_id: 'my-api',
-      }]
-    })
+  it 'updates a plugin' do
+    schema.commit(config, schema.scan(config))
 
-    expect { schema.commit(config, schema.scan(with_update)) }.to change {
+    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']
       }
@@ -74,15 +96,8 @@ describe KongSchema::Resource::Plugin do
     schema.commit(config, schema.scan(config))
 
     with_update = test_utils.generate_config({
-      apis: [{
-        name: 'my-api',
-        upstream_url: 'http://example.com',
-        hosts: [ 'example.com' ]
-      }],
-
       plugins: [{
         name: 'rate-limiting',
-        api_id: 'my-api',
         config: plugin_config,
         enabled: false
       }]
@@ -99,12 +114,6 @@ describe KongSchema::Resource::Plugin do
     schema.commit(config, schema.scan(config))
 
     with_removal = test_utils.generate_config({
-      apis: [{
-        name: 'my-api',
-        upstream_url: 'http://example.com',
-        hosts: [ 'example.com' ]
-      }],
-
       plugins: []
     })
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kong_schema
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ahmad Amireh