puppet 8.5.0-universal-darwin → 8.6.0-universal-darwin

data/lib/puppet/file_serving/mount/file.rb

@@ -17,14 +17,14 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   def complete_path(relative_path, node)
     full_path = path(node)
 
-    raise ArgumentError.new(_("Mounts without paths are not usable")) unless full_path
+    raise ArgumentError, _("Mounts without paths are not usable") unless full_path
 
     # If there's no relative path name, then we're serving the mount itself.
     return full_path unless relative_path
 
     file = ::File.join(full_path, relative_path)
 
-    if !(Puppet::FileSystem.exist?(file) or Puppet::FileSystem.symlink?(file))
+    unless Puppet::FileSystem.exist?(file) or Puppet::FileSystem.symlink?(file)
       Puppet.info(_("File does not exist or is not accessible: %{file}") % { file: file })
       return nil
     end
@@ -40,9 +40,9 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   # Return the path as appropriate, expanding as necessary.
   def path(node = nil)
     if expandable?
-      return expand(@path, node)
+      expand(@path, node)
     else
-      return @path
+      @path
     end
   end
 
@@ -72,7 +72,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
   # Verify our configuration is valid.  This should really check to
   # make sure at least someone will be allowed, but, eh.
   def validate
-    raise ArgumentError.new(_("Mounts without paths are not usable")) if @path.nil?
+    raise ArgumentError, _("Mounts without paths are not usable") if @path.nil?
   end
 
   private
@@ -100,7 +100,7 @@ class Puppet::FileServing::Mount::File < Puppet::FileServing::Mount
     end
 
     path.gsub(/%(.)/) do |v|
-      key = $1
+      key = ::Regexp.last_match(1)
       if key == "%"
         "%"
       else

data/lib/puppet/file_serving/mount/locales.rb

@@ -11,15 +11,13 @@ class Puppet::FileServing::Mount::Locales < Puppet::FileServing::Mount
     mod = request.environment.modules.find { |m| m.locale(relative_path) }
     return nil unless mod
 
-    path = mod.locale(relative_path)
-
-    path
+    mod.locale(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on locales - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.locales? }.collect { |mod| mod.locale_directory }
+    paths = request.environment.modules.find_all(&:locales?).collect(&:locale_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount/pluginfacts.rb

@@ -11,15 +11,13 @@ class Puppet::FileServing::Mount::PluginFacts < Puppet::FileServing::Mount
     mod = request.environment.modules.find { |m| m.pluginfact(relative_path) }
     return nil unless mod
 
-    path = mod.pluginfact(relative_path)
-
-    path
+    mod.pluginfact(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on plugins - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.pluginfacts? }.collect { |mod| mod.plugin_fact_directory }
+    paths = request.environment.modules.find_all(&:pluginfacts?).collect(&:plugin_fact_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount/plugins.rb

@@ -11,15 +11,13 @@ class Puppet::FileServing::Mount::Plugins < Puppet::FileServing::Mount
     mod = request.environment.modules.find { |m| m.plugin(relative_path) }
     return nil unless mod
 
-    path = mod.plugin(relative_path)
-
-    path
+    mod.plugin(relative_path)
   end
 
   def search(relative_path, request)
     # We currently only support one kind of search on plugins - return
     # them all.
-    paths = request.environment.modules.find_all { |mod| mod.plugins? }.collect { |mod| mod.plugin_directory }
+    paths = request.environment.modules.find_all(&:plugins?).collect(&:plugin_directory)
     if paths.empty?
       # If the modulepath is valid then we still need to return a valid root
       # directory for the search, but make sure nothing inside it is

data/lib/puppet/file_serving/mount.rb

@@ -18,7 +18,7 @@ class Puppet::FileServing::Mount
 
   # Create our object.  It must have a name.
   def initialize(name)
-    unless name =~ %r{^[-\w]+$}
+    unless name =~ /^[-\w]+$/
       raise ArgumentError, _("Invalid mount name format '%{name}'") % { name: name }
     end
 

data/lib/puppet/file_system/file_impl.rb

@@ -52,7 +52,7 @@ class Puppet::FileSystem::FileImpl
   def exclusive_open(path, mode, options = 'r', timeout = 300, &block)
     wait = 0.001 + (Kernel.rand / 1000)
     written = false
-    while !written
+    until written
       ::File.open(path, options, mode) do |rf|
         if rf.flock(::File::LOCK_EX | ::File::LOCK_NB)
           Puppet.debug { _("Locked '%{path}'") % { path: path } }
@@ -163,9 +163,9 @@ class Puppet::FileSystem::FileImpl
       stat = lstat(path)
       gid = stat.gid
       uid = stat.uid
-      mode ||= stat.mode & 07777
+      mode ||= stat.mode & 0o7777
     rescue Errno::ENOENT
-      mode ||= 0640
+      mode ||= 0o640
     end
 
     tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(path), Puppet::FileSystem.dir_string(path))

data/lib/puppet/file_system/memory_impl.rb

@@ -74,7 +74,7 @@ class Puppet::FileSystem::MemoryImpl
     if block_given?
       yield handle
     else
-      return handle
+      handle
     end
   end
 

data/lib/puppet/file_system/path_pattern.rb

@@ -8,7 +8,7 @@ module Puppet::FileSystem
     class InvalidPattern < Puppet::Error; end
 
     DOTDOT = '..'
-    ABSOLUTE_UNIX = /^\//
+    ABSOLUTE_UNIX = %r{^/}
     ABSOLUTE_WINDOWS = /^[a-z]:/i
     CURRENT_DRIVE_RELATIVE_WINDOWS = /^\\/
 

data/lib/puppet/file_system/uniquefile.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'English'
 require_relative '../../puppet/file_system'
 require 'delegate'
 require 'tmpdir'
@@ -29,7 +30,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   def initialize(basename, *rest)
     create_tmpname(basename, *rest) do |tmpname, _n, opts|
       mode = File::RDWR | File::CREAT | File::EXCL
-      perm = 0600
+      perm = 0o600
       if opts
         mode |= opts.delete(:mode) || 0
         opts[:perm] = perm
@@ -57,11 +58,9 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def _close
-    begin
-      @tmpfile.close if @tmpfile
-    ensure
-      @tmpfile = nil
-    end
+    @tmpfile.close if @tmpfile
+  ensure
+    @tmpfile = nil
   end
   protected :_close
 
@@ -112,7 +111,7 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
       raise ArgumentError, _("unexpected prefix_suffix: %{value}") % { value: prefix_suffix.inspect }
     end
     t = Time.now.strftime("%Y%m%d")
-    path = "#{prefix}#{t}-#{$$}-#{rand(0x100000000).to_s(36)}"
+    path = "#{prefix}#{t}-#{$PROCESS_ID}-#{rand(0x100000000).to_s(36)}"
     path << "-#{n}" if n
     path << suffix
   end
@@ -142,11 +141,9 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
   end
 
   def try_convert_to_hash(h)
-    begin
-      h.to_hash
-    rescue NoMethodError
-      nil
-    end
+    h.to_hash
+  rescue NoMethodError
+    nil
   end
 
   @@systmpdir ||= defined?(Etc.systmpdir) ? Etc.systmpdir : '/tmp'
@@ -155,10 +152,14 @@ class Puppet::FileSystem::Uniquefile < DelegateClass(File)
     tmp = '.'
     [ENV.fetch('TMPDIR', nil), ENV.fetch('TMP', nil), ENV.fetch('TEMP', nil), @@systmpdir, '/tmp'].each do |dir|
       stat = File.stat(dir) if dir
-      if stat && stat.directory? && stat.writable?
-        tmp = dir
-        break
-      end rescue nil
+      begin
+        if stat && stat.directory? && stat.writable?
+          tmp = dir
+          break
+        end
+      rescue
+        nil
+      end
     end
     File.expand_path(tmp)
   end

data/lib/puppet/file_system/windows.rb

@@ -11,7 +11,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     # PUP-6959 mode is explicitly ignored until it can be implemented
     # Ruby on Windows uses mode for setting file attributes like read-only and
     # archived, not for setting permissions like POSIX
-    raise TypeError.new('mode must be specified as an Integer') if mode && !mode.is_a?(Numeric)
+    raise TypeError, 'mode must be specified as an Integer' if mode && !mode.is_a?(Numeric)
 
     ::File.open(path, options, nil, &block)
   end
@@ -20,7 +20,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     # ensure `nil` values behave like underlying File.expand_path
     string_path = ::File.expand_path(path.nil? ? nil : path_string(path), dir_string)
     # if no tildes, nothing to expand, no need to call Windows API, return original string
-    return string_path if !string_path.index('~')
+    return string_path unless string_path.index('~')
 
     begin
       # no need to do existence check up front as GetLongPathName implies that check is performed
@@ -28,15 +28,15 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
       string_path = Puppet::Util::Windows::File.get_long_pathname(string_path)
     rescue Puppet::Util::Windows::Error => e
       # preserve original File.expand_path behavior for file / path not found by returning string
-      raise if (e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
-        e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND)
+      raise if e.code != Puppet::Util::Windows::File::ERROR_FILE_NOT_FOUND &&
+               e.code != Puppet::Util::Windows::File::ERROR_PATH_NOT_FOUND
     end
 
     string_path
   end
 
   def exist?(path)
-    return Puppet::Util::Windows::File.exist?(path)
+    Puppet::Util::Windows::File.exist?(path)
   end
 
   def symlink(path, dest, options = {})
@@ -61,7 +61,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def symlink?(path)
-    return false if !Puppet.features.manages_symlinks?
+    return false unless Puppet.features.manages_symlinks?
 
     Puppet::Util::Windows::File.symlink?(path)
   end
@@ -72,22 +72,30 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def unlink(*file_names)
-    if !Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       return ::File.unlink(*file_names)
     end
 
     file_names.each do |file_name|
       file_name = file_name.to_s # handle PathName
-      stat = Puppet::Util::Windows::File.stat(file_name) rescue nil
+      stat = begin
+        Puppet::Util::Windows::File.stat(file_name)
+      rescue
+        nil
+      end
 
       # sigh, Ruby + Windows :(
       if !stat
-        ::File.unlink(file_name) rescue Dir.rmdir(file_name)
+        begin
+          ::File.unlink(file_name)
+        rescue
+          Dir.rmdir(file_name)
+        end
       elsif stat.ftype == 'directory'
         if Puppet::Util::Windows::File.symlink?(file_name)
           Dir.rmdir(file_name)
         else
-          raise Errno::EPERM.new(file_name)
+          raise Errno::EPERM, file_name
         end
       else
         ::File.unlink(file_name)
@@ -102,7 +110,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def lstat(path)
-    if !Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       return Puppet::Util::Windows::File.stat(path)
     end
 
@@ -133,14 +141,14 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     end
 
     current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_user_name)
-    current_sid = Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name) unless current_sid
+    current_sid ||= Puppet::Util::Windows::SID.name_to_sid(Puppet::Util::Windows::ADSI::User.current_sam_compatible_user_name)
 
     dacl = case mode
-           when 0644
+           when 0o644
              dacl = secure_dacl(current_sid)
              dacl.allow(Puppet::Util::Windows::SID::BuiltinUsers, FILE_READ)
              dacl
-           when 0660, 0640, 0600, 0440
+           when 0o660, 0o640, 0o600, 0o440
              secure_dacl(current_sid)
            when nil
              get_dacl_from_file(path) || secure_dacl(current_sid)
@@ -172,7 +180,7 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
     when ACCESS_DENIED, SHARING_VIOLATION, LOCK_VIOLATION
       raise Errno::EACCES.new(path_string(path), e)
     else
-      raise SystemCallError.new(e.message)
+      raise SystemCallError, e.message
     end
   end
 
@@ -204,12 +212,12 @@ class Puppet::FileSystem::Windows < Puppet::FileSystem::Posix
   end
 
   def raise_if_symlinks_unsupported
-    if !Puppet.features.manages_symlinks?
+    unless Puppet.features.manages_symlinks?
       msg = _("This version of Windows does not support symlinks.  Windows Vista / 2008 or higher is required.")
-      raise Puppet::Util::Windows::Error.new(msg)
+      raise Puppet::Util::Windows::Error, msg
     end
 
-    if !Puppet::Util::Windows::Process.process_privilege_symlink?
+    unless Puppet::Util::Windows::Process.process_privilege_symlink?
       Puppet.warning _("The current user does not have the necessary permission to manage symlinks.")
     end
   end

data/lib/puppet/forge/cache.rb

@@ -38,12 +38,12 @@ class Puppet::Forge
 
     # Return contents of file at the given URI's +uri+.
     def read_retrieve(uri)
-      return uri.read
+      uri.read
     end
 
     # Return Pathname for repository's cache directory, create it if needed.
     def path
-      (self.class.base_path + @repository.cache_key).tap { |o| o.mkpath }
+      (self.class.base_path + @repository.cache_key).tap(&:mkpath)
     end
 
     # Return the base Pathname for all the caches.

data/lib/puppet/forge/errors.rb

@@ -13,7 +13,7 @@ module Puppet::Forge::Errors
     #
     # @return [String] the multiline version of the error message
     def multiline
-      self.message
+      message
     end
   end
 

data/lib/puppet/forge/repository.rb

@@ -69,7 +69,7 @@ class Puppet::Forge
     # repository at +release+ (e.g. "myuser-mymodule").
     def retrieve(release)
       path = @host.chomp('/') + release
-      return cache.retrieve(path)
+      cache.retrieve(path)
     end
 
     # Return the URI string for this repository.
@@ -80,7 +80,7 @@ class Puppet::Forge
     # Return the cache key for this repository, this a hashed string based on
     # the URI.
     def cache_key
-      return @cache_key ||= [
+      @cache_key ||= [
         @host.to_s.gsub(/[^[:alnum:]]+/, '_').sub(/_$/, ''),
         Digest::SHA1.hexdigest(@host.to_s)
       ].join('-').freeze

data/lib/puppet/forge.rb

@@ -114,7 +114,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       uri = decode_uri(response['pagination']['next'])
     end
 
-    return releases
+    releases
   end
 
   def make_http_request(*args)
@@ -134,13 +134,11 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       if meta['dependencies']
         dependencies = meta['dependencies'].collect do |dep|
-          begin
-            Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
-            Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
-          rescue ArgumentError => e
-            raise ArgumentError, _("Malformed dependency: %{name}.") % { name: dep['name'] } +
-                                 ' ' + _("Exception was: %{detail}") % { detail: e }
-          end
+          Puppet::ModuleTool::Metadata.new.add_dependency(dep['name'], dep['version_requirement'], dep['repository'])
+          Puppet::ModuleTool.parse_module_dependency(release, dep)[0..1]
+        rescue ArgumentError => e
+          raise ArgumentError, _("Malformed dependency: %{name}.") % { name: dep['name'] } +
+                               ' ' + _("Exception was: %{detail}") % { detail: e }
         end
       else
         dependencies = []
@@ -150,7 +148,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def install(dir)
-      staging_dir = self.prepare
+      staging_dir = prepare
 
       module_dir = dir + name[/-(.*)/, 1]
       module_dir.rmtree if module_dir.exist?
@@ -163,7 +161,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       # Return the Pathname object representing the directory where the
       # module release archive was unpacked the to.
-      return module_dir
+      module_dir
     ensure
       staging_dir.rmtree if staging_dir.exist?
     end
@@ -202,9 +200,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def tmpfile
-      @file ||= Tempfile.new(name, Puppet::Forge::Cache.base_path).tap do |f|
-        f.binmode
-      end
+      @file ||= Tempfile.new(name, Puppet::Forge::Cache.base_path).tap(&:binmode)
     end
     # rubocop:enable Naming/MemoizedInstanceVariableName
 
@@ -227,15 +223,13 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
     end
 
     def unpack(file, destination)
-      begin
-        Puppet::ModuleTool::Applications::Unpacker.unpack(file.path, destination)
-      rescue Puppet::ExecutionFailure => e
-        raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
-      end
+      Puppet::ModuleTool::Applications::Unpacker.unpack(file.path, destination)
+    rescue Puppet::ExecutionFailure => e
+      raise RuntimeError, _("Could not extract contents of module archive: %{message}") % { message: e.message }
     end
 
     def deprecated?
-      @data['module'] && (@data['module']['deprecated_at'] != nil)
+      @data['module'] && !@data['module']['deprecated_at'].nil?
     end
   end
 

data/lib/puppet/functions/abs.rb

@@ -53,9 +53,9 @@ Puppet::Functions.create_function(:abs) do
     # version of this function.
     #
     case x
-    when %r{^-?(?:\d+)(?:\.\d+){1}$}
+    when /^-?(?:\d+)(?:\.\d+){1}$/
       x.to_f.abs
-    when %r{^-?\d+$}
+    when /^-?\d+$/
       x.to_i.abs
     else
       raise(ArgumentError, 'abs(): Requires float or integer to work with - was given non decimal string')

data/lib/puppet/functions/camelcase.rb

@@ -49,7 +49,7 @@ Puppet::Functions.create_function(:camelcase) do
   end
 
   def on_string(s)
-    s.split('_').map { |x| x.capitalize }.join('')
+    s.split('_').map(&:capitalize).join('')
   end
 
   def on_iterable(a)

data/lib/puppet/functions/compare.rb

@@ -98,7 +98,7 @@ Puppet::Functions.create_function(:compare) do
   end
 
   def on_error(a, b, *ignore_case)
-    if !ignore_case.empty?
+    unless ignore_case.empty?
       unless a.is_a?(String) && b.is_a?(String)
         # TRANSLATORS 'compare' is a name
         return _("compare(): The third argument (ignore case) can only be used when comparing strings")
@@ -115,7 +115,7 @@ Puppet::Functions.create_function(:compare) do
 
     if a.class != b.class
       # TRANSLATORS 'compare' is a name
-      return _("compare(): Can only compare values of the same type (or for Timestamp/Timespan also against Numeric). Got %{type_a} and %{type_b}") % {
+      _("compare(): Can only compare values of the same type (or for Timestamp/Timespan also against Numeric). Got %{type_a} and %{type_b}") % {
         type_a: type_label(a), type_b: type_label(b)
       }
     end

data/lib/puppet/functions/contain.rb

@@ -48,7 +48,7 @@ Puppet::Functions.create_function(:contain, Puppet::Functions::InternalFunction)
     # This is the same as calling the include function but faster and does not rely on the include
     # function.
     (scope.compiler.evaluate_classes(classes, scope, false) || []).each do |resource|
-      if !scope.catalog.edge?(containing_resource, resource)
+      unless scope.catalog.edge?(containing_resource, resource)
         scope.catalog.add_edge(containing_resource, resource)
       end
     end

data/lib/puppet/functions/defined.rb

@@ -101,7 +101,7 @@
 # @since 3.8.1 type specific requests with future parser
 # @since 4.0.0
 #
-Puppet::Functions.create_function(:'defined', Puppet::Functions::InternalFunction) do
+Puppet::Functions.create_function(:defined, Puppet::Functions::InternalFunction) do
   dispatch :is_defined do
     scope_param
     required_repeated_param 'Variant[String, Type[CatalogEntry], Type[Type[CatalogEntry]]]', :vals
@@ -112,7 +112,7 @@ Puppet::Functions.create_function(:'defined', Puppet::Functions::InternalFunctio
       case val
       when String
         if val =~ /^\$(.+)$/
-          scope.exist?($1)
+          scope.exist?(Regexp.last_match(1))
         else
           case val
           when ''

data/lib/puppet/functions/dig.rb

@@ -40,7 +40,7 @@ Puppet::Functions.create_function(:dig) do
     args.reduce(data) do |d, k|
       return nil if d.nil? || k.nil?
 
-      if !(d.is_a?(Array) || d.is_a?(Hash))
+      unless d.is_a?(Array) || d.is_a?(Hash)
         t = Puppet::Pops::Types::TypeCalculator.infer(d)
         msg = _("The given data does not contain a Collection at %{walked_path}, got '%{type}'") % { walked_path: walked_path, type: t }
         error_data = Puppet::DataTypes::Error.new(

data/lib/puppet/functions/eyaml_lookup_key.rb

@@ -47,21 +47,19 @@ Puppet::Functions.create_function(:eyaml_lookup_key) do
   def load_data_hash(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
-        if data.is_a?(Hash)
-          Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
-        else
-          msg = _("%{path}: file does not contain a valid yaml hash") % { path: path }
-          raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
+      data = Puppet::Util::Yaml.safe_load(content, [Symbol], path)
+      if data.is_a?(Hash)
+        Puppet::Pops::Lookup::HieraConfig.symkeys_to_string(data)
+      else
+        msg = _("%{path}: file does not contain a valid yaml hash") % { path: path }
+        raise Puppet::DataBinding::LookupError, msg if Puppet[:strict] == :error && data != false
 
-          Puppet.warning(msg)
-          {}
-        end
-      rescue Puppet::Util::Yaml::YamlLoadError => ex
-        # YamlLoadErrors include the absolute path to the file, so no need to add that
-        raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
+        Puppet.warning(msg)
+        {}
       end
+    rescue Puppet::Util::Yaml::YamlLoadError => ex
+      # YamlLoadErrors include the absolute path to the file, so no need to add that
+      raise Puppet::DataBinding::LookupError, _("Unable to parse %{message}") % { message: ex.message }
     end
   end
 

data/lib/puppet/functions/get.rb

@@ -138,7 +138,7 @@ Puppet::Functions.create_function(:get, Puppet::Functions::InternalFunction) do
 
     begin
       result = call_function('dig', value, *segments)
-      return result.nil? ? default_value : result
+      result.nil? ? default_value : result
     rescue Puppet::ErrorWithData => e
       if block_given?
         yield(e.error_data)

data/lib/puppet/functions/hocon_data.rb

@@ -29,11 +29,9 @@ Puppet::Functions.create_function(:hocon_data) do
   def hocon_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        Hocon.parse(content)
-      rescue Hocon::ConfigError => ex
-        raise Puppet::DataBinding::LookupError, _("Unable to parse (%{path}): %{message}") % { path: path, message: ex.message }
-      end
+      Hocon.parse(content)
+    rescue Hocon::ConfigError => ex
+      raise Puppet::DataBinding::LookupError, _("Unable to parse (%{path}): %{message}") % { path: path, message: ex.message }
     end
   end
 

data/lib/puppet/functions/import.rb

@@ -4,6 +4,6 @@
 #
 Puppet::Functions.create_function(:import) do
   def import(*args)
-    raise Puppet::Pops::SemanticError.new(Puppet::Pops::Issues::DISCONTINUED_IMPORT)
+    raise Puppet::Pops::SemanticError, Puppet::Pops::Issues::DISCONTINUED_IMPORT
   end
 end

data/lib/puppet/functions/json_data.rb

@@ -20,12 +20,10 @@ Puppet::Functions.create_function(:json_data) do
   def json_data(options, context)
     path = options['path']
     context.cached_file_data(path) do |content|
-      begin
-        Puppet::Util::Json.load(content)
-      rescue Puppet::Util::Json::ParseError => ex
-        # Filename not included in message, so we add it here.
-        raise Puppet::DataBinding::LookupError, "Unable to parse (%{path}): %{message}" % { path: path, message: ex.message }
-      end
+      Puppet::Util::Json.load(content)
+    rescue Puppet::Util::Json::ParseError => ex
+      # Filename not included in message, so we add it here.
+      raise Puppet::DataBinding::LookupError, "Unable to parse (%{path}): %{message}" % { path: path, message: ex.message }
     end
   end