ohai 13.12.6 → 14.0.28

data/spec/unit/system_spec.rb

@@ -35,10 +35,6 @@ describe "Ohai::System" do
       expect(ohai.provides_map).to be_a_kind_of(Ohai::ProvidesMap)
     end
 
-    it "sets @v6_dependency_solver to a Hash" do
-      expect(ohai.v6_dependency_solver).to be_a_kind_of(Hash)
-    end
-
     it "merges provided configuration options into the ohai config context" do
       config = {
         disabled_plugins: [ :Foo, :Baz ],
@@ -90,29 +86,6 @@ describe "Ohai::System" do
     end
   end
 
-  when_plugins_directory "contains v6 and v7 plugins" do
-    with_plugin("zoo.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  provides 'seals'
-end
-EOF
-
-    with_plugin("lake.rb", <<EOF)
-provides 'fish'
-EOF
-
-    before do
-      Ohai.config[:plugin_path] = [ path_to(".") ]
-    end
-
-    it "load_plugins() should load all the plugins" do
-      ohai.load_plugins
-      expect(ohai.provides_map.map.keys).to include("seals")
-      expect(ohai.v6_dependency_solver.keys).to include("lake.rb")
-      expect(Ohai::NamedPlugin.const_get(:Zoo)).to eq(Ohai::NamedPlugin::Zoo)
-    end
-  end
-
   when_plugins_directory "contains directories inside" do
     with_plugin("repo1/zoo.rb", <<EOF)
 Ohai.plugin(:Zoo) do
@@ -121,7 +94,9 @@ end
 EOF
 
     with_plugin("repo1/lake.rb", <<EOF)
+Ohai.plugin(:Nature) do
 provides 'fish'
+end
 EOF
 
     with_plugin("repo2/nature.rb", <<EOF)
@@ -131,7 +106,9 @@ end
 EOF
 
     with_plugin("repo2/mountain.rb", <<EOF)
+Ohai.plugin(:Nature) do
 provides 'bear'
+end
 EOF
 
     before do
@@ -142,8 +119,6 @@ EOF
       ohai.load_plugins
       expect(ohai.provides_map.map.keys).to include("seals")
       expect(ohai.provides_map.map.keys).to include("crabs")
-      expect(ohai.v6_dependency_solver.keys).to include("lake.rb")
-      expect(ohai.v6_dependency_solver.keys).to include("mountain.rb")
       expect(Ohai::NamedPlugin.const_get(:Zoo)).to eq(Ohai::NamedPlugin::Zoo)
       expect(Ohai::NamedPlugin.const_get(:Nature)).to eq(Ohai::NamedPlugin::Nature)
     end
@@ -151,123 +126,6 @@ EOF
   end
 
   describe "when running plugins" do
-    when_plugins_directory "contains v6 plugins only" do
-      with_plugin("zoo.rb", <<EOF)
-provides 'zoo'
-zoo("animals")
-EOF
-
-      with_plugin("park.rb", <<EOF)
-provides 'park'
-park("plants")
-EOF
-
-      it "should collect data from all the plugins" do
-        Ohai.config[:plugin_path] = [ path_to(".") ]
-        ohai.all_plugins
-        expect(ohai.data[:zoo]).to eq("animals")
-        expect(ohai.data[:park]).to eq("plants")
-        expect(ohai.data[:zoo]).to be_frozen
-        expect(ohai.data[:park]).to be_frozen
-      end
-
-      describe "when using :disabled_plugins" do
-        before do
-          Ohai.config[:disabled_plugins] = [ "zoo" ]
-        end
-
-        after do
-          Ohai.config[:disabled_plugins] = [ ]
-        end
-
-        it "shouldn't run disabled version 6 plugins" do
-          Ohai.config[:plugin_path] = [ path_to(".") ]
-          ohai.all_plugins
-          expect(ohai.data[:zoo]).to be_nil
-          expect(ohai.data[:park]).to eq("plants")
-        end
-      end
-
-      describe "when running in whitelist mode" do
-        let(:ohai_system) { Ohai::System.new }
-
-        let(:primary_plugin_class) do
-          Ohai.plugin(:Primary) do
-            provides "primary"
-            depends "dependency/one"
-            depends "dependency/two"
-            collect_data {}
-          end
-        end
-
-        let(:dependency_plugin_one_class) do
-          Ohai.plugin(:DependencyOne) do
-            provides "dependency/one"
-            collect_data {}
-          end
-        end
-
-        let(:dependency_plugin_two_class) do
-          Ohai.plugin(:DependencyTwo) do
-            provides "dependency/two"
-            collect_data {}
-          end
-        end
-
-        let(:unrelated_plugin_class) do
-          Ohai.plugin(:Unrelated) do
-            provides "whatever"
-            collect_data {}
-          end
-        end
-
-        let(:v6_plugin_class) do
-          Class.new(Ohai::DSL::Plugin::VersionVI) { collect_contents("v6_key('v6_data')") }
-        end
-
-        let(:primary_plugin) { primary_plugin_class.new(ohai_system) }
-        let(:dependency_plugin_one) { dependency_plugin_one_class.new(ohai_system) }
-        let(:dependency_plugin_two) { dependency_plugin_two_class.new(ohai_system) }
-        let(:unrelated_plugin) { unrelated_plugin_class.new(ohai_system) }
-        let(:v6_plugin) { v6_plugin_class.new(ohai_system, "/v6_plugin.rb", "/") }
-
-        before do
-          allow(ohai_system).to receive(:load_plugins) # TODO: temporary hack - don't run unrelated plugins...
-          [ primary_plugin, dependency_plugin_one, dependency_plugin_two, unrelated_plugin].each do |plugin|
-            plugin_provides = plugin.class.provides_attrs
-            ohai_system.provides_map.set_providers_for(plugin, plugin_provides)
-          end
-
-          ohai_system.v6_dependency_solver["v6_plugin"] = v6_plugin
-
-          # Instead of calling all plugins we call load and run directly so that the information we setup is not cleared by all_plugins
-          ohai_system.load_plugins
-          ohai_system.run_plugins(true, "primary")
-        end
-
-        # This behavior choice is somewhat arbitrary, based on what creates the
-        # least code complexity in legacy v6 plugin format support. Once we
-        # ship 7.0, though, we need to stick to the same behavior.
-        it "runs v6 plugins" do
-          expect(v6_plugin.has_run?).to be true
-        end
-
-        it "runs plugins that provide the requested attributes" do
-          expect(primary_plugin.has_run?).to be true
-        end
-
-        it "runs dependencies of plugins that provide requested attributes" do
-          expect(dependency_plugin_one.has_run?).to be true
-          expect(dependency_plugin_two.has_run?).to be true
-        end
-
-        it "does not run plugins that are irrelevant to the requested attributes" do
-          expect(unrelated_plugin.has_run?).to be false
-        end
-
-      end
-    end
-
     when_plugins_directory "contains a v7 plugins with :default and platform specific blocks" do
       with_plugin("message.rb", <<EOF)
 Ohai.plugin(:Message) do
@@ -317,6 +175,17 @@ Ohai.plugin(:Fails) do
     fail 'thing'
   end
 end
+EOF
+
+      with_plugin("optional.rb", <<EOF)
+Ohai.plugin(:Optional) do
+  provides 'optional'
+  optional true
+
+  collect_data(:default) do
+    optional("canteloupe")
+  end
+end
 EOF
 
       it "should collect data from all the plugins" do
@@ -333,7 +202,7 @@ EOF
         # Make sure the stubbing of runner is not overriden with reset_system during test
         allow(ohai).to receive(:reset_system)
         allow(ohai.instance_variable_get("@runner")).to receive(:run_plugin).and_raise(Ohai::Exceptions::AttributeNotFound)
-        expect(Ohai::Log).to receive(:error).with(/Encountered error while running plugins/)
+        expect(ohai.logger).to receive(:error).with(/Encountered error while running plugins/)
         expect { ohai.all_plugins }.to raise_error(Ohai::Exceptions::AttributeNotFound)
       end
 
@@ -355,232 +224,50 @@ EOF
       end
 
       describe "when using :critical_plugins" do
+        # if called from cli is true, we'll exit these tests
+        let(:ohai) { Ohai::System.new() }
+
         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::Log).to receive(:error).with(/marked as critical/)
-          ohai.all_plugins
+          expect { ohai.all_plugins }.to raise_error(Ohai::Exceptions::CriticalPluginFailure,
+                                                     "The following Ohai plugins marked as critical failed: [:Fails]. Failing Chef run.")
         end
-
       end
-    end
 
-    when_plugins_directory "contains v6 & v7 plugins in different directories" do
-      with_plugin("my_plugins/zoo.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  provides 'zoo'
-
-  collect_data(:default) do
-    zoo("animals")
-  end
-end
-EOF
-
-      with_plugin("my_plugins/nature.rb", <<EOF)
-Ohai.plugin(:Nature) do
-  provides 'nature'
-
-  collect_data(:default) do
-    nature("cougars")
-  end
-end
-EOF
-
-      with_plugin("my_plugins/park.rb", <<EOF)
-provides 'park'
-park("plants")
-EOF
-
-      with_plugin("my_plugins/home.rb", <<EOF)
-provides 'home'
-home("dog")
-EOF
-
-      describe "when using :disabled_plugins" do
-        before do
-          Ohai.config[:disabled_plugins] = [ :Zoo, "my_plugins::park" ]
-        end
-
-        after do
-          Ohai.config[:disabled_plugins] = [ ]
-        end
-
-        it "shouldn't run disabled plugins" do
+      describe "when using :optional_plugins" do
+        it "should not run optional plugins by default" do
           Ohai.config[:plugin_path] = [ path_to(".") ]
           ohai.all_plugins
-          expect(ohai.data[:zoo]).to be_nil
-          expect(ohai.data[:nature]).to eq("cougars")
-          expect(ohai.data[:park]).to be_nil
-          expect(ohai.data[:home]).to eq("dog")
+          expect(ohai.data[:optional]).to be_nil
         end
-      end
-    end
-
-    when_plugins_directory "contains v6 plugins that depend on v7 plugins" do
-      with_plugin("messages.rb", <<EOF)
-require_plugin 'v6message'
-require_plugin 'v7message'
-
-provides 'messages'
-
-messages Mash.new
-messages[:v6message] = v6message
-messages[:v7message] = v7message
-EOF
-
-      with_plugin("v6message.rb", <<EOF)
-provides 'v6message'
-v6message "update me!"
-EOF
-
-      with_plugin("v7message.rb", <<EOF)
-Ohai.plugin(:V7message) do
-  provides 'v7message'
-
-  collect_data(:default) do
-    v7message "v7 plugins are awesome!"
-  end
-end
-EOF
 
-      before do
-        Ohai.config[:plugin_path] = [ path_to(".") ]
-      end
-
-      it "should collect all data" do
-        ohai.all_plugins
-        [:v6message, :v7message, :messages].each do |attribute|
-          expect(ohai.data).to have_key(attribute)
+        it "should run optional plugins when specifically enabled" do
+          Ohai.config[:optional_plugins] = [ :Optional ]
+          Ohai.config[:plugin_path] = [ path_to(".") ]
+          ohai.all_plugins
+          expect(ohai.data[:optional]).to eq("canteloupe")
         end
 
-        expect(ohai.data[:v6message]).to eql("update me!")
-        expect(ohai.data[:v7message]).to eql("v7 plugins are awesome!")
-        [:v6message, :v7message].each do |subattr|
-          expect(ohai.data[:messages]).to have_key(subattr)
-          expect(ohai.data[:messages][subattr]).to eql(ohai.data[subattr])
+        it "should run optional plugins when all plugins are enabled" do
+          Ohai.config[:run_all_plugins] = true
+          Ohai.config[:plugin_path] = [ path_to(".") ]
+          ohai.all_plugins
+          expect(ohai.data[:optional]).to eq("canteloupe")
         end
       end
     end
   end
 
-  describe "require_plugin()" do
-    when_plugins_directory "contains v6 and v7 plugin with the same name" do
-      with_plugin("message.rb", <<EOF)
-provides 'message'
-
-message "From Version 6"
-EOF
-
-      with_plugin("v7/message.rb", <<EOF)
-Ohai.plugin(:Message) do
-  provides 'message'
-
-  collect_data(:default) do
-    message "From Version 7"
-  end
-end
-EOF
-
-      before do
-        Ohai.config[:plugin_path] = [ path_to(".") ]
-      end
-
-      it "version 6 should run" do
-        ohai.load_plugins
-        ohai.require_plugin("message")
-        expect(ohai.data[:message]).to eql("From Version 6")
-      end
-    end
-
-    when_plugins_directory "a v6 plugin that requires a v7 plugin with dependencies" do
-      with_plugin("message.rb", <<EOF)
-provides 'message'
-
-require_plugin 'v7message'
-
-message Mash.new
-message[:v6message] = "Hellos from 6"
-message[:copy_message] = v7message
-EOF
-
-      with_plugin("v7message.rb", <<EOF)
-Ohai.plugin(:V7message) do
-  provides 'v7message'
-  depends 'zoo'
-
-  collect_data(:default) do
-    v7message ("Hellos from 7: " + zoo)
-  end
-end
-EOF
-
-      with_plugin("zoo.rb", <<EOF)
-Ohai.plugin(:Zoo) do
-  provides 'zoo'
-
-  collect_data(:default) do
-    zoo "animals"
-  end
-end
-EOF
-
-      before do
-        Ohai.config[:plugin_path] = [ path_to(".") ]
-      end
-
-      it "should collect all the data properly" do
-        ohai.all_plugins
-        expect(ohai.data[:v7message]).to eq("Hellos from 7: animals")
-        expect(ohai.data[:zoo]).to eq("animals")
-        expect(ohai.data[:message][:v6message]).to eq("Hellos from 6")
-        expect(ohai.data[:message][:copy_message]).to eq("Hellos from 7: animals")
-      end
-    end
-
-    when_plugins_directory "a v6 plugin that requires non-existing v7 plugin" do
-      with_plugin("message.rb", <<EOF)
-provides 'message'
-
-require_plugin 'v7message'
-
-message v7message
-EOF
-
-      before do
-        Ohai.config[:plugin_path] = [ path_to(".") ]
-      end
-
-      it "should raise DependencyNotFound" do
-        expect { ohai.all_plugins }.to raise_error(Ohai::Exceptions::DependencyNotFound)
-      end
-    end
-  end
-
   describe "when Chef OHAI resource executes :reload action" do
 
-    when_plugins_directory "contains a v6 plugin" do
-      with_plugin("a_v6plugin.rb", <<-E)
-        plugin_data Mash.new
-        plugin_data[:foo] = :bar
-      E
-
-      before do
-        Ohai.config[:plugin_path] = [ path_to(".") ]
-      end
-
-      it "reloads only the v6 plugin when given a specific plugin to load" do
-        ohai.all_plugins
-        expect { ohai.all_plugins("a_v6plugin") }.not_to raise_error
-      end
-
-    end
-
     when_plugins_directory "contains a random plugin" do
       with_plugin("random.rb", <<-E)
         Ohai.plugin(:Random) do