hiera-postgres-backend 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 579e8f9d6c45cca95af59718d95f56e5fe6837d7
-  data.tar.gz: 9207ad3377c7710fa02dc28cb356afa4e073f115
+  metadata.gz: ae0eae161bce8929542a785a6edf2c43391c88de
+  data.tar.gz: ededbec5f1d0b38538f5c0e33982cf20d3e3f942
 SHA512:
-  metadata.gz: c9c9e91a44f9827794064ecc797c99d85b09cb20943122d1d5f28415deb4f4b19657d486cc405f3ea6d671026a1008134d4760819f52a5809b8e14fdae2ea350
-  data.tar.gz: 608cb8a8ce53224f2ce9690fcc4217d6bce406e3d390e2440a0f33e9bab98642366eb6bf96c55ba763d3d5c2e0f0b70fa51679f814ad39a8cea03b5fe5e8498f
+  metadata.gz: 8d173d87da3823cb9772f287248d16b88cd44748260d89123258cbab74d78199a6dc92a0c7c71b06fee7f6f0cea72a9a82e145fb867a809249239b3c90007bd9
+  data.tar.gz: e1846468968bdb6e51192c810aa56f69304538e6932e6cf4729b7c8a5988e507bda02ea7286c42c73b61224b5d8617bbc2611d4a6ae33f481837497319954f56

data/README.md

@@ -7,7 +7,7 @@ This is a PostgreSQL backend for Hiera inspired by [hiera-mysql-backend](https:/
 
 ### What goes into the sql files.
 
-The poorly named sql files are really yaml files where the key is the lookup key and the value is the SQL statement (it accepts interpolation)
+The poorly named sql files are really yaml files where the key is the lookup key and the value is the SQL statement (it accepts interpolation).
 
 Lets assume your _datadir_ is `/etc/puppet/hieradata/` and your hierarchy for hiera just have a common. hiera-postgresql-backend would look for /etc/puppet/hieradata/common.sql the common.sql would look like:
 
@@ -15,10 +15,13 @@ Lets assume your _datadir_ is `/etc/puppet/hieradata/` and your hierarchy for hi
 ---
 applications: SELECT * FROM applications WHERE host='%{fqdn}';
 coats: SELECT cut,name,type FROM coats WHERE color='brown';
+default_query: SELECT dbhost, dbuser, dbpass FROM db_servers WHERE dbclient='%{fqdn}' and dbname='%{key}';
 ```
 
 running `hiera applications` would run the query against the configured database.
 
+The default_query key is special: it is in fact a default for anything in this hierarchy that is not specified with its own key. For example, running `hiera booksdb` would run default_query with the key variable in the query being interpolated as "booksdb".
+
 
 ### Using
 

data/hiera-postgres-backend.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |gem|
   gem.name          = "hiera-postgres-backend"
-  gem.version       = "0.0.3"
+  gem.version       = "0.0.4"
   gem.authors       = ["Adrian"]
   gem.email         = ["adrianlzt@gmail.com"]
   gem.description   = %q{Alternative PostgreSQL backend for hiera}

data/lib/hiera/backend/postgres_backend.rb

@@ -36,11 +36,16 @@ class Hiera
 
           Hiera.debug("data #{data.inspect}")
           next if data.empty?
-          next unless data.include?(key)
-
-          Hiera.debug("Found #{key} in #{source}")
+          if data.include?(key)
+              Hiera.debug("Found #{key} in #{source}")
+              new_answer = Backend.parse_answer(data[key], scope, { 'key' => key } )
+          elsif data.include?('default_query')
+              Hiera.debug("Found default_query in #{source}")
+              new_answer = Backend.parse_answer(data['default_query'], scope, { 'key' => key } )
+          else
+              next
+          end
 
-          new_answer = Backend.parse_answer(data[key], scope)
           case resolution_type
           when :array
             raise Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}" unless new_answer.kind_of? Array or new_answer.kind_of? String
@@ -68,10 +73,10 @@ class Hiera
         pg_user = Config[:postgres][:user]
         pg_pass = Config[:postgres][:pass]
         pg_database = Config[:postgres][:database]
-        client = PG::Connection.new(:host     => pg_host, 
-                                    :user     => pg_user, 
-                                    :password => pg_pass, 
-                                    :dbname   => pg_database)
+        client = PGconn.open(:host     => pg_host, 
+                             :user     => pg_user, 
+                             :password => pg_pass, 
+                             :dbname   => pg_database)
         begin
           data = client.exec(query).to_a
           Hiera.debug("PostgreSQL Query returned #{data.size} rows")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hiera-postgres-backend
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Adrian
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg