philae 0.2.12 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98c6b24b9ffa3987fffbb4a47f404e8d20e728663be1dd3a6953972bfab2a7d6
-  data.tar.gz: f646a2b162c96cf3eced95b894f75ab74e64a13fb9dc40618ebf6757a721a068
+  metadata.gz: 4058dbbd9d47df1d46c0bb68315c17dfd38981a3d8d884be768df8aca9fa68d0
+  data.tar.gz: f745431b27b4371084f53ae649c94b362164ce68ab88353a7c8cee6213ccd014
 SHA512:
-  metadata.gz: c0a665aee100b59fa4057f1cb688aebf8fcf52282408142b3186d53da9e236522ad74c2945c26f0be66e38a377329cfb494863e24a85acde4f7ac72b4a7102e8
-  data.tar.gz: 8316c82012b480bb5cd6b43b2992a5b6e3712a78337031c51760903cc9d79a6962f71aeef5e1ed3a426a33c4d4ede4ddc0c99218c47835a5f881363cd4afd417
+  metadata.gz: c3a8c85060058e306066489391a38abf0cd81dbc03f505b7bd033f75eb282dc9f9a1cc77f285755c32a92cf8739f5aba77c1d01018dbf27b29dad73c997cd1fa
+  data.tar.gz: 96aab47fb98d8d03b6260046a4b3aa8bd6933ebf0c25126b25487bb8dead8d08db6d4ebdb00abb89b29cc8d0d67212f9ba68ca68b923f46b28cd9490aa284035

data/lib/philae/etcd_probe.rb

@@ -14,15 +14,12 @@ module Philae
 
     # @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?
-        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
+      if !cacert.nil?
+        raise InvalidSSLConfig, 'cacert' if !File.exist?(cacert)
+        raise InvalidSSLConfig, 'ssl_cert' if ssl_cert.nil? || !File.exist?(ssl_cert)
+        raise InvalidSSLConfig, 'ssl_key' if ssl_key.nil? || !File.exist?(ssl_key)
       end
+
       @name = name
       @host = host
       @port = port
@@ -34,22 +31,25 @@ module Philae
 
     def check
       begin
-        if not @cacert.nil?
-          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.get '/'
-      rescue Exception => e
+        etcd_client.get '/'
+      rescue StandardError => e
         return { healthy: false, comment: "Unable to contact etcd (#{e.message})" }
       end
 
       return { healthy: true, comment: '' }
     end
+
+    protected
+
+    def etcd_client
+      return Etcd.client host: @host, port: @port, read_timeout: @read_timeout do |c|
+        next if @cacert.nil?
+
+        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
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: philae
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.3.0
 platform: ruby
 authors:
 - leo@scalingo.com
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-30 00:00:00.000000000 Z
+date: 2019-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: docker-api