facter 4.0.51 → 4.2.1

data/lib/facter/facts/sles/lsbdistid.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Sles
+    class Lsbdistid
+      FACT_NAME = 'lsbdistid'
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy)
+      end
+    end
+  end
+end

data/lib/facter/facts/sles/os/distro/codename.rb

@@ -6,13 +6,12 @@ module Facts
       module Distro
         class Codename
           FACT_NAME = 'os.distro.codename'
-          ALIASES = 'lsbdistcodename'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:codename)
+            fact_value = Facter::Resolvers::OsRelease.resolve(:version_codename)
+            fact_value = 'n/a' if !fact_value || fact_value.empty?
 
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facter/facts/sles/os/distro/description.rb

@@ -6,13 +6,10 @@ module Facts
       module Distro
         class Description
           FACT_NAME = 'os.distro.description'
-          ALIASES = 'lsbdistdescription'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:description)
-
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            fact_value = Facter::Resolvers::OsRelease.resolve(:pretty_name)
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facter/facts/sles/os/distro/id.rb

@@ -6,13 +6,14 @@ module Facts
       module Distro
         class Id
           FACT_NAME = 'os.distro.id'
-          ALIASES = 'lsbdistid'
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:distributor_id)
-
-            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
-             Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+            fact_value = if Facter::Resolvers::OsRelease.resolve(:version_id).start_with?('12')
+                           'SUSE LINUX'
+                         else
+                           'SUSE'
+                         end
+            Facter::ResolvedFact.new(FACT_NAME, fact_value)
           end
         end
       end

data/lib/facter/facts/sles/os/distro/release.rb

@@ -9,20 +9,25 @@ module Facts
           ALIASES = %w[lsbdistrelease lsbmajdistrelease lsbminordistrelease].freeze
 
           def call_the_resolver
-            fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
-            return Facter::ResolvedFact.new(FACT_NAME, nil) unless fact_value
+            version = Facter::Resolvers::OsRelease.resolve(:version_id)
+            fact_value = build_fact_list(version)
 
-            versions = fact_value.split('.')
-            release = {
-              'full' => fact_value,
-              'major' => versions[0],
-              'minor' => versions[1]
-            }
+            [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+             Facter::ResolvedFact.new(ALIASES[0], fact_value[:full], :legacy),
+             Facter::ResolvedFact.new(ALIASES[1], fact_value[:major], :legacy),
+             Facter::ResolvedFact.new(ALIASES[2], fact_value[:minor], :legacy)]
+          end
 
-            [Facter::ResolvedFact.new(FACT_NAME, release),
-             Facter::ResolvedFact.new(ALIASES[0], fact_value, :legacy),
-             Facter::ResolvedFact.new(ALIASES[1], versions[0], :legacy),
-             Facter::ResolvedFact.new(ALIASES[2], versions[1], :legacy)]
+          def build_fact_list(version)
+            if version.include?('.')
+              {
+                full: version,
+                major: version.split('.').first,
+                minor: version.split('.').last
+              }
+            else
+              { full: version, major: version, minor: nil }
+            end
           end
         end
       end

data/lib/facter/facts/solaris/hypervisors/ldom.rb

@@ -17,7 +17,7 @@ module Facts
           fact_value = %i[
             chassis_serial control_domain domain_name
             domain_uuid role_control role_io role_root role_service
-          ].map! { |key| [key, Facter::Resolvers::Solaris::Ldom.resolve(key)] }.to_h
+          ].map! { |key| [key, Facter::Utils.try_to_bool(Facter::Resolvers::Solaris::Ldom.resolve(key))] }.to_h
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/solaris/hypervisors/zone.rb

@@ -27,7 +27,7 @@ module Facts
 
           {
             brand: current_zone[:brand],
-            id: current_zone[:id],
+            id: Facter::Utils.try_to_int(current_zone[:id]),
             ip_type: current_zone[:iptype],
             name: current_zone[:name],
             uuid: current_zone[:uuid]

data/lib/facter/facts/solaris/mountpoints.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'mountpoints'
 
       def call_the_resolver
-        mountpoints = Facter::Resolvers::Mountpoints.resolve(FACT_NAME.to_sym)
+        mountpoints = Facter::Resolvers::Solaris::Mountpoints.resolve(FACT_NAME.to_sym)
         return Facter::ResolvedFact.new(FACT_NAME, nil) unless mountpoints
 
         fact = {}

data/lib/facter/facts/solaris/processors/cores.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Processors.resolve(:cores_per_socket)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/solaris/processors/threads.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Solaris::Processors.resolve(:threads_per_core)
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/ubuntu/lsbdistrelease.rb

@@ -15,8 +15,8 @@ module Facts
         version = fact_value.split('.')
 
         [Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy),
-         Facter::ResolvedFact.new(ALIASES[0], version[0], :legacy),
-         Facter::ResolvedFact.new(ALIASES[1], version[1], :legacy)]
+         Facter::ResolvedFact.new(ALIASES[0], "#{version[0]}.#{version[1]}", :legacy),
+         Facter::ResolvedFact.new(ALIASES[1], version[2], :legacy)]
       end
     end
   end

data/lib/facter/facts/windows/az_metadata.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class AzMetadata
+      FACT_NAME = 'az_metadata'
+
+      def call_the_resolver
+        return Facter::ResolvedFact.new(FACT_NAME, nil) unless azure_hypervisor?
+
+        fact_value = Facter::Resolvers::Az.resolve(:metadata)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value&.empty? ? nil : fact_value)
+      end
+
+      private
+
+      def azure_hypervisor?
+        Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'hyperv'
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/cloud/provider.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module Cloud
+      class Provider
+        FACT_NAME = 'cloud.provider'
+
+        def call_the_resolver
+          virtual = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
+          provider = case virtual
+                     when 'hyperv'
+                       'azure' unless Facter::Resolvers::Az.resolve(:metadata).empty?
+                     end
+
+          Facter::ResolvedFact.new(FACT_NAME, provider)
+        end
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/ec2_metadata.rb

@@ -16,7 +16,7 @@ module Facts
       private
 
       def aws_hypervisors?
-        virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
+        virtual = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
 
         virtual == 'kvm' || virtual =~ /xen/
       end

data/lib/facter/facts/windows/ec2_userdata.rb

@@ -16,7 +16,7 @@ module Facts
       private
 
       def aws_hypervisors?
-        virtual = Facter::Resolvers::Virtualization.resolve(:virtual)
+        virtual = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
 
         virtual == 'kvm' || virtual =~ /xen/
       end

data/lib/facter/facts/windows/gce.rb

@@ -6,7 +6,7 @@ module Facts
       FACT_NAME = 'gce'
 
       def call_the_resolver
-        virtualization = Facter::Resolvers::Virtualization.resolve(:virtual)
+        virtualization = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
 
         fact_value = virtualization&.include?('gce') ? Facter::Resolvers::Gce.resolve(:metadata) : nil
         Facter::ResolvedFact.new(FACT_NAME, fact_value)

data/lib/facter/facts/windows/hypervisors/hyperv.rb

@@ -15,7 +15,7 @@ module Facts
         private
 
         def hyperv?
-          Facter::Resolvers::Virtualization.resolve(:virtual) == 'hyperv' ||
+          Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'hyperv' ||
             Facter::Resolvers::DMIBios.resolve(:manufacturer).include?('Microsoft')
         end
       end

data/lib/facter/facts/windows/hypervisors/kvm.rb

@@ -17,7 +17,8 @@ module Facts
         def kvm?
           product_name = Facter::Resolvers::DMIComputerSystem.resolve(:name)
 
-          (Facter::Resolvers::Virtualization.resolve(:virtual) == 'kvm' || Facter::Resolvers::NetKVM.resolve(:kvm)) &&
+          (Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'kvm' ||
+           Facter::Resolvers::NetKVM.resolve(:kvm)) &&
             product_name != 'VirtualBox' && !product_name.match(/^Parallels/)
         end
 

data/lib/facter/facts/windows/hypervisors/virtualbox.rb

@@ -15,12 +15,12 @@ module Facts
         private
 
         def virtualbox?
-          Facter::Resolvers::Virtualization.resolve(:virtual) == 'virtualbox' ||
+          Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'virtualbox' ||
             Facter::Resolvers::DMIComputerSystem.resolve(:name) == 'VirtualBox'
         end
 
         def populate_version_and_revision
-          oem_strings = Facter::Resolvers::Virtualization.resolve(:oem_strings)
+          oem_strings = Facter::Resolvers::Windows::Virtualization.resolve(:oem_strings)
           return unless oem_strings
 
           version = revision = ''

data/lib/facter/facts/windows/hypervisors/vmware.rb

@@ -15,7 +15,7 @@ module Facts
         private
 
         def vmware?
-          Facter::Resolvers::Virtualization.resolve(:virtual) == 'vmware' ||
+          Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'vmware' ||
             Facter::Resolvers::DMIBios.resolve(:manufacturer) == 'VMware, Inc.'
         end
       end

data/lib/facter/facts/windows/hypervisors/xen.rb

@@ -7,7 +7,9 @@ module Facts
         FACT_NAME = 'hypervisors.xen'
 
         def call_the_resolver
-          fact_value = { context: hvm? ? 'hvm' : 'pv' } if Facter::Resolvers::Virtualization.resolve(:virtual) == 'xen'
+          if Facter::Resolvers::Windows::Virtualization.resolve(:virtual) == 'xen'
+            fact_value = { context: hvm? ? 'hvm' : 'pv' }
+          end
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/is_virtual.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class IsVirtual
+      FACT_NAME = 'is_virtual'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Windows::Virtualization.resolve(:is_virtual)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/facts/windows/{virtualization/is_virtual.rb → processors/cores.rb}

@@ -2,12 +2,12 @@
 
 module Facts
   module Windows
-    module Virtualization
-      class IsVirtual
-        FACT_NAME = 'is_virtual'
+    module Processors
+      class Cores
+        FACT_NAME = 'processors.cores'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Virtualization.resolve(:is_virtual)
+          fact_value = Facter::Resolvers::Processors.resolve(:cores_per_socket)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/{virtualization/virtual.rb → processors/threads.rb}

@@ -2,12 +2,12 @@
 
 module Facts
   module Windows
-    module Virtualization
-      class Virtual
-        FACT_NAME = 'virtual'
+    module Processors
+      class Threads
+        FACT_NAME = 'processors.threads'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Virtualization.resolve(:virtual)
+          fact_value = Facter::Resolvers::Processors.resolve(:threads_per_core)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facter/facts/windows/virtual.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    class Virtual
+      FACT_NAME = 'virtual'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Windows::Virtualization.resolve(:virtual)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facter/framework/cli/cli.rb

@@ -97,6 +97,11 @@ module Facter
                  type: :boolean,
                  desc: 'Resolve facts sequentially'
 
+    class_option :puppet,
+                 type: :boolean,
+                 aliases: '-p',
+                 desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
+
     desc '--man', 'Display manual.', hide: true
     map ['--man'] => :man
     def man(*args)
@@ -111,6 +116,7 @@ module Facter
 
     desc 'query', 'Default method', hide: true
     def query(*args)
+      Facter.puppet_facts if options[:puppet]
       output, status = Facter.to_user_output(@options, *args)
       puts output
 
@@ -126,7 +132,7 @@ module Facter
       Facter.values(@options, args)
     end
 
-    desc '--version, -v', 'Print the version', hide: true
+    desc '--version, -v', 'Print the version'
     map ['--version', '-v'] => :version
     def version(*_args)
       puts Facter::VERSION
@@ -134,9 +140,9 @@ module Facter
 
     desc '--list-block-groups', 'List block groups'
     map ['--list-block-groups'] => :list_block_groups
-    def list_block_groups(*args)
+    def list_block_groups
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
-      Facter::Options.init_from_cli(options, args)
+      Facter::Options.init_from_cli(options)
 
       block_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
       block_groups.gsub!(/:\s*\n/, "\n")
@@ -146,9 +152,9 @@ module Facter
 
     desc '--list-cache-groups', 'List cache groups'
     map ['--list-cache-groups'] => :list_cache_groups
-    def list_cache_groups(*args)
+    def list_cache_groups
       options = @options.map { |(k, v)| [k.to_sym, v] }.to_h
-      Facter::Options.init_from_cli(options, args)
+      Facter::Options.init_from_cli(options)
 
       cache_groups = Facter::FactGroups.new.groups.to_yaml.lines[1..-1].join
       cache_groups.gsub!(/:\s*\n/, "\n")
@@ -156,19 +162,7 @@ module Facter
       puts cache_groups
     end
 
-    desc '--puppet, -p', '(NOT SUPPORTED)Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
-    map ['--puppet', '-p'] => :puppet
-    def puppet(*args)
-      Facter.puppet_facts
-
-      output, status = Facter.to_user_output(@options, *args)
-      puts output
-
-      status = 1 if Facter::Log.errors?
-      exit status
-    end
-
-    desc 'help', 'Help for all arguments'
+    desc '--help, -h', 'Help for all arguments'
     def help(*args)
       help_string = +''
       help_string << help_header(args)
@@ -205,7 +199,11 @@ module Facter
         Cli.commands
            .select { |_k, command_class| command_class.instance_of?(Thor::Command) }
            .each do |_k, command|
-          help_command_options << build_option(command['name'], [], command['description'])
+          help_command_options << build_option(
+            command['name'],
+            [command['usage'].split(',')[1]],
+            command['description']
+          )
         end
 
         help_command_options