diff --git a/lib/facter/splunk_version.rb b/lib/facter/splunk_version.rb index f5596ef2..747f9ddb 100755 --- a/lib/facter/splunk_version.rb +++ b/lib/facter/splunk_version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Facter.add(:splunk_version) do setcode do value = nil diff --git a/lib/facter/splunkforwarder_version.rb b/lib/facter/splunkforwarder_version.rb index 3a90e169..fd3e7fbe 100755 --- a/lib/facter/splunkforwarder_version.rb +++ b/lib/facter/splunkforwarder_version.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Facter.add(:splunkforwarder_version) do setcode do value = nil diff --git a/lib/puppet/provider/ini_setting/splunk.rb b/lib/puppet/provider/ini_setting/splunk.rb index c29043a1..d04c3ea5 100644 --- a/lib/puppet/provider/ini_setting/splunk.rb +++ b/lib/puppet/provider/ini_setting/splunk.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:ini_setting).provide( :splunk, parent: Puppet::Type.type(:ini_setting).provider(:ruby) diff --git a/lib/puppet/provider/splunk_alert_actions/ini_setting.rb b/lib/puppet/provider/splunk_alert_actions/ini_setting.rb index 21899697..965f89a0 100644 --- a/lib/puppet/provider/splunk_alert_actions/ini_setting.rb +++ b/lib/puppet/provider/splunk_alert_actions/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_alert_actions).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_authentication/ini_setting.rb b/lib/puppet/provider/splunk_authentication/ini_setting.rb index 4767564a..afbfe029 100644 --- a/lib/puppet/provider/splunk_authentication/ini_setting.rb +++ b/lib/puppet/provider/splunk_authentication/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_authentication).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_authorize/ini_setting.rb b/lib/puppet/provider/splunk_authorize/ini_setting.rb index 104b8f50..3371e02a 100644 --- a/lib/puppet/provider/splunk_authorize/ini_setting.rb +++ b/lib/puppet/provider/splunk_authorize/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_authorize).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_deploymentclient/ini_setting.rb b/lib/puppet/provider/splunk_deploymentclient/ini_setting.rb index 90bf9c25..9d5ecec2 100644 --- a/lib/puppet/provider/splunk_deploymentclient/ini_setting.rb +++ b/lib/puppet/provider/splunk_deploymentclient/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_deploymentclient).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_distsearch/ini_setting.rb b/lib/puppet/provider/splunk_distsearch/ini_setting.rb index e9ee9cf5..e04e5fa5 100644 --- a/lib/puppet/provider/splunk_distsearch/ini_setting.rb +++ b/lib/puppet/provider/splunk_distsearch/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_distsearch).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_indexes/ini_setting.rb b/lib/puppet/provider/splunk_indexes/ini_setting.rb index edeefdc7..46e8dfad 100644 --- a/lib/puppet/provider/splunk_indexes/ini_setting.rb +++ b/lib/puppet/provider/splunk_indexes/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_indexes).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_input/ini_setting.rb b/lib/puppet/provider/splunk_input/ini_setting.rb index b8203404..6119c40e 100644 --- a/lib/puppet/provider/splunk_input/ini_setting.rb +++ b/lib/puppet/provider/splunk_input/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_input).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_limits/ini_setting.rb b/lib/puppet/provider/splunk_limits/ini_setting.rb index 2b1ea79f..552908ae 100644 --- a/lib/puppet/provider/splunk_limits/ini_setting.rb +++ b/lib/puppet/provider/splunk_limits/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_limits).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_metadata/ini_setting.rb b/lib/puppet/provider/splunk_metadata/ini_setting.rb index d96cbbd9..8453ff76 100644 --- a/lib/puppet/provider/splunk_metadata/ini_setting.rb +++ b/lib/puppet/provider/splunk_metadata/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'puppet/util/ini_file' class SectionNoGlobal < Puppet::Util::IniFile::Section @@ -44,7 +46,7 @@ def file_path # {app/foo,system}/{default,local} -> {app/foo,system}/metadata/{default,local}.meta ctxelem = File.split(context) if %w[local default].include?(ctxelem[-1]) - file_name = ctxelem[-1] + '.meta' + file_name = "#{ctxelem[-1]}.meta" context = File.join(ctxelem[0..-2], 'metadata') end diff --git a/lib/puppet/provider/splunk_output/ini_setting.rb b/lib/puppet/provider/splunk_output/ini_setting.rb index f5959686..1ff7e758 100644 --- a/lib/puppet/provider/splunk_output/ini_setting.rb +++ b/lib/puppet/provider/splunk_output/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_output).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_props/ini_setting.rb b/lib/puppet/provider/splunk_props/ini_setting.rb index 86edd22c..2fc65f11 100644 --- a/lib/puppet/provider/splunk_props/ini_setting.rb +++ b/lib/puppet/provider/splunk_props/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_props).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_server/ini_setting.rb b/lib/puppet/provider/splunk_server/ini_setting.rb index 43c12205..4beab3f0 100644 --- a/lib/puppet/provider/splunk_server/ini_setting.rb +++ b/lib/puppet/provider/splunk_server/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_server).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_serverclass/ini_setting.rb b/lib/puppet/provider/splunk_serverclass/ini_setting.rb index 17996045..1954b9d1 100644 --- a/lib/puppet/provider/splunk_serverclass/ini_setting.rb +++ b/lib/puppet/provider/splunk_serverclass/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_serverclass).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_transforms/ini_setting.rb b/lib/puppet/provider/splunk_transforms/ini_setting.rb index 1dc0086a..87eed3df 100644 --- a/lib/puppet/provider/splunk_transforms/ini_setting.rb +++ b/lib/puppet/provider/splunk_transforms/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_transforms).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_uiprefs/ini_setting.rb b/lib/puppet/provider/splunk_uiprefs/ini_setting.rb index 1430dfa7..e7166e14 100644 --- a/lib/puppet/provider/splunk_uiprefs/ini_setting.rb +++ b/lib/puppet/provider/splunk_uiprefs/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_uiprefs).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunk_web/ini_setting.rb b/lib/puppet/provider/splunk_web/ini_setting.rb index f70f7f3c..a24c2cb9 100644 --- a/lib/puppet/provider/splunk_web/ini_setting.rb +++ b/lib/puppet/provider/splunk_web/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunk_web).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_deploymentclient/ini_setting.rb b/lib/puppet/provider/splunkforwarder_deploymentclient/ini_setting.rb index c8470622..1a202b3f 100644 --- a/lib/puppet/provider/splunkforwarder_deploymentclient/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_deploymentclient/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_deploymentclient).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_input/ini_setting.rb b/lib/puppet/provider/splunkforwarder_input/ini_setting.rb index 74fabd8f..110b000d 100644 --- a/lib/puppet/provider/splunkforwarder_input/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_input/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_input).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_limits/ini_setting.rb b/lib/puppet/provider/splunkforwarder_limits/ini_setting.rb index 42c3e731..7d2c8fa4 100644 --- a/lib/puppet/provider/splunkforwarder_limits/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_limits/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_limits).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_output/ini_setting.rb b/lib/puppet/provider/splunkforwarder_output/ini_setting.rb index ae46e175..3df85802 100644 --- a/lib/puppet/provider/splunkforwarder_output/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_output/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_output).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_props/ini_setting.rb b/lib/puppet/provider/splunkforwarder_props/ini_setting.rb index d8cb0558..19fb45c1 100644 --- a/lib/puppet/provider/splunkforwarder_props/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_props/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_props).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_server/ini_setting.rb b/lib/puppet/provider/splunkforwarder_server/ini_setting.rb index 88917452..a544a614 100644 --- a/lib/puppet/provider/splunkforwarder_server/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_server/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_server).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_transforms/ini_setting.rb b/lib/puppet/provider/splunkforwarder_transforms/ini_setting.rb index 8b127000..5069ff10 100644 --- a/lib/puppet/provider/splunkforwarder_transforms/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_transforms/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_transforms).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/provider/splunkforwarder_web/ini_setting.rb b/lib/puppet/provider/splunkforwarder_web/ini_setting.rb index 88d4ec32..0f235502 100644 --- a/lib/puppet/provider/splunkforwarder_web/ini_setting.rb +++ b/lib/puppet/provider/splunkforwarder_web/ini_setting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + Puppet::Type.type(:splunkforwarder_web).provide( :ini_setting, parent: Puppet::Type.type(:ini_setting).provider(:splunk) diff --git a/lib/puppet/type/splunk_alert_actions.rb b/lib/puppet/type/splunk_alert_actions.rb index 76a017c6..ca526221 100644 --- a/lib/puppet/type/splunk_alert_actions.rb +++ b/lib/puppet/type/splunk_alert_actions.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_alert_actions) do diff --git a/lib/puppet/type/splunk_authentication.rb b/lib/puppet/type/splunk_authentication.rb index 4b81ac00..e70f8026 100644 --- a/lib/puppet/type/splunk_authentication.rb +++ b/lib/puppet/type/splunk_authentication.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_authentication) do diff --git a/lib/puppet/type/splunk_authorize.rb b/lib/puppet/type/splunk_authorize.rb index c2c2c2c2..1fa9a5d1 100644 --- a/lib/puppet/type/splunk_authorize.rb +++ b/lib/puppet/type/splunk_authorize.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_authorize) do diff --git a/lib/puppet/type/splunk_config.rb b/lib/puppet/type/splunk_config.rb index 776d6945..f9ce37b9 100644 --- a/lib/puppet/type/splunk_config.rb +++ b/lib/puppet/type/splunk_config.rb @@ -1,5 +1,7 @@ +# frozen_string_literal: true + # Require all of our types so the class names are resolvable for purging -Dir[File.dirname(__FILE__) + '/splunk*.rb'].each do |file| +Dir["#{File.dirname(__FILE__)}/splunk*.rb"].sort.each do |file| require file unless file == __FILE__ end @@ -156,7 +158,7 @@ def purge_splunk_resources_in_context(type_class, context) catalog_resources = catalog.resources.select { |r| r.is_a?(type_class) && r[:context] == context } Puppet.debug "Found #{catalog_resources.size} #{type_class} resources in context #{context}" catalog_resources.each do |res| - puppet_resources << (res[:section] + '/' + res[:setting]) + puppet_resources << ("#{res[:section]}/#{res[:setting]}") end # Search the configured instances of the class type and purge them if diff --git a/lib/puppet/type/splunk_deploymentclient.rb b/lib/puppet/type/splunk_deploymentclient.rb index 8bb567ab..294afa05 100644 --- a/lib/puppet/type/splunk_deploymentclient.rb +++ b/lib/puppet/type/splunk_deploymentclient.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_deploymentclient) do diff --git a/lib/puppet/type/splunk_distsearch.rb b/lib/puppet/type/splunk_distsearch.rb index 27c8c7b2..a65e48d5 100644 --- a/lib/puppet/type/splunk_distsearch.rb +++ b/lib/puppet/type/splunk_distsearch.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_distsearch) do diff --git a/lib/puppet/type/splunk_indexes.rb b/lib/puppet/type/splunk_indexes.rb index 90607a68..196f6e27 100644 --- a/lib/puppet/type/splunk_indexes.rb +++ b/lib/puppet/type/splunk_indexes.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_indexes) do diff --git a/lib/puppet/type/splunk_input.rb b/lib/puppet/type/splunk_input.rb index 5c2f1861..57ec0417 100644 --- a/lib/puppet/type/splunk_input.rb +++ b/lib/puppet/type/splunk_input.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_input) do diff --git a/lib/puppet/type/splunk_limits.rb b/lib/puppet/type/splunk_limits.rb index 29fb7c69..664beacf 100644 --- a/lib/puppet/type/splunk_limits.rb +++ b/lib/puppet/type/splunk_limits.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_limits) do diff --git a/lib/puppet/type/splunk_metadata.rb b/lib/puppet/type/splunk_metadata.rb index c90c347f..285bf553 100644 --- a/lib/puppet/type/splunk_metadata.rb +++ b/lib/puppet/type/splunk_metadata.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_metadata) do diff --git a/lib/puppet/type/splunk_output.rb b/lib/puppet/type/splunk_output.rb index ab2b9658..76a58e90 100644 --- a/lib/puppet/type/splunk_output.rb +++ b/lib/puppet/type/splunk_output.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_output) do diff --git a/lib/puppet/type/splunk_props.rb b/lib/puppet/type/splunk_props.rb index db1ce094..7db6340b 100644 --- a/lib/puppet/type/splunk_props.rb +++ b/lib/puppet/type/splunk_props.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_props) do diff --git a/lib/puppet/type/splunk_server.rb b/lib/puppet/type/splunk_server.rb index ece5b5c1..1367ff9d 100644 --- a/lib/puppet/type/splunk_server.rb +++ b/lib/puppet/type/splunk_server.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_server) do diff --git a/lib/puppet/type/splunk_serverclass.rb b/lib/puppet/type/splunk_serverclass.rb index 0b58cd58..b91dbd0d 100644 --- a/lib/puppet/type/splunk_serverclass.rb +++ b/lib/puppet/type/splunk_serverclass.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_serverclass) do diff --git a/lib/puppet/type/splunk_transforms.rb b/lib/puppet/type/splunk_transforms.rb index 6a1f01a8..62fdeb67 100644 --- a/lib/puppet/type/splunk_transforms.rb +++ b/lib/puppet/type/splunk_transforms.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_transforms) do diff --git a/lib/puppet/type/splunk_uiprefs.rb b/lib/puppet/type/splunk_uiprefs.rb index c8aa5e54..453abc5c 100644 --- a/lib/puppet/type/splunk_uiprefs.rb +++ b/lib/puppet/type/splunk_uiprefs.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_uiprefs) do diff --git a/lib/puppet/type/splunk_web.rb b/lib/puppet/type/splunk_web.rb index 9d28a830..b4bdb365 100644 --- a/lib/puppet/type/splunk_web.rb +++ b/lib/puppet/type/splunk_web.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunk_web) do diff --git a/lib/puppet/type/splunkforwarder_deploymentclient.rb b/lib/puppet/type/splunkforwarder_deploymentclient.rb index 0893074d..f3e312cf 100644 --- a/lib/puppet/type/splunkforwarder_deploymentclient.rb +++ b/lib/puppet/type/splunkforwarder_deploymentclient.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_deploymentclient) do diff --git a/lib/puppet/type/splunkforwarder_input.rb b/lib/puppet/type/splunkforwarder_input.rb index 2a6a1871..1bc4e243 100644 --- a/lib/puppet/type/splunkforwarder_input.rb +++ b/lib/puppet/type/splunkforwarder_input.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_input) do diff --git a/lib/puppet/type/splunkforwarder_limits.rb b/lib/puppet/type/splunkforwarder_limits.rb index 95371bf3..8721e4ea 100644 --- a/lib/puppet/type/splunkforwarder_limits.rb +++ b/lib/puppet/type/splunkforwarder_limits.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_limits) do diff --git a/lib/puppet/type/splunkforwarder_output.rb b/lib/puppet/type/splunkforwarder_output.rb index 66e31f70..2d65c2d9 100644 --- a/lib/puppet/type/splunkforwarder_output.rb +++ b/lib/puppet/type/splunkforwarder_output.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_output) do diff --git a/lib/puppet/type/splunkforwarder_props.rb b/lib/puppet/type/splunkforwarder_props.rb index 60af3d23..b873ee5e 100644 --- a/lib/puppet/type/splunkforwarder_props.rb +++ b/lib/puppet/type/splunkforwarder_props.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_props) do diff --git a/lib/puppet/type/splunkforwarder_server.rb b/lib/puppet/type/splunkforwarder_server.rb index c643d608..d6b3ba78 100644 --- a/lib/puppet/type/splunkforwarder_server.rb +++ b/lib/puppet/type/splunkforwarder_server.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_server) do diff --git a/lib/puppet/type/splunkforwarder_transforms.rb b/lib/puppet/type/splunkforwarder_transforms.rb index 9cd72aa7..8e49a1c4 100644 --- a/lib/puppet/type/splunkforwarder_transforms.rb +++ b/lib/puppet/type/splunkforwarder_transforms.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_transforms) do diff --git a/lib/puppet/type/splunkforwarder_web.rb b/lib/puppet/type/splunkforwarder_web.rb index e1632b11..97966459 100644 --- a/lib/puppet/type/splunkforwarder_web.rb +++ b/lib/puppet/type/splunkforwarder_web.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'puppet_x/puppetlabs/splunk/type') Puppet::Type.newtype(:splunkforwarder_web) do diff --git a/lib/puppet_x/puppetlabs/splunk/type.rb b/lib/puppet_x/puppetlabs/splunk/type.rb index 506679f9..c1f3641c 100644 --- a/lib/puppet_x/puppetlabs/splunk/type.rb +++ b/lib/puppet_x/puppetlabs/splunk/type.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require File.join(File.dirname(__FILE__), '..', '..', 'voxpupuli/splunk/util') module PuppetX @@ -9,7 +11,7 @@ def self.clone_type(type) type.define_singleton_method(:title_patterns) do [ - [%r{^([^/]*)$}, [[:section]]], # matches section titles without slashes, like 'tcpout:indexers' + [%r{^([^/]*)$}, [[:section]]], # matches section titles without slashes, like 'tcpout:indexers' [%r{^(.*//.*)/(.*)$}, # matches section titles containing '//' and a setting, [ # like: 'monitor:///var/log/messages/index' [:section], # where 'monitor:///var/log/messages' is the section diff --git a/lib/puppet_x/voxpupuli/splunk/util.rb b/lib/puppet_x/voxpupuli/splunk/util.rb index 14d065c3..1d828877 100644 --- a/lib/puppet_x/voxpupuli/splunk/util.rb +++ b/lib/puppet_x/voxpupuli/splunk/util.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'openssl' require 'base64' @@ -11,7 +13,7 @@ def self.decrypt(secrets_file, value) Puppet.debug "Decrypting splunk >= 7.2 data using secret from #{secrets_file}" value.slice!(0, 3) data = Base64.strict_decode64(value) - splunk_secret = IO.binread(secrets_file).chomp + splunk_secret = File.binread(secrets_file).chomp iv = data.bytes[0, 16].pack('c*') tag = data.bytes[-16..-1].pack('c*') diff --git a/spec/acceptance/splunk_enterprise_spec.rb b/spec/acceptance/splunk_enterprise_spec.rb index 0c3e5158..66372b8d 100644 --- a/spec/acceptance/splunk_enterprise_spec.rb +++ b/spec/acceptance/splunk_enterprise_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper_acceptance' describe 'splunk enterprise class' do diff --git a/spec/acceptance/splunk_forwarder_spec.rb b/spec/acceptance/splunk_forwarder_spec.rb index a4911ceb..feff4e47 100644 --- a/spec/acceptance/splunk_forwarder_spec.rb +++ b/spec/acceptance/splunk_forwarder_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper_acceptance' describe 'splunk::forwarder class' do diff --git a/spec/classes/enterprise_spec.rb b/spec/classes/enterprise_spec.rb index bae00f19..b06e2fbd 100644 --- a/spec/classes/enterprise_spec.rb +++ b/spec/classes/enterprise_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' shared_examples_for 'splunk enterprise nix defaults' do diff --git a/spec/classes/forwarder_spec.rb b/spec/classes/forwarder_spec.rb index 4c24af28..9fbcc0bc 100644 --- a/spec/classes/forwarder_spec.rb +++ b/spec/classes/forwarder_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' shared_examples_for 'splunk forwarder' do diff --git a/spec/classes/splunk_spec.rb b/spec/classes/splunk_spec.rb index c05c42c5..31ed175a 100644 --- a/spec/classes/splunk_spec.rb +++ b/spec/classes/splunk_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'splunk' do diff --git a/spec/defines/addon_spec.rb b/spec/defines/addon_spec.rb index de0a3f32..096a485f 100644 --- a/spec/defines/addon_spec.rb +++ b/spec/defines/addon_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'splunk::addon' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 69c72a82..3f981eb8 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -18,4 +18,4 @@ require 'splunk_data' -$LOAD_PATH.unshift File.dirname(__FILE__) + '/fixtures/modules/inifile/lib' +$LOAD_PATH.unshift "#{File.dirname(__FILE__)}/fixtures/modules/inifile/lib" diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index 349400b2..707feaae 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'voxpupuli/acceptance/spec_helper_acceptance' require 'splunk_data' diff --git a/spec/splunk_data.rb b/spec/splunk_data.rb index 43de3d04..8f3711c4 100644 --- a/spec/splunk_data.rb +++ b/spec/splunk_data.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + SPLUNK_SERVER_TYPES = { splunk_alert_actions: 'alert_actions.conf', splunk_authentication: 'authentication.conf', diff --git a/spec/unit/facter/splunk_version_spec.rb b/spec/unit/facter/splunk_version_spec.rb index aabd8a69..a4634114 100644 --- a/spec/unit/facter/splunk_version_spec.rb +++ b/spec/unit/facter/splunk_version_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'splunk_version Fact' do diff --git a/spec/unit/facter/splunkforwarder_version_spec.rb b/spec/unit/facter/splunkforwarder_version_spec.rb index b3bc72a0..028196be 100644 --- a/spec/unit/facter/splunkforwarder_version_spec.rb +++ b/spec/unit/facter/splunkforwarder_version_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe 'splunkforwarder_version Fact' do diff --git a/spec/unit/puppet/type/splunk_config_spec.rb b/spec/unit/puppet/type/splunk_config_spec.rb index 5ebfdffd..f4621eb1 100644 --- a/spec/unit/puppet/type/splunk_config_spec.rb +++ b/spec/unit/puppet/type/splunk_config_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' describe Puppet::Type.type(:splunk_config) do diff --git a/spec/unit/puppet/type/splunk_types_spec.rb b/spec/unit/puppet/type/splunk_types_spec.rb index 2c861d0b..a5d62d2c 100644 --- a/spec/unit/puppet/type/splunk_types_spec.rb +++ b/spec/unit/puppet/type/splunk_types_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' # The majority of splunk and splunkforwarder types are identical and inherit # the same functionality off ini_file, so we don't need individual tests for them diff --git a/spec/unit/puppet_x/voxpupuli/splunk/util_spec.rb b/spec/unit/puppet_x/voxpupuli/splunk/util_spec.rb index 46704891..b932b527 100644 --- a/spec/unit/puppet_x/voxpupuli/splunk/util_spec.rb +++ b/spec/unit/puppet_x/voxpupuli/splunk/util_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + require 'spec_helper' require 'puppet_x/voxpupuli/splunk/util'