kongfigure 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6ce1d45bb146d0258ffb605a92a6ff04b224b360a3d0e27f68fee1741eb5d828
-  data.tar.gz: 6d250545cf3e18c1993da78e3eccf5e3676499bc909e61d1d54712588d6a0ce6
+  metadata.gz: ceeaed03095ba7f32fa8239ce1f184f20c871384643279724bbab85b81707f45
+  data.tar.gz: f0ce60043dff56cd391c6d5800725bd267e8f752f9d1a77968ea1d246821a1df
 SHA512:
-  metadata.gz: a9016e97af66d02e7110b9a9defba49246ea6c128877f52e43183d06565267a0dc0e954623c11906e91bb56c6d38b0902284f73f2ed77cef2047270c239cf0ab
-  data.tar.gz: '09338ee03e576ee06e74fccc0593644f78693a2ce9b557802abae56e92f10c5c89815b0817d4727c0b05156082cf3f728b58d4b058395d8f6995b10d25632132'
+  metadata.gz: a6c0f2f1b00cb18a0f7cbf362dc75a189824de4fe89ca90e6b0ae439889b908670968d835507faee2697ff2d06679dc8994744edebd3cee096bb5ded4aab2f08
+  data.tar.gz: 83ce0094643344c188c7a3fbbc215160e4b0ce4e6fd5e5af0292cfd38f2287c426b74a92dd6bf14ece5aee6e98bcf9d7b354da71ce386769b6f70d984a51aa76

data/lib/kongfigure/http_client.rb

@@ -41,7 +41,7 @@ module Kongfigure
     private
 
     def execute(options)
-      RestClient::Request.execute(options) do |response, _request, _result|
+      RestClient::Request.execute(options) do |response, request, _result|
         handle_response(response)
       end
     end
@@ -54,10 +54,12 @@ module Kongfigure
     end
 
     def request_options(method, path, payload = nil)
+      uri       = URI.join(@configuration[:url], path)
+      uri.query = [uri.query, "size=1000"].compact.join("&")
       opts = {
         method: method,
-        url: "#{@configuration[:url]}/#{path}",
-        headers: HTTP_HEADERS,
+        url: uri.to_s,
+        headers: HTTP_HEADERS
       }
 
       opts.merge!(ssl_options) if @configuration[:url].include?("https://")
@@ -81,7 +83,7 @@ module Kongfigure
       elsif response.code == 404
         raise Kongfigure::Errors::ResourceNotFound
       elsif response.code == 409
-        raise Kongfigure::Errors::ResourceConflict
+        #raise Kongfigure::Errors::ResourceConflict
       elsif response.code == 500
         raise Kongfigure::Errors::InternalServerError
       end

data/lib/kongfigure/services/consumer.rb

@@ -43,7 +43,7 @@ module Kongfigure::Services
 
     def cleanup_key_auths(http_client, local_resource, remote_resource)
       remote_resource.key_auths.each do |remote_resource_key_auth|
-        unless local_resource.has_key_auth?(remote_resource_key_auth)
+        unless local_resource && local_resource.has_key_auth?(remote_resource_key_auth)
           http_client.delete("#{resource_name}/#{remote_resource.identifier}/key-auth/#{remote_resource_key_auth.id}")
         end
       end
@@ -51,7 +51,7 @@ module Kongfigure::Services
 
     def cleanup_acls(http_client, local_resource, remote_resource)
       remote_resource.acls.each do |remote_resource_acl|
-        unless local_resource.has_acl?(remote_resource_acl)
+        unless local_resource && local_resource.has_acl?(remote_resource_acl)
           http_client.delete("#{resource_name}/#{remote_resource.identifier}/acls/#{remote_resource_acl.id}")
         end
       end

data/lib/kongfigure/services/service.rb

@@ -1,13 +1,13 @@
 module Kongfigure::Services
   class Service < Base
     def create_dependencies(http_client, resource, related_remote_resource)
-      super(http_client, resource, related_remote_resource)
       create_routes(http_client, resource, related_remote_resource)
+      super(http_client, resource, related_remote_resource)
     end
 
     def update_dependencies(http_client, resource, related_remote_resource)
-      super(http_client, resource, related_remote_resource)
       create_routes(http_client, resource, related_remote_resource)
+      super(http_client, resource, related_remote_resource)
     end
 
     def cleanup_dependencies(http_client, resource, related_remote_resource)

data/lib/kongfigure/version.rb

@@ -1,3 +1,3 @@
 module Kongfigure
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kongfigure
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Ibanity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-19 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Kongfigure.