hiera-mysql-json-backend-jruby 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1381e6d0d6dfa969f329d587deb3a9869753c085
-  data.tar.gz: 647d1444436daca4231edc66f3f88a6fd74fbb57
+  metadata.gz: 5c96d6e30cfeffa3fa425bfe7346b80d22a1f77b
+  data.tar.gz: 88938c126d8489901ee3a5fd883c52840bdd18a1
 SHA512:
-  metadata.gz: c508f1dd2c1e670f4b038ab631ba468c2ef00e6d2612ba112a176feaca914466af4e0e53504e39d70fc67adb8a2371c4288686c0e567e5ce699e5f0c3df8e77e
-  data.tar.gz: 0f3d413504875afcdbe6466856899b7962dce3a0308ba1b48b93ebad68266a83144167f11592d344621e2bf32557b6f244b51ce3181877dcec6252f48222762f
+  metadata.gz: 81d60c95edcfecca8cec2cb6d90be52cc301ebd6a44a975b98a29924ae42218911699efef5fc8d2d9794db7f9420faf2e7563c9e265f45669a5635991db511d6
+  data.tar.gz: 593f3b3910733414be38f96c2fd3e15812ce3f577c1cf88e6d7a7b9fa61248e1acd1e0c11a53a0352167693fee0aa5b4f31451dbd814afe3182c4f466a38bf18

data/hiera-mysql-json-backend-puppetserver.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-json-backend-jruby"
-  gem.version       = "1.0.1"
+  gem.version       = "1.1.0"
   gem.authors       = ["Hostnet"]
   gem.email         = ["opensource@hostnet.nl"]
   gem.description   = %q{Alternative MySQL backend with json support for hiera}

data/hiera-mysql-json-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-json-backend"
-  gem.version       = "1.0.1"
+  gem.version       = "1.1.0"
   gem.authors       = ["Hostnet"]
   gem.email         = ["opensource@hostnet.nl"]
   gem.description   = %q{Alternative MySQL backend with json support for hiera}

data/lib/hiera/backend/mysql_json_backend.rb

@@ -18,7 +18,25 @@ class Hiera
 
         @cache = cache || Filecache.new
 
-        Hiera.debug("Hiera mysql_json initialized")
+        Hiera.debug('Hiera mysql_json initialized')
+      end
+
+      def should_lookup?(constraints, scope)
+        return true unless constraints.is_a?(Hash)
+        should_lookup = false
+        constraints.each do |item, matchers|
+          next unless scope.exist?(item.to_s)
+          if scope[item.to_s] =~ compile_regexes(matchers)
+            should_lookup = true
+            break
+          end
+        end
+        should_lookup
+      end
+
+      def compile_regexes(regexes)
+        res = regexes.map { |re| Regexp.compile(re) }
+        Regexp.union(res)
       end
 
       def lookup(key, scope, order_override, resolution_type)
@@ -28,9 +46,11 @@ class Hiera
         # so hiera('myvalue', 'test1') returns [nil,nil,nil,nil]
         results = nil
 
-        Hiera.debug("looking up #{key} in MySQL2 Backend")
+        Hiera.debug("looking up #{key} in mysql_json Backend")
         Hiera.debug("resolution type is #{resolution_type}")
 
+        return nil unless should_lookup?(Config[:mysql_json][:only_for], scope)
+
         Backend.datasources(scope, order_override) do |source|
           Hiera.debug("Looking for data source #{source}")
           sqlfile = Backend.datafile(:mysql_json, scope, source, "sql") || next
@@ -41,20 +61,20 @@ class Hiera
           end
 
           mysql_config = data.fetch(:dbconfig, {})
-          mysql_host = mysql_config.fetch(:host, nil) || Config[:mysql2][:host] || 'localhost'
-          mysql_user = mysql_config.fetch(:user, nil) || Config[:mysql2][:user]
-          mysql_pass = mysql_config.fetch(:pass, nil) || Config[:mysql2][:pass]
-          mysql_port = mysql_config.fetch(:port, nil) || Config[:mysql2][:port] || '3306'
-          mysql_database = mysql_config.fetch(:database, nil) || Config[:mysql2][:database]
+          mysql_host = mysql_config.fetch(:host, nil) || Config[:mysql_json][:host] || 'localhost'
+          mysql_user = mysql_config.fetch(:user, nil) || Config[:mysql_json][:user]
+          mysql_pass = mysql_config.fetch(:pass, nil) || Config[:mysql_json][:pass]
+          mysql_port = mysql_config.fetch(:port, nil) || Config[:mysql_json][:port] || '3306'
+          mysql_database = mysql_config.fetch(:database, nil) || Config[:mysql_json][:database]
 
           connection_hash = {
-            :host => mysql_host,
-            :username => mysql_user,
-            :password => mysql_pass,
-            :database => mysql_database,
-            :port => mysql_port,
-            :reconnect => true}
-
+            host:      mysql_host,
+            username:  mysql_user,
+            password:  mysql_pass,
+            database:  mysql_database,
+            port:      mysql_port,
+            reconnect: true
+          }
 
           Hiera.debug("data #{data.inspect}")
           next if data.empty?
@@ -70,6 +90,7 @@ class Hiera
           begin
             new_answer = JSON.parse(sql_results[0]['value'])
           rescue
+            raise Exception, "JSON parse error for key '#{key}'." unless Config[:mysql_json][:ignore_json_parse_errors]
             Hiera.debug("Miserable failure while looking for #{key}.")
             next
           end
@@ -88,19 +109,18 @@ class Hiera
             break
           end
         end
-        return results
+        results
       end
 
-
       def query(connection_hash, query)
         Hiera.debug("Executing SQL Query: #{query}")
 
-        data=[]
-        mysql_host=connection_hash[:host]
-        mysql_user=connection_hash[:username]
-        mysql_pass=connection_hash[:password]
-        mysql_database=connection_hash[:database]
-        mysql_port=connection_hash[:port]
+        data = []
+        mysql_host     = connection_hash[:host]
+        mysql_user     = connection_hash[:username]
+        mysql_pass     = connection_hash[:password]
+        mysql_database = connection_hash[:database]
+        mysql_port     = connection_hash[:port]
 
         if defined?(JRUBY_VERSION)
           Jdbc::MySQL.load_driver
@@ -109,7 +129,7 @@ class Hiera
           props.set_property :user, mysql_user
           props.set_property :password, mysql_pass
 
-          conn = com.mysql.jdbc.Driver.new.connect(url,props)
+          conn = com.mysql.jdbc.Driver.new.connect(url, props)
           stmt = conn.create_statement
 
           res = stmt.execute_query(query)
@@ -118,7 +138,7 @@ class Hiera
 
           Hiera.debug("Mysql Query returned #{numcols} rows")
 
-          while ( res.next ) do
+          while res.next
             if numcols < 2
               Hiera.debug("Mysql value : #{res.getString(1)}")
               data << res.getString(1)
@@ -144,8 +164,7 @@ class Hiera
           end
         end
 
-        return data
-
+        data
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-json-backend-jruby
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Hostnet
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-17 00:00:00.000000000 Z
+date: 2017-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jdbc-mysql