facter 2.5.6 → 2.5.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e4538088004cbcac0680166bcac1523021be9732a956a608fdfe7ab95e320eec
-  data.tar.gz: 49e50390a5b7760ec839ee9a907c863ce06f966552ab5be562d4a616f51e6ac5
+  metadata.gz: b34bbe982e5dffe7309cf07118c0f911502f6cbbdf3f642889dcd391eee35732
+  data.tar.gz: 78e7f350f3d0e03a58f72d752f7c405fa3c29c11942ee0bb939afe02a770d386
 SHA512:
-  metadata.gz: 80f92f1943f78cd483746d0262e67a92c597b38276a4664a610cb4e4a75f0fa88428faf902e7009c1fb5f3c0e1a3c2645b2129b9b3efb694396ae3eab65981fc
-  data.tar.gz: 71258f517b4a3ce7be3cc650b7db6e28cd6c9aed88b9804c75cd26623837d86bdc545e93713e6e6440c77afacb64c09efb1fd41c79c40871b961de296d909cc1
+  metadata.gz: 488694e5c051c68dd9cc7c4e8f741246bc971bdcd69dbbfcdbf134e2b83c6717411e70f48a422e9ff870392250cb461b0f310a5fa4a48647c2b5a189eaae4470
+  data.tar.gz: 487424cfc01da49bc1ef6d35e86c869ca83b16d4c1f765c31a6777ee16ba0e3de498f4c7f2af6fa241f29809cd3e3ec5c7a392ebe6f7e2ee7f110a5c34fb252f

data/lib/facter/ec2.rb

@@ -20,7 +20,7 @@ require 'facter/ec2/rest' unless defined?(Facter::EC2)
 Facter.define_fact(:ec2_metadata) do
   define_resolution(:rest) do
     confine do
-      Facter.value(:virtual).match /^(xen|kvm)/
+      Facter.value(:virtual).match /^(xen|kvm|nitro|ec2)/
     end
 
     @querier = Facter::EC2::Metadata.new
@@ -37,7 +37,7 @@ end
 Facter.define_fact(:ec2_userdata) do
   define_resolution(:rest) do
     confine do
-      Facter.value(:virtual).match /^(xen|kvm)/
+      Facter.value(:virtual).match /^(xen|kvm|nitro|ec2)/
     end
 
     @querier = Facter::EC2::Userdata.new

data/lib/facter/gce/metadata.rb

@@ -17,7 +17,7 @@ module Facter
         Timeout::Error,
       ]
 
-      METADATA_URL = "http://metadata/computeMetadata/v1beta1/?recursive=true&alt=json"
+      METADATA_URL = "http://metadata/computeMetadata/v1/?recursive=true&alt=json"
 
       def initialize(url = METADATA_URL)
         @url = url
@@ -45,7 +45,7 @@ module Facter
 
         begin
           Timeout.timeout(timeout) do
-            body = open(@url, :proxy => nil).read
+            body = open(@url, options={:proxy => nil, "Metadata-Flavor" => "Google"}).read
           end
         rescue *CONNECTION_ERRORS => e
           attempts = attempts + 1

data/lib/facter/util/ip.rb

@@ -163,7 +163,7 @@ module Facter::Util::IP
       ifconfig_output = Facter::Util::IP.ifconfig_interface(interface)
       if interface =~ /^ib/ then
         real_mac_address = get_infiniband_macaddress(interface)
-        output = ifconfig_output.sub(%r{(?:ether|HWaddr)\s+((\w{1,2}:){5,}\w{1,2})}, "HWaddr #{real_mac_address}")
+        output = ifconfig_output.sub(%r{(?:ether|HWaddr|infiniband)\s+((\w{1,2}:){5,}\w{1,2})}, "HWaddr #{real_mac_address}")
       else
         output = ifconfig_output
       end

data/lib/facter/util/virtual.rb

@@ -106,6 +106,10 @@ module Facter::Util::Virtual
     end
   end
 
+  def self.ec2?
+    File.read("/sys/devices/virtual/dmi/id/bios_vendor") =~ /Amazon EC2/ rescue false
+  end
+
   def self.kvm?
      txt = if FileTest.exists?("/proc/cpuinfo")
        File.read("/proc/cpuinfo")
@@ -142,6 +146,10 @@ module Facter::Util::Virtual
     File.read("/sys/devices/virtual/dmi/id/product_name") =~ /Google/ rescue false
   end
 
+  def self.nitro?
+    File.read("/sys/devices/virtual/dmi/id/bios_vendor") =~ /Amazon/ rescue false
+  end
+
   def self.jail?
     path = case Facter.value(:kernel)
       when "FreeBSD" then "/sbin"

data/lib/facter/version.rb

@@ -1,6 +1,6 @@
 module Facter
   if not defined? FACTERVERSION then
-    FACTERVERSION = '2.5.6'
+    FACTERVERSION = '2.5.7'
   end
 
   # Returns the running version of Facter.

data/lib/facter/virtual.rb

@@ -145,10 +145,15 @@ Facter.add("virtual") do
       next "xenu" if FileTest.exists?("/proc/xen") || FileTest.exists?("/dev/xvda1")
     end
 
+    if Facter::Util::Virtual.ec2?
+      next "ec2" if FileTest.exists?("/dev/nvme0")
+    end
+
     next "virtualbox" if Facter::Util::Virtual.virtualbox?
     next Facter::Util::Virtual.kvm_type if Facter::Util::Virtual.kvm?
     next "rhev" if Facter::Util::Virtual.rhev?
     next "ovirt" if Facter::Util::Virtual.ovirt?
+    next "nitro" if Facter::Util::Virtual.nitro?
 
     # Parse lspci
     output = Facter::Util::Virtual.lspci
@@ -225,6 +230,10 @@ Facter.add("virtual") do
           result = "xen"
         end
 
+        if result.nil? and computersystem.manufacturer =~ /Amazon/
+          result = "nitro"
+        end
+
         break
       end
       result ||= "physical"

data/spec/fixtures/unit/util/ip/linux_get_single_interface_ib0_centos7

@@ -0,0 +1,8 @@
+ib0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 2044
+        inet 10.55.200.50  netmask 255.255.0.0  broadcast 10.55.255.255
+Infiniband hardware address can be incorrect! Please read BUGS section in ifconfig(8).
+        HWaddr 80:00:00:03:fe:80:00:00:00:00:00:00:00:11:75:00:00:6f:02:fe  txqueuelen 256  (InfiniBand)
+        RX packets 26603237  bytes 15921365732 (14.8 GiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 22735277  bytes 4196650455 (3.9 GiB)
+        TX errors 0  dropped 2 overruns 0  carrier 0  collisions 0

data/spec/fixtures/unit/util/ip/linux_ifconfig_ib0_centos7

@@ -0,0 +1,8 @@
+ib0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 2044
+        inet 10.55.200.50  netmask 255.255.0.0  broadcast 10.55.255.255
+Infiniband hardware address can be incorrect! Please read BUGS section in ifconfig(8).
+        infiniband 80:00:00:03:FE:80:00:00:00:00:00:00:00:00:00:00:00:00:00:00  txqueuelen 256  (InfiniBand)
+        RX packets 26603237  bytes 15921365732 (14.8 GiB)
+        RX errors 0  dropped 0  overruns 0  frame 0
+        TX packets 22735277  bytes 4196650455 (3.9 GiB)
+        TX errors 0  dropped 2 overruns 0  carrier 0  collisions 0

data/spec/unit/util/ip_spec.rb

@@ -176,6 +176,26 @@ describe Facter::Util::IP do
     Facter::Util::IP.get_single_interface_output("ib0").should == correct_ifconfig_interface
   end
 
+  it "should return correct macaddress information for infiniband on Linux CentOS 7" do
+    correct_ifconfig_interface = my_fixture_read("linux_get_single_interface_ib0_centos7")
+
+    Facter::Util::IP.expects(:get_single_interface_output).with("ib0").returns(correct_ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("Linux")
+
+    Facter::Util::IP.get_interface_value("ib0", "macaddress").should == "80:00:00:03:fe:80:00:00:00:00:00:00:00:11:75:00:00:6f:02:fe"
+  end
+
+  it "should replace the incorrect macaddress with the correct macaddress in ifconfig for infiniband on Linux CentOS 7" do
+    ifconfig_interface = my_fixture_read("linux_ifconfig_ib0_centos7")
+    correct_ifconfig_interface = my_fixture_read("linux_get_single_interface_ib0_centos7")
+
+    Facter::Util::IP.expects(:get_infiniband_macaddress).with("ib0").returns("80:00:00:03:fe:80:00:00:00:00:00:00:00:11:75:00:00:6f:02:fe")
+    Facter::Util::IP.expects(:ifconfig_interface).with("ib0").returns(ifconfig_interface)
+    Facter.stubs(:value).with(:kernel).returns("Linux")
+
+    Facter::Util::IP.get_single_interface_output("ib0").should == correct_ifconfig_interface
+  end
+
   it "should return fake macaddress information for infiniband on Linux when neither sysfs or /sbin/ip are available" do
     ifconfig_interface = my_fixture_read("linux_ifconfig_ib0")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: facter
 version: !ruby/object:Gem::Version
-  version: 2.5.6
+  version: 2.5.7
 platform: ruby
 authors:
 - Puppet Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-26 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies: []
 description: You can prove anything with facts!
 email: info@puppetlabs.com
@@ -20,7 +20,6 @@ files:
 - COMMITTERS.md
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
@@ -336,9 +335,11 @@ files:
 - spec/fixtures/unit/util/ip/linux_2_6_35_proc_net_bonding_bond0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_eth0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_ib0
+- spec/fixtures/unit/util/ip/linux_get_single_interface_ib0_centos7
 - spec/fixtures/unit/util/ip/linux_get_single_interface_lo
 - spec/fixtures/unit/util/ip/linux_ifconfig_all_with_single_interface
 - spec/fixtures/unit/util/ip/linux_ifconfig_ib0
+- spec/fixtures/unit/util/ip/linux_ifconfig_ib0_centos7
 - spec/fixtures/unit/util/ip/solaris_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/unit/util/ip/solaris_ifconfig_single_interface
 - spec/fixtures/unit/util/ip/windows_netsh_all_interfaces
@@ -532,7 +533,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Facter, a system inventory tool
@@ -685,9 +686,11 @@ test_files:
 - spec/fixtures/unit/util/ip/linux_2_6_35_proc_net_bonding_bond0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_eth0
 - spec/fixtures/unit/util/ip/linux_get_single_interface_ib0
+- spec/fixtures/unit/util/ip/linux_get_single_interface_ib0_centos7
 - spec/fixtures/unit/util/ip/linux_get_single_interface_lo
 - spec/fixtures/unit/util/ip/linux_ifconfig_all_with_single_interface
 - spec/fixtures/unit/util/ip/linux_ifconfig_ib0
+- spec/fixtures/unit/util/ip/linux_ifconfig_ib0_centos7
 - spec/fixtures/unit/util/ip/solaris_ifconfig_all_with_multiple_interfaces
 - spec/fixtures/unit/util/ip/solaris_ifconfig_single_interface
 - spec/fixtures/unit/util/ip/windows_netsh_all_interfaces

data/Gemfile.lock

@@ -1,79 +0,0 @@
-PATH
-  remote: .
-  specs:
-    facter (2.5.4)
-      redcarpet (<= 2.3.0)
-      watchr
-      yard
-
-GEM
-  remote: https://artifactory.delivery.puppetlabs.net/artifactory/api/gems/rubygems/
-  specs:
-    CFPropertyList (2.3.6)
-    addressable (2.3.8)
-    artifactory (3.0.0)
-    builder (3.2.3)
-    coderay (1.1.2)
-    diff-lcs (1.1.3)
-    json (1.8.6)
-    json-schema (2.6.2)
-      addressable (~> 2.3.8)
-    metaclass (0.0.4)
-    method_source (0.9.2)
-    mocha (0.10.5)
-      metaclass (~> 0.0.1)
-    packaging (0.99.0)
-      artifactory
-      rake
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    puppet-lint (2.3.6)
-    puppet-syntax (2.5.0)
-      rake
-    puppetlabs_spec_helper (1.1.1)
-      mocha
-      puppet-lint
-      puppet-syntax
-      rake
-      rspec-puppet
-    rake (10.1.1)
-    redcarpet (2.3.0)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    rspec-puppet (2.7.5)
-      rspec
-    watchr (0.7)
-    yard (0.9.20)
-    yarjuf (1.0.5)
-      builder
-      rspec (>= 2.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  CFPropertyList (~> 2.2)
-  facter (>= 1.0.0)!
-  ffi (~> 1.9.18)
-  json (~> 1.7)
-  json-schema (~> 2.6.2)
-  mocha (~> 0.10.5)
-  packaging (~> 0.99)
-  pry
-  puppetlabs_spec_helper
-  rake (~> 10.1.0)
-  redcarpet (<= 2.3.0)
-  rspec (~> 2.11.0)
-  watchr
-  yard
-  yarjuf (~> 1.0)
-
-BUNDLED WITH
-   1.17.1