kongfigure 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 65d5602bfed712c59cc8c2dba6c00e13f782d42155dabed11a3483f57d52ee8e
-  data.tar.gz: 0ebe8e6a7404fa178b7b57c0fe9c299d3993488a055fd8f005911d5b181618c9
+  metadata.gz: 6cd69b21925e436f3158eb380dc08df99280f918f6e874a1983ecd34bf384745
+  data.tar.gz: 046174aa1e2aabb0d5e631102622dbfc35fb8e314fe17bb92232d297c4eddc02
 SHA512:
-  metadata.gz: 0773bea047fca72dc0316252a8e4d67ccd5de7088b82833fef789882c8526928a54a6229a9da4854dbecb802e9e1dedc5edf1ce6e54d9a7389f8c3b8bd0d71a7
-  data.tar.gz: e7ec43aa67c41d17d5f8735d83f1601a55eb3b728a411b82cabe5fa117a69221c6b7e1f432dd9ca220105669932cd117c349aa18139000b236d19d1a604b63df
+  metadata.gz: 0a8d55cc46a111603ed2ff4f8f8dadc4079f4e3ea4d2232bdcec34e8ad708726c6b8c4151da4058b7d265bff6625bbb2fb3535190201458447ea5d212e6e0d59
+  data.tar.gz: b7ef072b73c0e643b88eecbdabe0ae33890ea8c69531e97848a5d5cad146983de4a8252c09615f3d9f292e9acbd7d070b4c52d1900ab0f3e0823d371b2123846

data/lib/kongfigure/resources/service.rb

@@ -30,8 +30,16 @@ module Kongfigure::Resources
       name
     end
 
-    def has_route?(route)
-      routes && routes.include?(route)
+    def has_route?(other_route)
+      routes && routes.find do |route|
+        other_route == route
+      end
+    end
+
+    def has_routes?(other_routes)
+      other_routes.reject do |other_route|
+        has_route?(other_route)
+      end.size == 0
     end
 
     def api_attributes

data/lib/kongfigure/services/base.rb

@@ -35,36 +35,36 @@ module Kongfigure::Services
 
     def create_or_update(http_client, resource, remote_resources)
       handle_api_errors do
-        related_resource = find_related_resource(resource, remote_resources)
-        if related_resource && need_update?(resource, related_resource)
+        related_remote_resource = find_related_resource(resource, remote_resources)
+        if related_remote_resource && need_update?(resource, related_remote_resource)
           puts "-> Update #{resource.class.name} (#{resource.identifier}).".colorize(:light_blue)
-          update(http_client, resource, related_resource)
-        elsif related_resource && need_update_dependencies?(resource, related_resource)
+          update(http_client, resource, related_remote_resource)
+        elsif related_remote_resource && need_update_dependencies?(resource, related_remote_resource)
           puts "-> Update dependencies #{resource.class.name} (#{resource.identifier}).".colorize(:light_blue)
-          update_dependencies(http_client, resource, related_resource)
-        elsif related_resource
+          update_dependencies(http_client, resource, related_remote_resource)
+        elsif related_remote_resource
           #noop
         else
           puts "-> Create #{resource.class.name} (#{resource.identifier}).".colorize(:green)
-          create(http_client, resource, related_resource)
+          create(http_client, resource, related_remote_resource)
         end
       end
     end
 
-    def create(http_client, resource, related_resource)
+    def create(http_client, resource, _related_remote_resource)
       module_name = Kongfigure::Resources.const_get(self.class.to_s.split("::").last)
       data        = http_client.post("#{resource_name}", resource.api_attributes.to_json)
       create_dependencies(http_client, resource, module_name.build(data))
     end
 
-    def update(http_client, resource, related_resource)
-      http_client.put("#{resource_name}/#{related_resource.id}", resource.api_attributes.to_json) if need_update?(resource, related_resource)
-      update_dependencies(http_client, resource, related_resource)
+    def update(http_client, resource, related_remote_resource)
+      http_client.put("#{resource_name}/#{related_remote_resource.id}", resource.api_attributes.to_json) if need_update?(resource, related_resource)
+      update_dependencies(http_client, resource, related_remote_resource)
     end
 
-    def cleanup(http_client, resource, related_resource)
-      puts "-> Cleanup #{related_resource.class.name} (#{related_resource.identifier}).".colorize(:magenta)
-      http_client.delete("#{resource_name}/#{related_resource.id}")
+    def cleanup(http_client, resource, related_remote_resource)
+      puts "-> Cleanup #{related_remote_resource.class.name} (#{related_remote_resource.identifier}).".colorize(:magenta)
+      http_client.delete("#{resource_name}/#{related_remote_resource.id}")
     end
 
     def cleanup_useless_resources(http_client, local_resources, remote_resources)
@@ -72,7 +72,6 @@ module Kongfigure::Services
         related_local_resource = find_related_resource(remote_resource, local_resources)
         handle_api_errors do
           if need_cleanup_dependencies?(related_local_resource, remote_resource)
-
             cleanup_dependencies(http_client, related_local_resource, remote_resource)
           end
           unless related_local_resource
@@ -96,33 +95,33 @@ module Kongfigure::Services
       end
     end
 
-    def need_update?(resource, related_resource)
-      resource != related_resource
+    def need_update?(resource, related_remote_resource)
+      resource != related_remote_resource
     end
 
-    def need_update_dependencies?(resource, related_resource)
-      need_update_plugins?(resource, related_resource)
+    def need_update_dependencies?(resource, related_remote_resource)
+      need_update_plugins?(resource, related_remote_resource)
     end
 
-    def need_cleanup_dependencies?(resource, related_resource)
-      resource.nil? || need_cleanup_plugins?(resource, related_resource)
+    def need_cleanup_dependencies?(resource, related_remote_resource)
+      resource.nil? || need_cleanup_plugins?(resource, related_remote_resource)
     end
 
     def has_plugins?(resource)
       resource.plugins && resource.plugins.size > 0
     end
 
-    def update_dependencies(http_client, local_resource, remote_resource)
-      create_plugins(http_client, local_resource, remote_resource)
+    def update_dependencies(http_client, local_resource, related_remote_resource)
+      create_or_update_plugins(http_client, local_resource, related_remote_resource)
     end
 
-    def create_dependencies(http_client, local_resource, remote_resource)
-      create_plugins(http_client, local_resource, remote_resource)
+    def create_dependencies(http_client, local_resource, related_remote_resource)
+      create_or_update_plugins(http_client, local_resource, related_remote_resource)
     end
 
-    def cleanup_dependencies(http_client, local_resource, remote_resource)
-      puts "-> Cleanup dependencies #{remote_resource.class.name} (#{remote_resource.identifier}).".colorize(:magenta)
-      cleanup_plugins(http_client, local_resource, remote_resource)
+    def cleanup_dependencies(http_client, local_resource, related_remote_resource)
+      puts "-> Cleanup dependencies #{related_remote_resource.class.name} (#{related_remote_resource.identifier}).".colorize(:magenta)
+      cleanup_plugins(http_client, local_resource, related_remote_resource)
     end
 
     def handle_api_errors(&block)
@@ -133,21 +132,26 @@ module Kongfigure::Services
       end
     end
 
-    def need_update_plugins?(resource, related_resource)
+    def need_update_plugins?(resource, related_remote_resource)
       resource.plugins.reject do |plugin|
-        find_related_resource(plugin, related_resource.plugins)
+        related_plugin = find_related_resource(plugin, related_remote_resource.plugins)
+        related_plugin && plugin == related_plugin
       end.size != 0
     end
 
-    def need_cleanup_plugins?(resource, related_resource)
+    def need_cleanup_plugins?(resource, related_remote_resource)
       resource.plugins.reject do |plugin|
-        find_related_resource(plugin, related_resource.plugins)
-      end.size == 0 && resource.plugins.size < related_resource.plugins.size
+        related_remote_plugin = find_related_resource(plugin, related_remote_resource.plugins)
+        related_remote_plugin && plugin == related_remote_plugin
+      end.size == 0 && resource.plugins.size < related_remote_resource.plugins.size
     end
 
-    def create_plugins(http_client, local_resource, remote_resource)
+    def create_or_update_plugins(http_client, local_resource, remote_resource)
       local_resource.plugins.each do |plugin|
-        unless find_related_resource(plugin, remote_resource.plugins)
+        related_plugin = find_related_resource(plugin, remote_resource.plugins)
+        if related_plugin
+          http_client.patch("#{resource_name}/#{local_resource.identifier}/plugins/#{related_plugin.id}", plugin.api_attributes.to_json)
+        else
           http_client.post("#{resource_name}/#{local_resource.identifier}/plugins", plugin.api_attributes.to_json)
         end
       end

data/lib/kongfigure/services/service.rb

@@ -1,34 +1,34 @@
 module Kongfigure::Services
   class Service < Base
-    def create_dependencies(http_client, resource, related_resource)
-      super(http_client, resource, related_resource)
-      create_routes(http_client, resource, related_resource)
+    def create_dependencies(http_client, resource, related_remote_resource)
+      super(http_client, resource, related_remote_resource)
+      create_routes(http_client, resource, related_remote_resource)
     end
 
-    def update_dependencies(http_client, resource, related_resource)
-      super(http_client, resource, related_resource)
-      create_routes(http_client, resource, related_resource)
+    def update_dependencies(http_client, resource, related_remote_resource)
+      super(http_client, resource, related_remote_resource)
+      create_routes(http_client, resource, related_remote_resource)
     end
 
-    def cleanup_dependencies(http_client, resource, related_resource)
-      super(http_client, resource, related_resource)
-      cleanup_routes(http_client, resource, related_resource)
+    def cleanup_dependencies(http_client, resource, related_remote_resource)
+      super(http_client, resource, related_remote_resource)
+      cleanup_routes(http_client, resource, related_remote_resource)
     end
 
-    def need_cleanup_dependencies?(resource, related_resource)
-      super(resource, related_resource) || resource.nil? || resource.routes != related_resource.routes
+    def need_cleanup_dependencies?(resource, related_remote_resource)
+      super(resource, related_remote_resource) || resource.nil? || resource.routes != related_remote_resource.routes
     end
 
-    def need_update_dependencies?(resource, related_resource)
-      super(resource, related_resource) || (resource && (resource.routes != related_resource.routes))
+    def need_update_dependencies?(resource, related_remote_resource)
+      super(resource, related_remote_resource) || (resource && !related_remote_resource.has_routes?(resource.routes))
     end
 
     private
 
-    def create_routes(http_client, resource, related_resource)
+    def create_routes(http_client, resource, related_remote_resource)
       resource.routes.each do |route|
-        unless related_resource.has_route?(route)
-          http_client.post("#{resource_name}/#{related_resource.identifier}/routes", route.api_attributes.to_json)
+        unless related_remote_resource.has_route?(route)
+          http_client.post("#{resource_name}/#{related_remote_resource.identifier}/routes", route.api_attributes.to_json)
         end
       end
     end

data/lib/kongfigure/version.rb

@@ -1,3 +1,3 @@
 module Kongfigure
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kongfigure
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Ibanity