facter 4.0.9.pre → 4.0.10.pre

data/lib/facts/solaris/augeas/version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Augeas
+      class Version
+        FACT_NAME = 'augeas.version'
+        ALIASES = 'augeasversion'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/solaris/filesystems.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Filesystems
+      FACT_NAME = 'filesystems'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Solaris::Filesystem.resolve(:file_systems)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/solaris/identity/user.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module Identity
+      class User
+        FACT_NAME = 'identity.user'
+        ALIASES = 'id'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::PosxIdentity.resolve(:user)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/solaris/os/hardware.rb

@@ -5,10 +5,12 @@ module Facts
     module Os
       class Hardware
         FACT_NAME = 'os.hardware'
+        ALIASES = 'hardwaremodel'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Uname.resolve(:machine)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facts/solaris/puppet_version.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class PuppetVersion
+      FACT_NAME = 'puppetversion'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::PuppetVersionResolver.resolve(:puppetversion)
+
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/solaris/ruby/platform.rb

@@ -5,10 +5,12 @@ module Facts
     module Ruby
       class Platform
         FACT_NAME = 'ruby.platform'
+        ALIASES = 'rubyplatform'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Ruby.resolve(:platform)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facts/solaris/ruby/sitedir.rb

@@ -5,10 +5,11 @@ module Facts
     module Ruby
       class Sitedir
         FACT_NAME = 'ruby.sitedir'
+        ALIASES = 'rubysitedir'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::Ruby.resolve(:sitedir)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facts/solaris/solaris_zones/current.rb

@@ -5,10 +5,12 @@ module Facts
     module SolarisZones
       class Current
         FACT_NAME = 'solaris_zones.current'
+        ALIASES = 'zonename'
 
         def call_the_resolver
           fact_value = Facter::Resolvers::SolarisZoneName.resolve(:current_zone_name)
-          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value), Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
         end
       end
     end

data/lib/facts/solaris/solaris_zones/zone.rb

@@ -5,21 +5,54 @@ module Facts
     module SolarisZones
       class Zone
         FACT_NAME = 'solaris_zones.zones'
+        ALIASES = %w[
+          zone_.*_brand
+          zone_.*_iptype
+          zone_.*_name
+          zone_.*_uuid
+          zone_.*_id
+          zone_.*_path
+          zone_.*_status
+          zones
+        ].freeze
 
         def call_the_resolver
+          resolved_facts = []
+          zones = {}
+
           results = Facter::Resolvers::SolarisZone.resolve(:zone)
-          zones_fact = {}
           results&.each do |result|
-            fact_value = { result[:name].to_sym => {
+            zones.merge!(parse_result(result))
+            resolved_facts << create_legacy_zone_facts(result)
+          end
+
+          resolved_facts << Facter::ResolvedFact.new('solaris_zones.zones', zones)
+          resolved_facts << Facter::ResolvedFact.new('zones', results.count, :legacy)
+
+          resolved_facts.flatten
+        end
+
+        private
+
+        def parse_result(result)
+          {
+            result[:name].to_sym => {
               brand: result[:brand],
               id: result[:id],
-              ip_type: result[:ip_type],
+              ip_type: result[:iptype],
               path: result[:path],
               status: result[:status]
-            } }
-            zones_fact.merge!(fact_value)
+            }
+          }
+        end
+
+        def create_legacy_zone_facts(zone)
+          legacy_facts = []
+          %w[brand iptype name uuid id path status].each do |key|
+            legacy_facts << Facter::ResolvedFact.new("zone_#{zone[:name]}_#{key}", zone[key.to_sym], :legacy)
           end
-          Facter::ResolvedFact.new(FACT_NAME, zones_fact)
+
+          legacy_facts
         end
       end
     end

data/lib/facts/solaris/ssh.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Ssh
+      FACT_NAME = 'ssh'
+
+      def call_the_resolver
+        result = Facter::Resolvers::SshResolver.resolve(:ssh)
+        ssh_facts = {}
+        result.each { |ssh| ssh_facts.merge!(create_ssh_fact(ssh)) }
+        Facter::ResolvedFact.new(FACT_NAME, ssh_facts)
+      end
+
+      private
+
+      def create_ssh_fact(ssh)
+        { ssh.name.to_sym =>
+              { fingerprints: { sha1: ssh.fingerprint.sha1,
+                                sha256: ssh.fingerprint.sha256 },
+                key: ssh.key,
+                type: ssh.type } }
+      end
+    end
+  end
+end

data/lib/facts/solaris/system_uptime/days.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module SystemUptime
+      class Days
+        FACT_NAME = 'system_uptime.days'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uptime.resolve(:days)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facts/solaris/system_uptime/hours.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module SystemUptime
+      class Hours
+        FACT_NAME = 'system_uptime.hours'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uptime.resolve(:hours)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facts/{debian/system_uptime/minutes.rb → solaris/system_uptime/seconds.rb}

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Facts
-  module Debian
+  module Solaris
     module SystemUptime
-      class Minutes
-        FACT_NAME = 'system_uptime.minutes'
+      class Seconds
+        FACT_NAME = 'system_uptime.seconds'
 
         def call_the_resolver
-          fact_value = Facter::Resolvers::Uptime.resolve(:minutes)
+          fact_value = Facter::Resolvers::Uptime.resolve(:seconds)
 
           Facter::ResolvedFact.new(FACT_NAME, fact_value)
         end

data/lib/facts/solaris/system_uptime/uptime.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    module SystemUptime
+      class Uptime
+        FACT_NAME = 'system_uptime.uptime'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Uptime.resolve(:uptime)
+
+          Facter::ResolvedFact.new(FACT_NAME, fact_value)
+        end
+      end
+    end
+  end
+end

data/lib/facts/solaris/timezone.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Facts
+  module Solaris
+    class Timezone
+      FACT_NAME = 'timezone'
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::Timezone.resolve(:timezone)
+        Facter::ResolvedFact.new(FACT_NAME, fact_value)
+      end
+    end
+  end
+end

data/lib/facts/windows/augeas/version.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Facts
+  module Windows
+    module Augeas
+      class Version
+        FACT_NAME = 'augeas.version'
+        ALIASES = 'augeasversion'
+
+        def call_the_resolver
+          fact_value = Facter::Resolvers::Augeas.resolve(:augeas_version)
+
+          [Facter::ResolvedFact.new(FACT_NAME, fact_value),
+           Facter::ResolvedFact.new(ALIASES, fact_value, :legacy)]
+        end
+      end
+    end
+  end
+end

data/lib/facts/windows/puppet_version.rb

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

data/lib/facts_utils/bytes_converter.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Facter
+  module FactsUtils
+    class BytesConverter
+      class << self
+        def to_mb(value_in_bytes)
+          (value_in_bytes / (1024.0 * 1024.0)).round(2)
+        rescue NoMethodError
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/framework/config/block_list.rb

@@ -27,7 +27,7 @@ module Facter
     private
 
     def load_block_groups
-      @block_groups = File.exist?(@block_groups_file_path) ? Hocon.load(@block_groups_file_path) : {}
+      @block_groups = File.readable?(@block_groups_file_path) ? Hocon.load(@block_groups_file_path) : {}
       options = Options.instance
       @block_list = ConfigReader.new(options[:config]).block_list || {}
     end

data/lib/framework/config/config_reader.rb

@@ -26,7 +26,7 @@ module Facter
     end
 
     def refresh_config
-      @conf = File.exist?(@config_file_path) ? Hocon.load(@config_file_path) : {}
+      @conf = File.readable?(@config_file_path) ? Hocon.load(@config_file_path) : {}
     end
 
     private

data/lib/framework/core/fact/external/external_fact_manager.rb

@@ -18,7 +18,7 @@ module Facter
 
       custom_facts.each do |custom_fact|
         fact_value = LegacyFacter.value(custom_fact.name)
-        resolved_fact = ResolvedFact.new(custom_fact.name, fact_value)
+        resolved_fact = ResolvedFact.new(custom_fact.name, fact_value, :custom)
         resolved_fact.filter_tokens = []
         resolved_fact.user_query = custom_fact.user_query
 

data/lib/framework/core/fact_loaders/external_fact_loader.rb

@@ -3,7 +3,7 @@
 module Facter
   class ExternalFactLoader
     def custom_facts
-      @custom_facts ||= load_custom_facts
+      @custom_facts = load_custom_facts
     end
 
     def external_facts

data/lib/framework/core/fact_manager.rb

@@ -11,6 +11,11 @@ module Facter
       @log = Log.new(self)
     end
 
+    def searched_facts(user_query = [])
+      loaded_facts = @fact_loader.load(Options.get)
+      QueryParser.parse(user_query, loaded_facts)
+    end
+
     def resolve_facts(user_query = [])
       loaded_facts = @fact_loader.load(Options.get)
       searched_facts = QueryParser.parse(user_query, loaded_facts)

data/lib/framework/logging/logger.rb

@@ -40,7 +40,16 @@ module Facter
     end
 
     def determine_callers_name(sender_self)
-      @class_name = sender_self.class.name != 'Class' ? sender_self.class.name : sender_self.name
+      @class_name = case sender_self
+                    when String
+                      sender_self
+                    when Class
+                      sender_self.name
+                    when Module
+                      sender_self.name
+                    else # when class is singleton
+                      sender_self.class.name
+                    end
     end
 
     def set_format_for_file_logger

data/lib/models/fact_collection.rb

@@ -8,12 +8,20 @@ module Facter
 
     def build_fact_collection!(facts)
       facts.each do |fact|
-        bury(*fact.name.split('.') + fact.filter_tokens << fact.value) unless fact.value.nil?
+        next if fact.type == :core && fact.value.nil?
+
+        bury_fact(fact)
       end
 
       self
     end
 
+    def value(*keys)
+      keys.reduce(self) do |memo, key|
+        memo.fetch(key.to_s)
+      end
+    end
+
     def bury(*args)
       raise ArgumentError, '2 or more arguments required' if args.count < 2
 
@@ -27,5 +35,11 @@ module Facter
 
       self
     end
+
+    private
+
+    def bury_fact(fact)
+      bury(*fact.name.split('.') + fact.filter_tokens << fact.value)
+    end
   end
 end