lita-puppet 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0aa077c50e7fd24a50bfe04f0fb817e57aafbfb0
-  data.tar.gz: 0776098f672e14f307a1e7bc36bc904019b1190b
+  metadata.gz: a1a64ba6cd82ebd152396e536574abd3b893f26c
+  data.tar.gz: 11bdffc2af7ec69bcff8f3d469eab03f1024f45c
 SHA512:
-  metadata.gz: 95318d449e3954ffeac762452b2779c75fa248a4ee18230881d1a8f52a72749bb30feaa9a2c4909cb37741580b3cec25bf862c0c3effda8bcd37bb882cb96aba
-  data.tar.gz: 7b410980b95914091522572142916004a7844cd3fdcb4f5a5edac5eade48149b58be3c0001432882dcf9974467a4cc95d365a87169be71eb768fb0778e4a998b
+  metadata.gz: d528464df2d9d25d86368f2bea53df0371ffe9b0a1865b06ee1e680040c763fffe39ccfa5dc5285e0dd04378e1f18b95d9722ec099bc4a3fbb651564d871aa8b
+  data.tar.gz: 6485db8e6f924e158bd5f776604030b173db02bcf54bacd87ba62c62cb980209cf9ee7bfe123fb350aea0c5c1c1725dcf4ba3bdc09170c50ceda3cf2f94cfb87

data/README.md

@@ -24,8 +24,15 @@ gem "lita-puppet"
 
 * `config.handlers.puppet.master_hostname` - Puppet Master's hostname
 * `config.handlers.puppet.puppetdb_url` - PuppetDB hostname (for the [puppetdb-ruby](https://github.com/voxpupuli/puppetdb-ruby) gem)
+* `config.handlers.puppet.puppetdb_api_vers` - PuppetDB api version (for the [puppetdb-ruby](https://github.com/voxpupuli/puppetdb-ruby) gem)
+* `config.handlers.puppet.puppetdb_key` - key file for puppetdb ssl (for the [puppetdb-ruby](https://github.com/voxpupuli/puppetdb-ruby) gem)
+*  `config.handlers.puppet.puppetdb_cert` - cert file for puppetdb (for the [puppetdb-ruby](https://github.com/voxpupuli/puppetdb-ruby) gem)
+* `config.handlers.puppet.puppetdb_ca_cert` - ca file for puppetdb (for the [puppetdb-ruby](https://github.com/voxpupuli/puppetdb-ruby) gem)
 * `config.handlers.puppet.ssh_user` - SSH user for the Puppet Master for r10k deployments
 
+### PuppetDB APIv4
+If you are using this with version 4 of the PuppetDB api you append `/pdq/query` to the end of the PuppetDB server url. See [this issue for more info](https://github.com/voxpupuli/puppetdb-ruby/issues/13)
+
 ## Usage
 
 #### Deploying an environment via r10k

data/lib/lita/handlers/puppet.rb

@@ -5,6 +5,10 @@ module Lita
       config :master_hostname, required: true, type: String
       config :ssh_user, required: false, type: String, default: 'lita'
       config :puppetdb_url, required: false, type: String
+      config :puppetdb_api_vers, required: false, type: String, default: '4'
+      config :puppetdb_key, required: true, type: String
+      config :puppetdb_cert, required: true, type: String
+      config :puppetdb_ca_cert, required: true, type: String
 
       route(
         /(puppet|pp)(\s+agent)?\s+(run)(\s+on)?\s+(\S+)/i,

data/lib/utils/lita_puppet/puppetdb.rb

@@ -3,7 +3,14 @@ module Utils
     # Utility methods for working with PuppetDB
     module PuppetDB
       def class_nodes(url, classname)
-        client = ::PuppetDB::Client.new(server: url)
+        client = ::PuppetDB::Client.new({
+                                          server: url,
+                                          pem: {
+                                            'key' => config.puppetdb_key,
+                                            'cert'    => config.puppetdb_cert,
+                                            'ca_file' => config.puppetdb_ca_cert
+                                          }
+                                        }, config.puppetdb_api_vers)
         q = client.request(
           'resources',
           [
@@ -16,9 +23,17 @@ module Utils
         q.data.map { |node| node['certname'] }
       end
 
+      # rubocop:disable AbcSize
       def node_roles_and_profiles(url, what, nodename)
         # TODO: validate url and nodename
-        ::PuppetDB::Client.new(server: url) # this is weird but required
+        ::PuppetDB::Client.new({
+                                 server: url,
+                                 pem: {
+                                   'key' => config.puppetdb_key,
+                                   'cert'    => config.puppetdb_cert,
+                                   'ca_file' => config.puppetdb_ca_cert
+                                 }
+                               }, config.puppetdb_api_vers) # this is weird but required
         d = ::PuppetDB::Client.get("/catalogs/#{nodename}")
         return d['error'] if d['error']
 

data/lita-puppet.gemspec

@@ -1,7 +1,7 @@
 # rubocop:disable Metrics/BlockLength
 Gem::Specification.new do |spec|
   spec.name          = 'lita-puppet'
-  spec.version       = '0.7.1'
+  spec.version       = '0.7.2'
   spec.authors       = ['Daniel Schaaff', 'Jonathan Gnagy'].sort
   spec.email         = ['jgnagy@knuedge.com']
   spec.description   = 'Some basic Puppet interactions for Lita'

data/spec/lita/handlers/puppet_spec.rb

@@ -4,7 +4,10 @@ require 'pry'
 describe Lita::Handlers::Puppet, lita_handler: true do
   before do
     registry.config.handlers.puppet.master_hostname = 'puppet.foo'
-    registry.config.handlers.puppet.puppetdb_url = 'http://pboard.foo:8080'
+    registry.config.handlers.puppet.puppetdb_url = 'https://pboard.foo:8081'
+    registry.config.handlers.puppet.puppetdb_key = 'keyfile'
+    registry.config.handlers.puppet.puppetdb_cert = 'certfile'
+    registry.config.handlers.puppet.puppetdb_ca_cert = 'cafile'
   end
 
   let(:lita_user) { Lita::User.create('User', name: 'A User', mention_name: 'user') }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lita-puppet
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Daniel Schaaff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -225,7 +225,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Allow the Lita bot to handle requests for puppet tasks