ohai 8.24.1 → 8.25.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d81b8e833f11f3e06f70cb35f22e0947adf105b
-  data.tar.gz: b427c451be6b57ff867e1b43363ae52f7a1d1909
+  metadata.gz: 58c6a195abed88b1939ee4a307af1ee95d93a3c7
+  data.tar.gz: 6772104fe5375365f284283dec75aef36e6c185b
 SHA512:
-  metadata.gz: 36218913be0e9098697f9fe7369159233cac391b15171288a1d90245d498333477d4a3f1343624c57209c50307cda429c67b798e996c896e0765443266e3fb7b
-  data.tar.gz: 6ec1424381a75fd724f6e69ffd4c54be18efeb60059a6bae5129ea1720ac8bbd77bbff7df497b4bdd89da5b8662fc2a4f0bd7475430c533911a67793599a188a
+  metadata.gz: 4800a4c9c26c0b5aa02279009c73c85b4e5697c1b52183391c190531508a890100deeaa23e9d09874cca53c6b008b694e7da6bc6642f14c977edfb6de9ff3dce
+  data.tar.gz: dd2ea9399d4a1a416cdda93f3280a41df665654d83eda6fb119a3b6db2e3dd17a5364ca41e1ca9e955eaabdc672968466228f92cef40412a1c83eaff109b6f69

data/Gemfile

@@ -5,7 +5,7 @@ gemspec
 group :development do
   gem "sigar", :platform => "ruby"
 
-  gem "chefstyle", "0.5.0"
+  gem "chefstyle", "0.4.0"
   gem "overcommit", ">= 0.34.1"
   gem "pry-byebug"
   gem "pry-stack_explorer"
@@ -16,6 +16,5 @@ group :development do
   gem "rspec-mocks", "~> 3.0"
   gem "rspec-collection_matchers", "~> 1.0"
   gem "rspec_junit_formatter"
-  gem "github_changelog_generator", git: "https://github.com/chef/github-changelog-generator"
   gem "activesupport", "< 5.0" if RUBY_VERSION <= "2.2.2" # github_changelog_generator dep
 end

data/Rakefile

@@ -22,14 +22,3 @@ require "rubocop/rake_task"
 RuboCop::RakeTask.new(:style) do |task|
   task.options += ["--display-cop-names", "--no-color"]
 end
-
-require "github_changelog_generator/task"
-
-GitHubChangelogGenerator::RakeTask.new :changelog do |config|
-  config.future_release = Ohai::VERSION
-  config.max_issues = 0
-  config.add_issues_wo_labels = false
-  config.enhancement_labels = "enhancement,Enhancement,New Feature,Feature".split(",")
-  config.bug_labels = "bug,Bug,Improvement,Upstream Bug".split(",")
-  config.exclude_labels = "duplicate,question,invalid,wontfix,no_changelog,Exclude From Changelog,Question,Discussion".split(",")
-end

data/lib/ohai/config.rb

@@ -102,6 +102,7 @@ module Ohai
       default :log_location, STDERR
       default :plugin, Ohai::PluginConfig.new { |h, k| h[k] = Ohai::PluginConfig.new }
       default :plugin_path, Ohai::Config.default_plugin_path
+      default :critical_plugins, []
     end
 
     class << self

data/lib/ohai/dsl/plugin.rb

@@ -85,10 +85,12 @@ module Ohai
       include Ohai::Util::FileHelper
 
       attr_reader :data
+      attr_reader :failed
 
       def initialize(data)
         @data = data
         @has_run = false
+        @failed = false
       end
 
       def run
@@ -183,8 +185,10 @@ module Ohai
         begin
           self.run
         rescue Ohai::Exceptions::Error => e
+          @failed = true
           raise e
         rescue => e
+          @failed = true
           Ohai::Log.debug("Plugin #{self.name} threw #{e.inspect}")
           e.backtrace.each { |line| Ohai::Log.debug( line ) }
         end

data/lib/ohai/exception.rb

@@ -29,5 +29,6 @@ module Ohai
     class DependencyNotFound < Error; end
     class AttributeSyntaxError < Error; end
     class PluginConfigError < Error; end
+    class CriticalPluginFailure < Error; end
   end
 end

data/lib/ohai/plugins/solaris2/network.rb

@@ -103,7 +103,8 @@ Ohai.plugin(:Network) do
     cint = nil
 
     so.stdout.lines do |line|
-      if line =~ /^([0-9a-zA-Z\.\:\-]+)\S/
+      # regex: http://rubular.com/r/Iag7JLVTVe
+      if line =~ /^([0-9a-zA-Z\.\:\-]+): \S+ mtu (\d+) index (\d+)/
         cint = $1
         iface[cint] = Mash.new unless iface[cint]
         iface[cint][:mtu] = $2

data/lib/ohai/runner.rb

@@ -22,11 +22,13 @@ require "ohai/dsl"
 module Ohai
   class Runner
 
+    attr_reader :failed_plugins
     # safe_run: set to true if this runner will run plugins in
     # safe-mode. default false.
     def initialize(controller, safe_run = false)
       @provides_map = controller.provides_map
       @safe_run = safe_run
+      @failed_plugins = []
     end
 
     # Runs plugins and any un-run dependencies.
@@ -82,6 +84,9 @@ module Ohai
 
         if dependency_providers.empty?
           @safe_run ? next_plugin.safe_run : next_plugin.run
+          if next_plugin.failed
+            @failed_plugins << next_plugin.name
+          end
         else
           visited << next_plugin << dependency_providers.first
         end

data/lib/ohai/system.rb

@@ -42,6 +42,7 @@ module Ohai
     def initialize(config = {})
       @plugin_path = ""
       @config = config
+      @failed_plugins = []
       reset_system
     end
 
@@ -102,6 +103,11 @@ module Ohai
         Ohai::Log.error("Encountered error while running plugins: #{e.inspect}")
         raise
       end
+      critical_failed = Ohai::Config.ohai[:critical_plugins] & @runner.failed_plugins
+      unless critical_failed.empty?
+        msg = "The following Ohai plugins marked as critical failed: #{critical_failed}. Exiting."
+        raise Ohai::Exceptions::CriticalPluginFailure, msg
+      end
     end
 
     def have_v6_plugin?(name)

data/lib/ohai/version.rb

@@ -18,5 +18,5 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = "8.24.1"
+  VERSION = "8.25.0"
 end

data/spec/unit/plugins/solaris2/network_spec.rb

@@ -69,9 +69,7 @@ lo0: flags=1000849<UP,LOOPBACK,RUNNING,MULTICAST,IPv4> mtu 8232 index 1
 eri0: flags=1004843<UP,BROADCAST,RUNNING,MULTICAST,DHCP,IPv4> mtu 1500 \
 index 2
     inet 172.17.128.208 netmask ffffff00 broadcast 172.17.128.255
-ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> \
-mtu 1460
-    index 3
+ip6.tun0: flags=10008d1<UP,POINTOPOINT,RUNNING,NOARP,MULTICAST,IPv4> mtu 1460 index 3
     inet6 tunnel src fe80::1 tunnel dst fe80::2
     tunnel security settings  -->  use 'ipsecconf -ln -i ip.tun1'
     tunnel hop limit 60 tunnel encapsulation limit 4
@@ -80,8 +78,7 @@ qfe1: flags=2000841<UP,RUNNING,MULTICAST,IPv6> mtu 1500 index 3
  usesrc vni0
  inet6 fe80::203:baff:fe17:4be0/10
  ether 0:3:ba:17:4b:e0
-vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 0
- index 5
+vni0: flags=2002210041<UP,RUNNING,NOXMIT,NONUD,IPv6,VIRTUAL> mtu 1460 index 5
  srcof qfe1
  inet6 fe80::203:baff:fe17:4444/128
 ENDIFCONFIG
@@ -176,7 +173,7 @@ ROUTE_GET
     end
 
     it "finds the default interface for a solaris 11 zone" do
-      expect(@plugin[:network][:default_interface]).to eq("net1")
+      expect(@plugin[:network][:default_interface]).to eq("net1:1")
     end
   end
 

data/spec/unit/system_spec.rb

@@ -52,6 +52,7 @@ describe "Ohai::System" do
       config = {
         disabled_plugins: [ :Foo, :Baz ],
         directory: "/some/extra/plugins",
+        critical_plugins: [ :Foo, :Bar ],
       }
       allow(Ohai::Config).to receive(:merge_deprecated_config)
       expect(Ohai.config).to receive(:merge!).with(config).and_call_original
@@ -337,6 +338,15 @@ Ohai.plugin(:Park) do
     park("plants")
   end
 end
+EOF
+
+      with_plugin("fails.rb", <<EOF)
+Ohai.plugin(:Fails) do
+  provides 'fails'
+  collect_data(:default) do
+    fail 'thing'
+  end
+end
 EOF
 
       it "should collect data from all the plugins" do
@@ -371,6 +381,21 @@ EOF
           expect(ohai.data[:park]).to eq("plants")
         end
       end
+
+      describe "when using :critical_plugins" do
+        before do
+          Ohai.config[:critical_plugins] = [ :Fails ]
+        end
+        after do
+          Ohai.config[:critical_plugins] = []
+        end
+
+        it "should fail when critical plugins fail" do
+          Ohai.config[:plugin_path] = [ path_to(".") ]
+          expect { ohai.all_plugins }.to raise_error(Ohai::Exceptions::CriticalPluginFailure)
+        end
+
+      end
     end
 
     when_plugins_directory "contains v6 & v7 plugins in different directories" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ohai
 version: !ruby/object:Gem::Version
-  version: 8.24.1
+  version: 8.25.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: systemu
@@ -546,7 +546,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ohai profiles your system and emits JSON