facter 4.2.1 → 4.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d82b5638d66725eb654bb71a40be9e8faf9f98ab17200bc3340ec2a88416076
-  data.tar.gz: 2f6d868d28453ddf1fce7ce5cd24efce4365f5f7383980b6857f4771f7e8e22a
+  metadata.gz: 5fa80567c0c01b5ceed0181b78f9e9e813d4eea3c70905733ba1aa5e9298ad15
+  data.tar.gz: 1541ade4a87eacbbaa569c0ace340312dfde0c8299b12cd1973d8861449a798f
 SHA512:
-  metadata.gz: 8a81868164b70e5f172354f3666c2d3c7cb8f8bf52ccbb4b8bd150ce097d771ad6c2df99f43401311d089eac5cb7404c90ec8cc7c2d074c062b7f2a66249be0f
-  data.tar.gz: 7de563f91031e60fd404bd00843f38a73c9782d1b816a997975db71bc0bca4a7302190fbded94559e0b1bc8613c32d950749fd2578b75d1518826d4b09958465
+  metadata.gz: ea3608714cc012b4f64de7f4b472c904152e82387b980d7b3740a318b3b500228dc2e57a41bab27c113d7d6cb9ce8985394d69db2c6ef49d0fd1483b0608b220
+  data.tar.gz: 33f8a676b5a70c964f90f2576e4b1a65d5e2b27c9b2b09edd12145f77da20f303ab295ee3de1998aed74eff967e4765ac0ad48a885a9ffbe175bbda2f6ce3b20

data/LICENSE

@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/lib/facter/custom_facts/core/execution/base.rb

@@ -42,7 +42,7 @@ module Facter
         end
 
         def execute(command, options = {})
-          on_fail, expand, logger, time_limit = extract_options(options)
+          on_fail, expand, logger, timeout = extract_options(options)
 
           expanded_command = if !expand && builtin_command?(command) || logger
                                command
@@ -59,12 +59,12 @@ module Facter
             return on_fail
           end
 
-          out, = execute_command(expanded_command, on_fail, logger, time_limit)
+          out, = execute_command(expanded_command, on_fail, logger, timeout)
           out
         end
 
-        def execute_command(command, on_fail = nil, logger = nil, time_limit = nil)
-          time_limit ||= 300
+        def execute_command(command, on_fail = nil, logger = nil, timeout = nil)
+          timeout ||= 300
           begin
             # Set LC_ALL and LANG to force i18n to C for the duration of this exec;
             # this ensures that any code that parses the
@@ -78,12 +78,12 @@ module Facter
               out_reader = Thread.new { stdout.read }
               err_reader = Thread.new { stderr.read }
               begin
-                Timeout.timeout(time_limit) do
+                Timeout.timeout(timeout) do
                   stdout_messages << out_reader.value
                   stderr_messages << err_reader.value
                 end
               rescue Timeout::Error
-                message = "Timeout encounter after #{time_limit}s, killing process with pid: #{pid}"
+                message = "Timeout encounter after #{timeout}s, killing process with pid: #{pid}"
                 Process.kill('KILL', pid)
                 on_fail == :raise ? (raise StandardError, message) : @log.debug(message)
               ensure
@@ -114,10 +114,15 @@ module Facter
           on_fail = options.fetch(:on_fail, :raise)
           expand = options.fetch(:expand, true)
           logger = options[:logger]
-          time_limit = options[:limit].to_i
-          time_limit = time_limit.positive? ? time_limit : nil
+          timeout = (options[:timeout] || options[:time_limit] || options[:limit]).to_i
+          timeout = timeout.positive? ? timeout : nil
 
-          [on_fail, expand, logger, time_limit]
+          extra_keys = options.keys - %i[on_fail expand logger timeout]
+          unless extra_keys.empty?
+            @log.warn("Unexpected key passed to Facter::Core::Execution.execute option: #{options.keys.join(',')}")
+          end
+
+          [on_fail, expand, logger, timeout]
         end
 
         def log_stderr(msg, command, logger)

data/lib/facter/custom_facts/core/execution.rb

@@ -15,9 +15,9 @@ module Facter
 
       module_function
 
-      # Returns the locations to be searched when looking for a binary. This
-      #   is currently determined by the +PATH+ environment variable plus
-      #   `/sbin` and `/usr/sbin` when run on unix
+      # Returns the locations to be searched when looking for a binary. This is
+      # currently determined by the +PATH+ environment variable plus `/sbin`
+      # and `/usr/sbin` when run on unix
       #
       # @return [Array<String>] The paths to be searched for binaries
       #
@@ -27,8 +27,9 @@ module Facter
       end
 
       # Determines the full path to a binary. If the supplied filename does not
-      #   already describe an absolute path then different locations (determined
-      #   by {search_paths}) will be searched for a match.
+      # already describe an absolute path then different locations (determined
+      # by {search_paths}) will be searched for a match.
+      #
       # @param bin [String] The executable to locate
       #
       # @return [String/nil] The full path to the executable or nil if not
@@ -40,7 +41,8 @@ module Facter
       end
 
       # Determine in a platform-specific way whether a path is absolute. This
-      #   defaults to the local platform if none is specified.
+      # defaults to the local platform if none is specified.
+      #
       # @param path [String] The path to check
 
       # @param platform [:posix/:windows/nil] The platform logic to use
@@ -58,8 +60,9 @@ module Facter
       end
 
       # Given a command line, this returns the command line with the
-      #   executable written as an absolute path. If the executable contains
-      #   spaces, it has to be put in double quotes to be properly recognized.
+      # executable written as an absolute path. If the executable contains
+      # spaces, it has to be put in double quotes to be properly recognized.
+      #
       # @param command [String] the command line
       #
       # @return [String/nil] The command line with the executable's path
@@ -71,8 +74,9 @@ module Facter
       end
 
       # Overrides environment variables within a block of code.  The
-      #   specified values will be set for the duration of the block, after
-      #   which the original values (if any) will be restored.
+      # specified values will be set for the duration of the block, after
+      # which the original values (if any) will be restored.
+      #
       # @param values [Hash<String=>String>] A hash of the environment
       #   variables to override
       #
@@ -84,6 +88,7 @@ module Facter
       end
 
       # Try to execute a command and return the output.
+      #
       # @param command [String] Command to run
       #
       # @return [String/nil] Output of the program, or nil if the command does
@@ -96,16 +101,18 @@ module Facter
       end
 
       # Execute a command and return the output of that program.
+      #
       # @param command [String] Command to run
       #
       # @param options [Hash] Hash with options for the command
       #
-      # Options accepted values :on_fail How to behave when the command could
+      # @option options [Object] :on_fail How to behave when the command could
       #   not be run. Specifying :raise will raise an error, anything else will
       #   return that object on failure. Default is :raise.
-      #   :logger Optional logger used to log the command's stderr.
-      #   :time_limit Optional time out for the specified command. If no time_limit is passed,
-      #   a default of 300 seconds is used.
+      # @option options [Object] :logger Optional logger used to log the
+      #   command's stderr.
+      # @option options :timeout Optional time out for the specified
+      #   command. If no timeout is passed, a default of 300 seconds is used.
       #
       # @raise [Facter::Core::Execution::ExecutionFailure] If the command does
       #   not exist or could not be executed and :on_fail is set to :raise
@@ -119,13 +126,14 @@ module Facter
       end
 
       # Execute a command and return the stdout and stderr of that program.
+      #
       # @param command [String] Command to run
       #
       # @param on_fail[Object] How to behave when the command could
       #   not be run. Specifying :raise will raise an error, anything else will
       #   return that object on failure. Default is :raise.
       # @param logger Optional logger used to log the command's stderr.
-      # @param time_limit Optional time out for the specified command. If no time_limit is passed,
+      # @param timeout Optional time out for the specified command. If no timeout is passed,
       #   a default of 300 seconds is used.
       #
       # @raise [Facter::Core::Execution::ExecutionFailure] If the command does
@@ -135,8 +143,8 @@ module Facter
       #   :on_fail if command execution failed and :on_fail was specified.
       #
       # @api private
-      def execute_command(command, on_fail = nil, logger = nil, time_limit = nil)
-        @@impl.execute_command(command, on_fail, logger, time_limit)
+      def execute_command(command, on_fail = nil, logger = nil, timeout = nil)
+        @@impl.execute_command(command, on_fail, logger, timeout)
       end
 
       class ExecutionFailure < StandardError; end

data/lib/facter/custom_facts/core/file_loader.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'facter/custom_facts/core/logging'
 require 'facter/custom_facts/core/legacy_facter'
 require 'facter/custom_facts/util/fact'
 require 'facter/custom_facts/util/collection'

data/lib/facter/custom_facts/core/legacy_facter.rb

@@ -38,8 +38,6 @@ module LegacyFacter
   include Comparable
   include Enumerable
 
-  extend LegacyFacter::Core::Logging
-
   # module methods
 
   # Accessor for the collection object which holds all the facts

data/lib/facter/custom_facts/core/resolvable.rb

@@ -103,7 +103,7 @@ module LegacyFacter
 
         finishtime = Time.now.to_f
         ms = (finishtime - starttime) * 1000
-        LegacyFacter.show_time format('%<qn>s: %<ms>.2fms', qn: qualified_name, ms: ms)
+        Facter::Log.show_time format('%<qn>s: %<ms>.2fms', qn: qualified_name, ms: ms)
       end
 
       def qualified_name

data/lib/facter/custom_facts/util/collection.rb

@@ -32,7 +32,7 @@ module LegacyFacter
 
         fact
       rescue StandardError => e
-        Facter.log_exception(e, "Unable to add fact #{name}: #{e}")
+        log.log_exception("Unable to add fact #{name}: #{e}")
       end
 
       # Add a resolution mechanism for a named fact.  This does not distinguish
@@ -71,9 +71,7 @@ module LegacyFacter
         # Try HARDER
         internal_loader.load_all unless @facts[name]
 
-        if @facts.empty?
-          LegacyFacter.warnonce("No facts loaded from #{internal_loader.search_path.join(File::PATH_SEPARATOR)}")
-        end
+        log.warnonce("No facts loaded from #{internal_loader.search_path.join(File::PATH_SEPARATOR)}") if @facts.empty?
 
         @facts[name]
       end
@@ -181,6 +179,10 @@ module LegacyFacter
         @external_facts_loaded = true
         external_loader.load(self)
       end
+
+      def log
+        @log ||= Facter::Log.new(self)
+      end
     end
   end
 end

data/lib/facter/custom_facts/util/confine.rb

@@ -41,13 +41,13 @@ module LegacyFacter
           begin
             return !!@block.call
           rescue StandardError => e
-            LegacyFacter.debug "Confine raised #{e.class} #{e}"
+            log.debug "Confine raised #{e.class} #{e}"
             return false
           end
         end
 
         unless (fact = Facter[@fact])
-          LegacyFacter.debug format('No fact for %<fact>s', fact: @fact)
+          log.debug format('No fact for %<fact>s', fact: @fact)
           return false
         end
         value = convert(fact.value)
@@ -58,13 +58,19 @@ module LegacyFacter
           begin
             return !!@block.call(value)
           rescue StandardError => e
-            LegacyFacter.debug "Confine raised #{e.class} #{e}"
+            log.debug "Confine raised #{e.class} #{e}"
             return false
           end
         end
 
         @values.any? { |v| convert(v) === value }
       end
+
+      private
+
+      def log
+        @log ||= Facter::Log.new(self)
+      end
     end
   end
 end

data/lib/facter/custom_facts/util/directory_loader.rb

@@ -52,6 +52,10 @@ module LegacyFacter
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       def load_directory_entries(_collection)
         cm = Facter::CacheManager.new
         facts = []
@@ -87,18 +91,26 @@ module LegacyFacter
           data = resolve_fact(fact, parser)
 
           if data == false
-            LegacyFacter.warn "Could not interpret fact file #{fact.file}"
+            log.warn "Could not interpret fact file #{fact.file}"
           elsif (data == {}) || data.nil?
-            @log.debug("Fact file #{fact.file} was parsed but no key=>value data was returned")
+            log.debug("Fact file #{fact.file} was parsed but no key=>value data was returned")
           else
-            data.each do |p, v|
-              collection.add(p, value: v, fact_type: :external,
-                                file: fact.file) { has_weight(weight) }
-            end
+            add_data(data, collection, fact, weight)
           end
         end
       end
 
+      def add_data(data, collection, fact, weight)
+        data.each do |key, value|
+          collection.add(
+            key,
+            value: value,
+            fact_type: :external,
+            file: fact.file
+          ) { has_weight(weight) }
+        end
+      end
+
       def resolve_fact(fact, parser)
         data = nil
         fact_name = File.basename(fact.file)

data/lib/facter/custom_facts/util/fact.rb

@@ -47,8 +47,6 @@ module Facter
         @used_resolution_weight = 0
 
         @value = nil
-
-        @log = Facter::Log.new(self)
       end
 
       # Adds a new {Facter::Util::Resolution resolution}.  This requires a
@@ -87,8 +85,8 @@ module Facter
 
         resolve
       rescue StandardError => e
-        LegacyFacter
-          .log_exception(e, "Unable to add resolve #{resolution_name.inspect} for fact #{@name}: #{e.message}")
+        log.log_exception("Unable to add resolve #{resolution_name.inspect} for fact #{@name}: #{e.message}")
+        nil
       end
 
       # Retrieve an existing resolution by name
@@ -122,7 +120,7 @@ module Facter
         return @value if @value
 
         if @resolves.empty?
-          LegacyFacter.debug format('No resolves for %<name>s', name: @name)
+          log.debug format('No resolves for %<name>s', name: @name)
           return nil
         end
 
@@ -147,12 +145,16 @@ module Facter
       def extract_ldapname_option!(options)
         return unless options[:ldapname]
 
-        LegacyFacter.warnonce('ldapname is deprecated and will be removed in a future version')
+        log.warnonce('ldapname is deprecated and will be removed in a future version')
         self.ldapname = options.delete(:ldapname)
       end
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       def resolve_value
         return Facter.core_value(name) if @value.nil?
 
@@ -222,18 +224,18 @@ module Facter
 
       def log_fact_path(resolve)
         fact = resolve.fact
-        @log.debug("#{resolve.fact_type} fact #{fact.name} got resolved from: #{fact.location}")
+        log.debug("#{resolve.fact_type} fact #{fact.name} got resolved from: #{fact.location}")
       end
 
       def announce_when_no_suitable_resolution(resolutions)
         return unless resolutions.empty?
 
-        LegacyFacter.debug format('Found no suitable resolves of %<resolver_length> for %<name>s',
-                                  resolver_length: @resolves.length, name: @name)
+        log.debug format('Found no suitable resolves of %<resolver_length> for %<name>s',
+                         resolver_length: @resolves.length, name: @name)
       end
 
       def announce_when_no_value_found(value)
-        LegacyFacter.debug(format('value for %<name>s is still nil', name: @name)) if value.nil?
+        log.debug(format('value for %<name>s is still nil', name: @name)) if value.nil?
       end
 
       def create_or_return_resolution(resolution_name, resolution_type)

data/lib/facter/custom_facts/util/loader.rb

@@ -78,7 +78,7 @@ module LegacyFacter
           if valid_search_path?(path)
             search_paths << path
           else
-            LegacyFacter.warn "Excluding #{path} from search path. Fact file paths must be an absolute directory"
+            log.debug "Excluding #{path} from search path. Fact file paths must be an absolute directory"
           end
         end
 
@@ -89,6 +89,10 @@ module LegacyFacter
 
       private
 
+      def log
+        @log ||= Facter::Log.new(self)
+      end
+
       # Validate that the given path is valid, ie it is an absolute path.
       #
       # @api private
@@ -137,13 +141,13 @@ module LegacyFacter
           # Skip anything that doesn't match our regex.
           next unless name =~ /^facter_?(\w+)$/i
 
-          env_name = Regexp.last_match(1)
+          env_name = Regexp.last_match(1).downcase
 
           # If a fact name was specified, skip anything that doesn't
           # match it.
           next if fact && (env_name != fact)
 
-          LegacyFacter.add(Regexp.last_match(1), fact_type: :external, is_env: true) do
+          LegacyFacter.add(env_name, fact_type: :external, is_env: true) do
             has_weight 1_000_000
             setcode { value }
           end

data/lib/facter/custom_facts/util/parser.rb

@@ -137,11 +137,17 @@ module LegacyFacter
           if LegacyFacter.json?
             JSON.parse(content)
           else
-            LegacyFacter.warnonce "Cannot parse JSON data file #{filename} without the json library."
-            LegacyFacter.warnonce 'Suggested next step is `gem install json` to install the json library.'
+            log.warnonce "Cannot parse JSON data file #{filename} without the json library."
+            log.warnonce 'Suggested next step is `gem install json` to install the json library.'
             nil
           end
         end
+
+        private
+
+        def log
+          @log ||= Facter::Log.new(self)
+        end
       end
 
       register(JsonParser) do |filename|