hiera-mysql-json-backend 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 7089e8b0947896353a2650c6e40859181b27daef
-  data.tar.gz: 15a1065f32602bc4f9b40655744e5b67a26a4e77
+SHA256:
+  metadata.gz: 8a1886efe7ccceb511cc7e6e478badcf22bc7e99ae84cf146953cc4c4a8578fa
+  data.tar.gz: e684e16256fae20776ed08e0d0b4ba5bd44be8c29a305bd193a05031c66798f0
 SHA512:
-  metadata.gz: 8ef7562939428dc62bd2696d331593c7f2098420920ecd1cd0cfad919c2a87f325bb548fb9a8a18056f61fe9b40c97ca94196fcbf2e53d9c2cb0ababf1fc95a1
-  data.tar.gz: 8ac1c9fef7bfd2c670ec9a2cf679a0b516d11c76553bde7592150b965be005424d592bc8098e1eb7b5d2c855501b8f7476d16834359d4a0d28d9ae34494d18e4
+  metadata.gz: 49f9b84e47ad2fcea9303835988658600311674940adc79e1babb1027900771b939a035222c984d8911db34f246dde10d39b00b07b28074ad112a9234c29b168
+  data.tar.gz: ca802b9dea41bf44a7319200b2aef8c63bd6215b445b7b90096093f2ab84e4cb3ed6aa5a890fb8d6833ce7c353f7ed06bcab0a59cda05a08702138243d3c6e43

data/CHANGELOG.md

@@ -20,3 +20,11 @@
 
 - If we cannot parse JSON as json, do something nasty to try if the value is a
   boolean
+
+### 2.1.0
+
+- Host/domain constraints can now be defined per hierarchy file instead of being global only
+
+### 2.2.0
+
+- Proper connection closing and previous patches

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       = "2.0.0"
+  gem.version       = "2.2.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       = "2.0.0"
+  gem.version       = "2.2.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

@@ -66,6 +66,9 @@ class Hiera
           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]
+          lookup_constraints = data.fetch(:only_for, nil) || Config[:mysql_json][:only_for] || {}
+
+          next unless should_lookup?(lookup_constraints, scope)
 
           connection_hash = {
             host:      mysql_host,
@@ -92,23 +95,9 @@ class Hiera
           sqlvalue = sql_results[0]['value']
 
           begin
-            new_answer = JSON.parse(sqlvalue)
+            new_answer = JSON.parse("{\"r\":#{sqlvalue}}")['r']
           rescue
             Hiera.debug("Miserable failure while parsing #{key} as JSON.")
-          end
-
-          if new_answer.nil?
-            case sqlvalue
-            when /^(true|t|yes|y|1)$/i
-              new_answer = true
-            when /^(false|f|no|n|0)$/i
-              new_answer = false
-            else
-              Hiera.debug("Miserable failure while parsing #{key} as boolean.")
-            end
-          end
-
-          if new_answer.nil?
             raise Exception, "Parse error for key '#{key}'. Offending data: #{sql_results[0]['value']}." unless Config[:mysql_json][:ignore_json_parse_errors]
             next
           end
@@ -163,7 +152,9 @@ class Hiera
             end
             data << row
           end
-
+          stmt.close
+          conn.close
+          data
         else
           client = Mysql2::Client.new(connection_hash)
           begin

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-json-backend
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Hostnet
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mysql2
@@ -73,7 +73,7 @@ homepage: https://github.com/hostnet/hiera-mysql-json-backend
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -88,9 +88,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.5
-signing_key: 
+rubygems_version: 3.3.27
+signing_key:
 specification_version: 4
 summary: Alternative MySQL backend with json support for hiera
 test_files: []