canzea 0.1.86 → 0.1.87

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b380609c6ab92eb787f7a5788abb30e0364987c1
-  data.tar.gz: c07311c2eb32a3797370d507f3e66c01a2f754a2
+  metadata.gz: 54c0691d0071ef0e17bf27045007e005eec6cc6a
+  data.tar.gz: ac65626722a0b78785fa39866c1529ac366507a8
 SHA512:
-  metadata.gz: dbb996526914bb55fffcd311e1fb9c210b1ef231521f6e9d7524e7182e0f53e5a4c8a545479aa068f13537e4f582e1d8c9f729ee3f620fdd8a70e69971e67ff0
-  data.tar.gz: 97b1f8eabdb179537c772047dfb56ade89b442f28e75a7eab9a16b9cdfc88d9d10bc439b63d2bf074bb15d49377c53dfeaf7de761e2111a680fd369e8709f1db
+  metadata.gz: 77e69e7d911428e9364173855c47510d38310b682f251f5d3605a895a166b3ae54778adc70e66a7b9b0120c87ad05b746a50a4dfc7d6b79acc6962b8346984e0
+  data.tar.gz: 228621af63f61b2553f8c704958738b4292d03e997f6b38272b3ec7700a5b98f9a1a3447f270e7d6528d5bad132de968f05db6e0d28f20a821c25eaa0f312196

data/lib/canzea/registry.rb

@@ -0,0 +1,12 @@
+require 'json'
+require_relative 'config'
+require_relative '../registry'
+
+module Canzea
+
+    extraConfig = Canzea::config[:config_location] + "/config.json"
+    if File.exists?(extraConfig)
+        file = File.read(extraConfig)
+        Canzea::configure JSON.parse(file)
+    end
+end

data/lib/canzea/version.rb

@@ -1,3 +1,3 @@
 module Canzea
-  VERSION = "0.1.86"
+  VERSION = "0.1.87"
 end

data/lib/commands/add-env.rb

@@ -41,13 +41,13 @@ class AddEnv
             envs = JSON.parse(file)
             envs['vars'].keys.each { | key |
                 val = envs['vars'][key]
-                puts "-- #{key} == #{val}"
+                puts "--    #{key} == #{val}"
                 @log.info "Setting: #{key} == #{val}"
                 ENV.store(key, val)
             }
             envs['secrets'].keys.each { | key |
                 val = envs['secrets'][key]
-                puts "-- #{key} == XXXXXX"
+                puts "--    #{key} == XXXXXX"
                 @log.info "Setting: #{key} == XXXXXXX"
                 ENV.store(key, val)
             }

data/lib/registry.rb

@@ -5,152 +5,121 @@ require 'base64'
 require 'openssl'
 
 class Registry
-   def getKeyValue (key)
-
-          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
-            puts "-- KEY VALUE NOT FOUND! " + key
-            abort("Problem reading registry, response code #{resp.code}")
-          end
+   def getKeyValues (root)
+        uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{root}?recurse=true")
+        http = prepareHttp(uri)
 
-          result = JSON.parse(resp.body)
-          return Base64.decode64(result[0]["Value"])
-   end
+        request = Net::HTTP::Get.new(uri.request_uri)
+        resp = http.request(request)
 
-   def setKeyValue (root, key, value)
+        res = http.get("/v1/kv/#{key}?recurse=true", headers)
 
-          uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{root}/#{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::Put.new(uri.request_uri)
-          request.body = "#{value}";
-          resp = http.request(request)
-
-          if Integer(resp.code) != 200
-            puts "-- KEY VALUE NOT SAVED! #{root} #{key}"
-            abort("Problem adding to registry, response code #{resp.code}")
-          end
+        if ( Integer(res.code) != 200 )
+            puts "-- KEY VALUE NOT FOUND! " + root
+            abort("Problem reading registry, response code #{resp.code}")
+        else
+            response = []
+            result = JSON.parse(res.body)
+            result.each() do |item|
+              response.push({item["Key"] => Base64.decode64(item["Value"])})
+            end
+            return JSON.generate(response)
+        end
    end
 
-   def getValue (root, 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
+   def getKeyValue (key)
 
-        #sess.enable_debug
-        resp = sess.get("/#{root}/#{key}")
+        uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{key}")
+        http = prepareHttp(uri)
 
-        # puts resp.body
+        request = Net::HTTP::Get.new(uri.request_uri)
+        resp = http.request(request)
 
-        if resp.status != 200
-            abort("problem #{resp.status_line}")
+        if Integer(resp.code) != 200
+            puts "-- KEY VALUE NOT FOUND! " + key
+            abort("Problem reading registry, response code #{resp.code}")
         end
 
         result = JSON.parse(resp.body)
         return Base64.decode64(result[0]["Value"])
    end
 
+   def setKeyValue (root, key, value)
 
-   def exists (root)
+        uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{root}/#{key}")
+        http = prepareHttp(uri)
 
-        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'}
+        request = Net::HTTP::Put.new(uri.request_uri)
+        request.body = "#{value}";
+        resp = http.request(request)
+
+        if Integer(resp.code) != 200
+            puts "-- KEY VALUE NOT SAVED! #{root} #{key}"
+            abort("Problem adding to registry, response code #{resp.code}")
         end
+   end
 
-        # sess.enable_debug
-        resp = sess.get("/#{root}")
-        puts resp.body
+   def exists (key)
+        uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{key}")
+        http = prepareHttp(uri)
 
-        if resp.status == 200
-            abort("problem #{resp.status_line}")
+        request = Net::HTTP::Get.new(uri.request_uri)
+        resp = http.request(request)
+
+        if Integer(resp.code) == 200
+            return true
+        else
+            return false
         end
    end
 
    def deleteDirectory (root)
+        uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{root}")
+        http = prepareHttp(uri)
 
-        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.delete("/#{root}?&recurse=true")
-        puts resp.body
+        request = Net::HTTP::Delete.new(uri.request_uri)
+        resp = http.request(request)
 
-        if resp.status != 200
-            abort("problem #{resp.status_line}")
+        if Integer(resp.code) != 200
+            puts "-- KEY NOT DELETED! " + key
+            abort("Response code #{resp.code}")
         end
-
    end
 
    def registerDirectory (root)
+        uri = URI.parse(ENV["CONSUL_URL"] + "/v1/kv/#{root}?dir=true")
+        http = prepareHttp(uri)
 
-        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.put("/#{root}?dir=true", "")
-        puts resp.body
+        request = Net::HTTP::Put.new(uri.request_uri)
+        resp = http.request(request)
 
-        if resp.status > 202
-            abort("problem #{resp.status_line}")
+        if Integer(resp.code) > 202
+            puts "-- KEY DIRECTORY NOT SAVED! #{root}"
+            abort("Problem adding to registry, response code #{resp.code}")
         end
-
    end
 
    def register (root, key, value)
+        setKeyValue root, key, value
+    end
 
-        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
+    def prepareHttp (uri)
+        http = Net::HTTP.new(uri.host, uri.port)
 
-        #sess.enable_debug
-        resp = sess.put("/#{root}/#{key}", "#{value}")
-        puts resp.body
+        if (Canzea::config[:consul_tls])
+            pemCert = File.read(Canzea::config[:consul_tls_cert_file])
+            pemKey = File.read(Canzea::config[:consul_tls_key_file])
 
-        if resp.status > 202
-            abort("problem #{resp.status_line}")
+            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
 
+        return http
     end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: canzea
 version: !ruby/object:Gem::Version
-  version: 0.1.86
+  version: 0.1.87
 platform: ruby
 authors:
 - Canzea Technologies
@@ -164,6 +164,7 @@ files:
 - lib/canzea.rb
 - lib/canzea/config.rb
 - lib/canzea/environment.rb
+- lib/canzea/registry.rb
 - lib/canzea/version.rb
 - lib/commands/add-env.rb
 - lib/commands/apply-config.rb