philae 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52665bd2cc49aad1dfdc3c7c53661e886ecb2960
-  data.tar.gz: c995b59612c527541139225798d1e58d654e15e6
+  metadata.gz: 364566be0ba5f86c671be8dfc919961eb333675c
+  data.tar.gz: 861a74eea37e7b5a4dd39f18f04165028df0727d
 SHA512:
-  metadata.gz: 35be4d2d3316b3992a852b4b51192e7ed153919fffc30ca489cc81e1be0912d7b46cf8784b90636df6100565a0cd5bf2c38b56e22500dc95caef3ffe802571fb
-  data.tar.gz: 7bf212df4572ce144eb9cb2d8b7bf3a0a080539194a2e9c05ad61a0e6b7f0e1788d8c8c329aa692d780dbaaadbceb2951fe5b0ac28aae8796846a4e1779edc63
+  metadata.gz: 8a75abb6a2a71b648d25386e1e269c77326589084211b32d2fdf2d8bfa1228c9947ea4467cda1b3b5a4f4b03a452385d9c3c28764c6a2260338cfeacb032d73b
+  data.tar.gz: fd7c6875ef6784f9654f79b3c692eedcdfee804f73bcc4043564a65f68601ea98f43448dadf463bf75186548c456b453c284449e0d7e0777f1c31f77d0997a93

data/lib/philae/etcd_probe.rb

@@ -6,13 +6,22 @@ require 'etcd'
 # If you need to connect to etcd using a custom CA cert, you can give it along with the SSL cert and
 # key to the constructor.
 module Philae
+  class InvalidSSLConfig < RuntimeError
+  end
+
   class EtcdProbe
     attr_reader :name
 
     # @param [Integer] read_timeout Timeout in second for the HTTP request
-    def initialize(name, host, port, read_timeout=1, cacert=nil, ssl_cert=nil, ssl_key=nil)
-      if not cacert.nil? and (ssl_cert.nil? or ssl_key.nil?)
-        raise ArgumentError
+    def initialize(name, host, port, read_timeout: 1, cacert: nil, ssl_cert: nil, ssl_key: nil)
+      if not cacert.nil?
+        if !File.exists? cacert
+          raise InvalidSSLConfig, "cacert"
+        elsif ssl_cert.nil? or !File.exists? ssl_cert
+          raise InvalidSSLConfig, "ssl_cert"
+        elsif ssl_key.nil? or !File.exists? ssl_key
+          raise InvalidSSLConfig, "ssl_key"
+        end
       end
       @name = name
       @host = host
@@ -25,20 +34,19 @@ module Philae
 
     def check
       begin
-        opts = {
-          host: @host,
-          port: @port,
-          read_timeout: @read_timeout,
-        }
         if not @cacert.nil?
-          opts[:cacert] = @cacert
-          opts[:ssl_cert] = @ssl_cert
-          opts[:ssl_key] = @ssl_key
+          client = Etcd.client host: @host, port: @port, read_timeout: @read_timeout do |c|
+            c.use_ssl = true
+            c.ca_file = @cacert
+            c.ssl_cert = OpenSSL::X509::Certificate.new(File.read(@ssl_cert))
+            c.ssl_key = OpenSSL::PKey::RSA.new(File.read(@ssl_key))
+          end
+        else
+          client = Etcd.client host: @host, port: @port, read_timeout: @read_timeout
         end
-        client = Etcd.client(opts)
         client.get '/'
-      rescue
-        return { healthy: false, comment: 'Unable to contact etcd' }
+      rescue Exception => e
+        return { healthy: false, comment: "Unable to contact etcd (#{e.message})" }
       end
       { healthy: true, comment: '' }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philae
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - leo@scalingo.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api