canzea 0.1.71 → 0.1.72

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61de1f45ca56663dd8b81a9c095ce3317353099a
-  data.tar.gz: 349fed7d32983cbe6720249c8378cea3c68cefb9
+  metadata.gz: cb2b8fa105de076019de5f6f899288c7e9d5e109
+  data.tar.gz: 2a34520e2d97cd02a45f76bfc0b74990e8755b96
 SHA512:
-  metadata.gz: 9593f0dfcaeb14f76aded79402de2bfe1a072b2e51304609b2309a21da1a5ebac87255ecbbb99038c2ea28c86f1ee96a1544a4846eca9bbfe8bde959bf26880f
-  data.tar.gz: 3f08a08831e7524f028073dd11d38c7884adb96fab113cc7801ca013859b45c2e9a9d7662c6ed413577ad986dcf064cd5a427c0d6fd93464edd2d269ca25b5cd
+  metadata.gz: e91679a4841e41a4469d7f95f95aec88334b2616def1316513a195e9298123e7a8c28bc86cec732ca3b53d52ef442414f6a4756a3006884f61d46952955851e7
+  data.tar.gz: 3b94f3de4c1d1e514b3e9b3a76fe645afa2112c4c294e55c4de18b944262f73b866154317df9b6470f72c6f0f5d1f747a23e8d637f3c17e782f0067116a1515e

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.71"
+  VERSION = "0.1.72"
 end

data/lib/commands/apply-config.rb

@@ -21,7 +21,7 @@ class ApplyConfig
         index = 1
         steps["steps"].each { | step |
 
-            # Needs to be after each step because new env vars could be set
+            # Needs to be after each step because new env vars could be set (i.e./ CONSUL_URL)
             AddEnv.new.injectEnvironmentVariables()
 
             ref = "Step #{index.to_s.rjust(2, "0")} / #{steps['steps'].length}"

data/lib/registry.rb

@@ -1,4 +1,5 @@
 require 'patron'
+require 'net/http'
 require 'json'
 require 'base64'
 
@@ -6,23 +7,32 @@ class Registry
 
    def getKeyValue (key)
 
-        sess = Patron::Session.new do |patron|
-            patron.timeout = 10
-            patron.base_url = ENV["CONSUL_URL"] + '/v1/kv'
-            # patron.headers = {'User-Agent' => 'IKE-Registry/1.0'}
-        end
-
-        #sess.enable_debug
-        resp = sess.get("/#{key}")
-
-        # puts resp.body
-
-        if resp.status != 200
-            abort("problem #{resp.status_line}")
-        end
-
-        result = JSON.parse(resp.body)
-        return Base64.decode64(result[0]["Value"])
+          uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{key}")
+          http = Net::HTTP.new(uri.host, uri.port)
+
+          if (Canzea::config[:consul_tls])
+              pemCert = File.read(Canzea::config[:consul_tls_cert_file])
+              pemKey = File.read(Canzea::config[:consul_tls_key_file])
+
+              http.use_ssl = true
+              http.ca_file = Canzea::config[:consul_tls_ca_file]
+              http.cert = OpenSSL::X509::Certificate.new(pemCert)
+              http.key = OpenSSL::PKey::RSA.new(pemKey)
+              http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+              # http.set_debug_output($stdout)
+              http.ssl_version = :SSLv23
+          end
+          request = Net::HTTP::Get.new(uri.request_uri)
+          resp = http.request(request)
+
+          if Integer(resp.code) != 200
+            log.warn("KEY VALUE NOT FOUND! " + svc['name'])
+            puts "-- KEY VALUE NOT FOUND! " + svc['name']
+            abort("Problem, response code #{resp.code}")
+          end
+
+          result = JSON.parse(resp.body)
+          return Base64.decode64(result[0]["Value"])
    end
 
    def getValue (root, key)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.71
+  version: 0.1.72
 platform: ruby
 authors:
 - Canzea Technologies