dryad-consul 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebfad19cea21ae94dd248931ed5a37afbdd59f60ec9a65902b33c77c3bd9ffad
-  data.tar.gz: 42de2e60a31f501314c04adc676720f10eac9f23499efcaf4b0b59eaf6713d18
+  metadata.gz: 1149060926d6c254097b6f498d80f5243d7ecda0b1a160394375f32ae807b0d0
+  data.tar.gz: 0c5a0c58e1b2a03723dc58fb6c830c440e7103166af5c75f4831b186e7af5980
 SHA512:
-  metadata.gz: 4ac0341de021e32e7e7cedd25412a0c108c02fb085ca20c9c05bc28cd43f5c68a034ca018e2927fc1dd64e44c0b6b673a27ac62adf2725199328cb07246e9054
-  data.tar.gz: bb233a9b8c98588d0fa00fb9d17f1b103ab62e0a22b16ab346811eee1d6554174dbbf8bf1d57e2c2b8cb186f346d291cbdc378e78ab9728a6a27c5ee56d5788c
+  metadata.gz: 847aa97e79ddb1c3f213610148d290e10d02f0df43dfc4416ed099cf044acdfd0920443b44260273e99b569b13fea0c1fc332f4b7b8e62c7815606cae8b344ed
+  data.tar.gz: eb3062b04cb425d63b30ad25acf0e9a745155581a45faa1b8d98e1f5323ba2f289f51f4238c0f75322e749342e27c7bcdccebcb77dd4a0fafb2b66cb59b62843

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    dryad-consul (0.3.0)
+    dryad-consul (0.3.2)
       concurrent-ruby (~> 1.1, >= 1.1.5)
       diplomat (~> 2.2, >= 2.2.4)
-      dryad-core (= 0.3.0)
+      dryad-core (= 0.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -15,7 +15,7 @@ GEM
     diplomat (2.2.5)
       deep_merge (~> 1.0, >= 1.0.1)
       faraday (~> 0.9)
-    dryad-core (0.3.0)
+    dryad-core (0.3.2)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
     multipart-post (2.1.1)

data/lib/dryad/consul/health_check.rb

@@ -0,0 +1,42 @@
+module Dryad
+  module Consul
+    class HealthCheck
+      attr_accessor :deregister_critial_service_after
+
+      def initialize(duration)
+        @deregister_critial_service_after = duration
+      end
+    end
+
+    class TTLHealthCheck < HealthCheck
+      attr_accessor :ttl
+
+      def initialize(ttl, deregister_critial_service_after)
+        super(deregister_critial_service_after)
+        @ttl = ttl
+      end
+    end
+
+    class HTTPHealthCheck < HealthCheck
+      attr_accessor :http, :interval, :timeout
+
+      def initialize(http, interval, timeout, deregister_critial_service_after)
+        super(deregister_critial_service_after)
+        @http = http
+        @interval = interval
+        @timeout = timeout
+      end
+    end
+
+    class GRPCHealthCheck < HealthCheck
+      attr_accessor :grpc, :interval, :grpc_use_tls
+
+      def initialize(grpc, interval, grpc_use_tls, deregister_critial_service_after)
+        super(deregister_critial_service_after)
+        @grpc = grpc
+        @interval = interval
+        @grpc_use_tls = grpc_use_tls
+      end
+    end
+  end
+end

data/lib/dryad/consul/railtie.rb

@@ -23,7 +23,7 @@ module Dryad
           observer = ::Dryad::Consul::DBConfigObserver.new
           begin
             db_config = Dryad::Consul::ConfigProvider.instance.load(db_path, observer)
-            raise Dryad::Core::ConfigurationNotFound, db_path
+            raise Dryad::Core::ConfigurationNotFound, db_path if db_config.nil?
             ActiveRecord::Base.configurations = YAML.load(ERB.new(db_config.payload).result)
             ActiveRecord::Base.establish_connection(Rails.env.to_sym)
           rescue Dryad::Core::ConfigurationNotFound => e

data/lib/dryad/consul/service.rb

@@ -9,7 +9,8 @@ module Dryad
             Address: address,
             Port: portal.port,
             EnableTagOverride: true,
-            Tags: tags(portal)
+            Tags: tags(portal),
+            Checks: checks(portal)
           }
         end
       end
@@ -28,6 +29,14 @@ module Dryad
         end
         tags.concat(load_balancing.map{|lb| "load_balancing = \"#{lb}\"" })
       end
+
+      def checks(portal)
+        if portal.check.nil? || !portal.check.is_a?(Dryad::Consul::HealthCheck)
+          []
+        else
+          [portal.check.attributes]
+        end
+      end
     end
   end
 end

data/lib/dryad/consul/version.rb

@@ -1,5 +1,5 @@
 module Dryad
   module Consul
-    VERSION = '0.3.0'
+    VERSION = '0.3.2'
   end
 end

data/lib/dryad/consul.rb

@@ -8,6 +8,8 @@ require "dryad/consul/service"
 require "dryad/consul/key_value_client"
 require "dryad/consul/config_provider"
 
+require "erb"
+
 module Dryad
   module Consul
     class Error < StandardError; end
@@ -17,7 +19,7 @@ module Dryad
         if consul[:username].nil? || consul[:password].nil?
           url = "http://#{consul[:host]}:#{consul[:port]}"
         else
-          url = "http://#{consul[:username]}:#{consul[:password]}@#{consul[:host]}:#{consul[:port]}"
+          url = "http://#{consul[:username]}:#{ERB::Util.url_encode(consul[:password])}@#{consul[:host]}:#{consul[:port]}"
         end
         ::Diplomat.configure do |config|
           config.url = url

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dryad-consul
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Pan Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-14 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dryad-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.0
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -126,6 +126,7 @@ files:
 - lib/dryad/consul.rb
 - lib/dryad/consul/config_observer.rb
 - lib/dryad/consul/config_provider.rb
+- lib/dryad/consul/health_check.rb
 - lib/dryad/consul/key_value_client.rb
 - lib/dryad/consul/railtie.rb
 - lib/dryad/consul/service.rb