Merge #276 into master

Author: austb

lib/puppet/functions/puppetdb/create_subsetting_resource_hash.rb

@@ -0,0 +1,18 @@
+Puppet::Functions.create_function(:'puppetdb::create_subsetting_resource_hash') do
+  dispatch :create_subsetting_resource_hash do
+    required_param 'Hash', :java_args
+    required_param 'Any', :params
+  end
+
+  def create_subsetting_resource_hash(java_args, params)
+    resource_hash = {}
+
+    java_args.each { |k,v|
+      item_params = { 'subsetting' => k, 'value' => (v || '') }
+      item_params.merge!(params)
+      resource_hash.merge!({ "'#{k}'" => item_params })
+    }
+
+    resource_hash
+  end
+end

lib/puppet/functions/puppetdb/flatten_java_args.rb

@@ -0,0 +1,12 @@
+Puppet::Functions.create_function(:'puppetdb::flatten_java_args') do
+  dispatch :flatten_java_args do
+    optional_param 'Hash', :java_args
+    return_type 'String'
+  end
+
+  def flatten_java_args(java_args = {})
+    args = ''
+    java_args.each {|k,v| args += "#{k}#{v} "}
+    "\"#{args.chomp(' ')}\""
+  end
+end

lib/puppet/parser/functions/puppetdb_create_subsetting_resource_hash.rb

@@ -264,7 +264,7 @@
     if $merge_default_java_args {
       create_resources(
         'ini_subsetting',
-        puppetdb_create_subsetting_resource_hash(
+        puppetdb::create_subsetting_resource_hash(
           $java_args, {
             ensure            => present,
             section           => '',
@@ -282,7 +282,7 @@
         setting => 'JAVA_ARGS',
         require => Package[$puppetdb_package],
         notify  => Service[$puppetdb_service],
-        value   => puppetdb_flatten_java_args($java_args),
+        value   => puppetdb::flatten_java_args($java_args),
       }
     }
   }

lib/puppet/parser/functions/puppetdb_flatten_java_args.rb

@@ -0,0 +1,11 @@
+require 'spec_helper'
+
+describe 'puppetdb::create_subsetting_resource_hash'  do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params({'test' => 1}).and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params('foo', 'bar').and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params({'foo' => 1 }, {'bar' => 2}, {'baz' => 3}).and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params({'foo' => 1, 'bar' => 2}, {'baz' => 3})
+      .and_return({"'foo'"=>{"subsetting"=>"foo", "value"=>1, "baz"=>3}, "'bar'"=>{"subsetting"=>"bar", "value"=>2, "baz"=>3}}) }
+end

manifests/server.pp

@@ -0,0 +1,9 @@
+require 'spec_helper'
+
+describe 'puppetdb::flatten_java_args'  do
+  it { is_expected.not_to eq(nil) }
+  it { is_expected.to run.with_params.and_return("\"\"") }
+  it { is_expected.to run.with_params({'test' => 1}, {'foo' => 2}).and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params('foo').and_raise_error(ArgumentError) }
+  it { is_expected.to run.with_params({'foo' => 1 }).and_return("\"foo1\"") }
+end