Merge branch 'main' into pdksync_remove_puppet5

Author: pmcmaw

.rubocop.yml

@@ -71,7 +71,6 @@ Style/TrailingCommaInArrayLiteral:
 Style/SymbolArray:
   Description: Using percent style obscures symbolic intent of array's contents.
   EnforcedStyle: brackets
-inherit_from: ".rubocop_todo.yml"
 RSpec/MessageSpies:
   EnforcedStyle: receive
 Style/Documentation:

.rubocop_todo.yml

@@ -1,10 +1,26 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2020-12-17 20:35:36 UTC using RuboCop version 1.6.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 6
+# Configuration parameters: AllowComments.
+Lint/SuppressedException:
+  Exclude:
+    - 'lib/facter/facter_dot_d.rb'
+    - 'lib/puppet/functions/merge.rb'
+    - 'lib/puppet/parser/functions/getvar.rb'
+    - 'lib/puppet/parser/functions/has_interface_with.rb'
+
+# Offense count: 62
+# Configuration parameters: IgnoreSharedExamples.
 RSpec/NamedSubject:
   Enabled: false
-Lint/ScriptPermission:
-  Enabled: false
-Style/HashSyntax:
+
+# Offense count: 2
+RSpec/SubjectStub:
   Exclude:
-  - spec/spec_helper.rb
-  EnforcedStyle: hash_rockets
-Layout/IndentHeredoc:
-  Enabled: false
+    - 'spec/unit/facter/facter_dot_d_spec.rb'

.sync.yml

@@ -2,8 +2,7 @@
 ".gitlab-ci.yml":
   delete: true
 ".rubocop.yml":
-  default_configs:
-    inherit_from: ".rubocop_todo.yml"
+  include_todos: true
 ".travis.yml":
   global_env:
     - HONEYCOMB_WRITEKEY="7f3c63a70eecc61d635917de46bea4e6",HONEYCOMB_DATASET="litmus tests"
@@ -46,16 +45,9 @@ appveyor.yml:
     APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
   simplecov: true
 Gemfile:
-  use_litmus: true
   optional:
     ":development":
     - gem: github_changelog_generator
-      git: https://github.com/skywinder/github-changelog-generator
-      ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
-      condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
-Rakefile:
-  requires:
-  - puppet-lint/tasks/puppet-lint
 spec/spec_helper.rb:
   mock_with: ":rspec"
   coverage_report: true

Rakefile

@@ -7,7 +7,6 @@ require 'puppet-syntax/tasks/puppet-syntax'
 require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
 require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
 require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
-require 'puppet-lint/tasks/puppet-lint'
 
 def changelog_user
   return unless Rake.application.top_level_tasks.include? "changelog"

lib/facter/package_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: package_provider
 #
 # Purpose: Returns the default provider Puppet will choose to manage packages
@@ -15,9 +17,9 @@
   # Instantiates a dummy package resource and return the provider
   setcode do
     if defined? Gem && Gem::Version.new(Facter.value(:puppetversion).split(' ')[0]) >= Gem::Version.new('3.6')
-      Puppet::Type.type(:package).newpackage(:name => 'dummy', :allow_virtual => 'true')[:provider].to_s
+      Puppet::Type.type(:package).newpackage(name: 'dummy', allow_virtual: 'true')[:provider].to_s
     else
-      Puppet::Type.type(:package).newpackage(:name => 'dummy')[:provider].to_s
+      Puppet::Type.type(:package).newpackage(name: 'dummy')[:provider].to_s
     end
   end
 end

lib/facter/pe_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: is_pe, pe_version, pe_major_version, pe_minor_version, pe_patch_version
 #
 # Purpose: Return various facts about the PE state of the system
@@ -38,7 +40,7 @@
 
 # Fact: pe_major_version
 Facter.add('pe_major_version') do
-  confine :is_pe => true
+  confine is_pe: true
   setcode do
     pe_version = Facter.value(:pe_version)
     if pe_version
@@ -49,7 +51,7 @@
 
 # Fact: pe_minor_version
 Facter.add('pe_minor_version') do
-  confine :is_pe => true
+  confine is_pe: true
   setcode do
     pe_version = Facter.value(:pe_version)
     if pe_version
@@ -60,7 +62,7 @@
 
 # Fact: pe_patch_version
 Facter.add('pe_patch_version') do
-  confine :is_pe => true
+  confine is_pe: true
   setcode do
     pe_version = Facter.value(:pe_version)
     if pe_version

lib/facter/puppet_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # These facter facts return the value of the Puppet vardir and environment path
 # settings for the node running puppet or puppet agent.  The intent is to
 # enable Puppet modules to automatically have insight into a place where they

lib/facter/root_home.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 # root_home.rb
 module Facter::Util::RootHome
   # @summary
   #   A facter fact to determine the root home directory.
   #   This varies on PE supported platforms and may be
   #   reconfigured by the end user.
   class << self
-  # determines the root home directory
-  def returnt_root_home
-    root_ent = Facter::Util::Resolution.exec('getent passwd root')
-    # The home directory is the sixth element in the passwd entry
-    # If the platform doesn't have getent, root_ent will be nil and we should
-    # return it straight away.
-    root_ent && root_ent.split(':')[5]
-  end
+    # determines the root home directory
+    def returnt_root_home
+      root_ent = Facter::Util::Resolution.exec('getent passwd root')
+      # The home directory is the sixth element in the passwd entry
+      # If the platform doesn't have getent, root_ent will be nil and we should
+      # return it straight away.
+      root_ent && root_ent.split(':')[5]
+    end
   end
 end
 
@@ -21,7 +23,7 @@ def returnt_root_home
 end
 
 Facter.add(:root_home) do
-  confine :kernel => :darwin
+  confine kernel: :darwin
   setcode do
     str = Facter::Util::Resolution.exec('dscacheutil -q user -a name root')
     hash = {}
@@ -34,12 +36,12 @@ def returnt_root_home
 end
 
 Facter.add(:root_home) do
-  confine :kernel => :aix
+  confine kernel: :aix
   root_home = nil
   setcode do
     str = Facter::Util::Resolution.exec('lsuser -c -a home root')
-    str && str.split("\n").each do |line|
-      next if line =~ %r{^#}
+    str&.split("\n")&.each do |line|
+      next if %r{^#}.match?(line)
       root_home = line.split(%r{:})[1]
     end
     root_home

lib/facter/service_provider.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Fact: service_provider
 #
 # Purpose: Returns the default provider Puppet will choose to manage services
@@ -12,6 +14,6 @@
 
 Facter.add(:service_provider) do
   setcode do
-    Puppet::Type.type(:service).newservice(:name => 'dummy')[:provider].to_s
+    Puppet::Type.type(:service).newservice(name: 'dummy')[:provider].to_s
   end
 end

lib/facter/util/puppet_settings.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # A method to evaluate a Facter code block if puppet is loaded.
 module Facter::Util::PuppetSettings
   # This method is intended to provide a convenient way to evaluate a