hiera-mysql-backend 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 457778db31cd7a5a4f02ffa77800a84db23db015
-  data.tar.gz: c816cf244a6dbe69476701fc0d4bc535a171f04b
+  metadata.gz: 67b238516159dbc557c0f028f1ed64309d58662a
+  data.tar.gz: f434c79cde6fbf9687145894cace532a177dd17d
 SHA512:
-  metadata.gz: 20ba1b125177932546f88f9dab29a04c042194f2ea98e2ba092fb30824649ad25b60de4ce1a1f3740ebfb5e217f933a2cfed3ae78daadb4700f21a4020cb3aaf
-  data.tar.gz: 82baa75051114666b65f57c025c9747d80903b1b11fb087251e50dd88cbd2621a90a3472b72b789a91ce5d8847c18c36c66ab6baca4ef3a5e148dd014d1f0e09
+  metadata.gz: 34396bca064fdf98a4d8748e5a629742001342ad9c613a72e826c7936f938dcf96945e9dcb90604f09fc9d0bae83f2399d7b538e39bc7591b677fc8f2ff4273f
+  data.tar.gz: 1e221ab27a654fbebc50b02088ed5a8b2fce1af2c81f7fdb98108cb784160c4be4cda5666e1e2288727dd88522638a75de5e2eb345c21c166e3c9d16c8e7f4fc

data/README.md

@@ -32,11 +32,16 @@ Lets assume your _datadir_ is `/etc/puppet/hieradata/` and your hierarchy for hi
   :user: hieratest
   :pass: sekret
   :database: testhieradb
+  :port: 44445
 
 applications: SELECT * FROM applications WHERE host='%{fqdn}';
 coats: SELECT cut,name,type FROM coats WHERE color='brown';
 ```
 
+If `host` is not defined it will use `localhost` as default.
+
+If `port` is not defined it will use the default `3306` mysql port
+
 running `hiera applications` would run the query against the configured database.
 
 
@@ -64,6 +69,7 @@ Hiera configuration is pretty simple
   :user: username
   :pass: password
   :database: database
+  :port: 3306
 
 :hierarchy:
   - "%{::clientcert}"
@@ -73,6 +79,10 @@ Hiera configuration is pretty simple
 :logger: console
 ```
 
+If `host` is not defined it will use `localhost` as default.
+
+If `port` is not defined it will use the default `3306` mysql port
+
 ## Known issues
 
 1. It always return an Array of hashes regardless of the number of items returned. (I did this on purpose because it is what I needed but I may be persuaded to do otherwise)

data/hiera-mysql-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-mysql-backend"
-  gem.version       = "0.0.5"
+  gem.version       = "0.0.6"
   gem.authors       = ["Telmo"]
   gem.email         = ["telmox@gmail.com"]
   gem.description   = %q{Alternative MySQL backend for hiera}

data/lib/hiera/backend/mysql2_backend.rb

@@ -34,11 +34,12 @@ class Hiera
             YAML.load(datafile)
           end
 
-          mysql_host = data.fetch(:dbconfig, {}).fetch(:host, nil) || Config[:mysql2][:host]
-          mysql_user = data.fetch(:dbconfig, {}).fetch(:user, nil) || Config[:mysql2][:user]
-          mysql_pass = data.fetch(:dbconfig, {}).fetch(:pass, nil) || Config[:mysql2][:pass]
-          mysql_port = data.fetch(:dbconfig, {}).fetch(:port, nil) || Config[:mysql2][:port]
-          mysql_database = data.fetch(:dbconfig, {}).fetch(:database, nil) || Config[:mysql2][:database]
+          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]
 
           connection_hash = {
             :host => mysql_host,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hiera-mysql-backend
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Telmo