chef 12.18.31 → 12.19.33

data/spec/functional/resource/execute_spec.rb

@@ -137,6 +137,18 @@ describe Chef::Resource::Execute do
     end
   end
 
+  describe "when a guard is specified" do
+    describe "when using the default guard interpreter" do
+      let(:guard_interpreter_resource) { nil }
+      it_behaves_like "a resource with a guard specifying an alternate user identity"
+    end
+
+    describe "when using the execute resource as the guard interpreter" do
+      let(:guard_interpreter_resource) { :execute }
+      it_behaves_like "a resource with a guard specifying an alternate user identity"
+    end
+  end
+
   # Ensure that CommandTimeout is raised, and is caused by resource.timeout really expiring.
   # https://github.com/chef/chef/issues/2985
   #
@@ -151,4 +163,9 @@ describe Chef::Resource::Execute do
       expect { resource.run_action(:run) }.to raise_error(Mixlib::ShellOut::CommandTimeout)
     end
   end
+
+  describe "when running with an alternate user identity" do
+    let(:resource_command_property) { :command }
+    it_behaves_like "an execute resource that supports alternate user identity"
+  end
 end

data/spec/functional/resource/user/dscl_spec.rb

@@ -28,11 +28,9 @@ describe "Chef::Resource::User with Chef::Provider::User::Dscl provider", metada
   include Chef::Mixin::ShellOut
 
   def clean_user
-    begin
-      shell_out!("/usr/bin/dscl . -delete '/Users/#{username}'")
-    rescue Mixlib::ShellOut::ShellCommandFailed
+    shell_out!("/usr/bin/dscl . -delete '/Users/#{username}'")
+  rescue Mixlib::ShellOut::ShellCommandFailed
       # Raised when the user is already cleaned
-    end
   end
 
   def user_should_exist

data/spec/integration/client/client_spec.rb

@@ -46,6 +46,7 @@ describe "chef-client" do
   # we're running `chef-client` from the source tree and not the external one.
   # cf. CHEF-4914
   let(:chef_client) { "ruby '#{chef_dir}/chef-client' --minimal-ohai" }
+  let(:chef_solo) { "ruby '#{chef_dir}/chef-solo' --minimal-ohai" }
 
   let(:critical_env_vars) { %w{_ORIGINAL_GEM_PATH GEM_PATH GEM_HOME GEM_ROOT BUNDLE_BIN_PATH BUNDLE_GEMFILE RUBYLIB RUBYOPT RUBY_ENGINE RUBY_ROOT RUBY_VERSION PATH}.map { |o| "#{o}=#{ENV[o]}" } .join(" ") }
 
@@ -499,4 +500,36 @@ EOM
       expect(result.exitstatus).not_to eq(0)
     end
   end
+
+  when_the_repository "has a cookbook with broken metadata.rb, but has metadata.json" do
+    before do
+      file "cookbooks/x/recipes/default.rb", ""
+      file "cookbooks/x/metadata.rb", <<EOM
+name 'x'
+version '0.0.1'
+raise "TEH SADNESS"
+EOM
+      file "cookbooks/x/metadata.json", <<EOM
+{
+  "name": "x",
+  "version": "0.0.1"
+}
+EOM
+
+      file "config/client.rb", <<EOM
+local_mode true
+cookbook_path "#{path_to('cookbooks')}"
+EOM
+    end
+
+    it "the chef client run should succeed" do
+      command = shell_out("#{chef_client} -c \"#{path_to('config/client.rb')}\" -o 'x::default' --no-fork", :cwd => chef_dir)
+      command.error!
+    end
+
+    it "a chef-solo run should succeed" do
+      command = shell_out("#{chef_solo} -c \"#{path_to('config/client.rb')}\" -o 'x::default' --no-fork", :cwd => chef_dir)
+      command.error!
+    end
+  end
 end

data/spec/integration/recipes/recipe_dsl_spec.rb

@@ -861,9 +861,9 @@ describe "Recipe DSL methods" do
         before { resource_class_a } # pull on it so it gets defined before the recipe runs
 
         it "two_classes_one_dsl resolves to A (alphabetically earliest)" do
-          two_classes_one_dsl = self.two_classes_one_dsl
+          temp_two_classes_one_dsl = two_classes_one_dsl
           recipe = converge do
-            instance_eval("#{two_classes_one_dsl} 'blah'")
+            instance_eval("#{temp_two_classes_one_dsl} 'blah'")
           end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class_a
@@ -891,9 +891,9 @@ describe "Recipe DSL methods" do
         before { resource_class_z } # pull on it so it gets defined before the recipe runs
 
         it "two_classes_one_dsl resolves to B (alphabetically earliest)" do
-          two_classes_one_dsl = self.two_classes_one_dsl
+          temp_two_classes_one_dsl = two_classes_one_dsl
           recipe = converge do
-            instance_eval("#{two_classes_one_dsl} 'blah'")
+            instance_eval("#{temp_two_classes_one_dsl} 'blah'")
           end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class
@@ -909,9 +909,9 @@ describe "Recipe DSL methods" do
           end
 
           it "two_classes_one_dsl resolves to Z (respects the priority array)" do
-            two_classes_one_dsl = self.two_classes_one_dsl
+            temp_two_classes_one_dsl = two_classes_one_dsl
             recipe = converge do
-              instance_eval("#{two_classes_one_dsl} 'blah'")
+              instance_eval("#{temp_two_classes_one_dsl} 'blah'")
             end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq resource_class_z
@@ -927,9 +927,9 @@ describe "Recipe DSL methods" do
             end
 
             it "two_classes_one_dsl resolves to B (picks the next thing in the priority array)" do
-              two_classes_one_dsl = self.two_classes_one_dsl
+              temp_two_classes_one_dsl = two_classes_one_dsl
               recipe = converge do
-                instance_eval("#{two_classes_one_dsl} 'blah'")
+                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
               end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_resource).to eq resource_class
@@ -948,9 +948,9 @@ describe "Recipe DSL methods" do
           end
 
           it "two_classes_one_dsl resolves to Z (respects the most recent priority array)" do
-            two_classes_one_dsl = self.two_classes_one_dsl
+            temp_two_classes_one_dsl = two_classes_one_dsl
             recipe = converge do
-              instance_eval("#{two_classes_one_dsl} 'blah'")
+              instance_eval("#{temp_two_classes_one_dsl} 'blah'")
             end
             expect(recipe.logged_warnings).to eq ""
             expect(BaseThingy.created_resource).to eq resource_class_z
@@ -966,9 +966,9 @@ describe "Recipe DSL methods" do
             end
 
             it "two_classes_one_dsl resolves to B (picks the first match from the other priority array)" do
-              two_classes_one_dsl = self.two_classes_one_dsl
+              temp_two_classes_one_dsl = two_classes_one_dsl
               recipe = converge do
-                instance_eval("#{two_classes_one_dsl} 'blah'")
+                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
               end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_resource).to eq resource_class
@@ -991,9 +991,9 @@ describe "Recipe DSL methods" do
             end
 
             it "two_classes_one_dsl resolves to B (picks the first match outside the priority array)" do
-              two_classes_one_dsl = self.two_classes_one_dsl
+              temp_two_classes_one_dsl = two_classes_one_dsl
               recipe = converge do
-                instance_eval("#{two_classes_one_dsl} 'blah'")
+                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
               end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_resource).to eq resource_class
@@ -1044,9 +1044,9 @@ describe "Recipe DSL methods" do
             before { provider_class_a.provides two_classes_one_dsl }
 
             it "two_classes_one_dsl resolves to A (alphabetically earliest)" do
-              two_classes_one_dsl = self.two_classes_one_dsl
+              temp_two_classes_one_dsl = two_classes_one_dsl
               recipe = converge do
-                instance_eval("#{two_classes_one_dsl} 'blah'")
+                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
               end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_provider).to eq provider_class_a
@@ -1056,9 +1056,9 @@ describe "Recipe DSL methods" do
             before { provider_class_a.provides(two_classes_one_dsl) { false } }
 
             it "two_classes_one_dsl resolves to B (since A declined)" do
-              two_classes_one_dsl = self.two_classes_one_dsl
+              temp_two_classes_one_dsl = two_classes_one_dsl
               recipe = converge do
-                instance_eval("#{two_classes_one_dsl} 'blah'")
+                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
               end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_provider).to eq provider_class
@@ -1085,9 +1085,9 @@ describe "Recipe DSL methods" do
             before { provider_class_z.provides two_classes_one_dsl }
 
             it "two_classes_one_dsl resolves to B (alphabetically earliest)" do
-              two_classes_one_dsl = self.two_classes_one_dsl
+              temp_two_classes_one_dsl = two_classes_one_dsl
               recipe = converge do
-                instance_eval("#{two_classes_one_dsl} 'blah'")
+                instance_eval("#{temp_two_classes_one_dsl} 'blah'")
               end
               expect(recipe.logged_warnings).to eq ""
               expect(BaseThingy.created_provider).to eq provider_class
@@ -1097,9 +1097,9 @@ describe "Recipe DSL methods" do
               before { Chef.set_provider_priority_array two_classes_one_dsl, [ provider_class_z, provider_class ] }
 
               it "two_classes_one_dsl resolves to Z (respects the priority map)" do
-                two_classes_one_dsl = self.two_classes_one_dsl
+                temp_two_classes_one_dsl = two_classes_one_dsl
                 recipe = converge do
-                  instance_eval("#{two_classes_one_dsl} 'blah'")
+                  instance_eval("#{temp_two_classes_one_dsl} 'blah'")
                 end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class_z
@@ -1114,9 +1114,9 @@ describe "Recipe DSL methods" do
               before { Chef.set_provider_priority_array two_classes_one_dsl, [ provider_class_z, provider_class ] }
 
               it "two_classes_one_dsl resolves to B (the next one in the priority map)" do
-                two_classes_one_dsl = self.two_classes_one_dsl
+                temp_two_classes_one_dsl = two_classes_one_dsl
                 recipe = converge do
-                  instance_eval("#{two_classes_one_dsl} 'blah'")
+                  instance_eval("#{temp_two_classes_one_dsl} 'blah'")
                 end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
@@ -1128,9 +1128,9 @@ describe "Recipe DSL methods" do
               before { Chef.set_provider_priority_array two_classes_one_dsl, [ provider_class ] }
 
               it "two_classes_one_dsl resolves to B (the one in the next priority map)" do
-                two_classes_one_dsl = self.two_classes_one_dsl
+                temp_two_classes_one_dsl = two_classes_one_dsl
                 recipe = converge do
-                  instance_eval("#{two_classes_one_dsl} 'blah'")
+                  instance_eval("#{temp_two_classes_one_dsl} 'blah'")
                 end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
@@ -1158,22 +1158,22 @@ describe "Recipe DSL methods" do
         before { resource_class_blarghle } # pull on it so it gets defined before the recipe runs
 
         it "on os = blarghle, two_classes_one_dsl resolves to Blarghle" do
-          two_classes_one_dsl = self.two_classes_one_dsl
+          temp_two_classes_one_dsl = two_classes_one_dsl
           recipe = converge do
             # this is an ugly way to test, make Cheffish expose node attrs
             run_context.node.automatic[:os] = "blarghle"
-            instance_eval("#{two_classes_one_dsl} 'blah' do; end")
+            instance_eval("#{temp_two_classes_one_dsl} 'blah' do; end")
           end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class_blarghle
         end
 
         it "on os = linux, two_classes_one_dsl resolves to B" do
-          two_classes_one_dsl = self.two_classes_one_dsl
+          temp_two_classes_one_dsl = two_classes_one_dsl
           recipe = converge do
             # this is an ugly way to test, make Cheffish expose node attrs
             run_context.node.automatic[:os] = "linux"
-            instance_eval("#{two_classes_one_dsl} 'blah' do; end")
+            instance_eval("#{temp_two_classes_one_dsl} 'blah' do; end")
           end
           expect(recipe.logged_warnings).to eq ""
           expect(BaseThingy.created_resource).to eq resource_class
@@ -1202,15 +1202,15 @@ describe "Recipe DSL methods" do
 
         context "with provides? returning true to my_resource" do
           before do
-            my_resource = self.my_resource
+            temp_my_resource = my_resource
             resource_class.define_singleton_method(:provides?) do |node, resource_name|
               @called_provides = true
-              resource_name == my_resource
+              resource_name == temp_my_resource
             end
           end
 
           it "my_resource returns the resource and calls provides?, but does not emit a warning" do
-            dsl_name = self.my_resource
+            dsl_name = my_resource
             recipe = converge do
               instance_eval("#{dsl_name} 'foo'")
             end
@@ -1222,15 +1222,15 @@ describe "Recipe DSL methods" do
 
         context "with provides? returning true to blarghle_blarghle_little_star and not resource_name" do
           before do
-            blarghle_blarghle_little_star = self.blarghle_blarghle_little_star
+            temp_blarghle_blarghle_little_star = blarghle_blarghle_little_star
             resource_class.define_singleton_method(:provides?) do |node, resource_name|
               @called_provides = true
-              resource_name == blarghle_blarghle_little_star
+              resource_name == temp_blarghle_blarghle_little_star
             end
           end
 
           it "my_resource does not return the resource" do
-            dsl_name = self.my_resource
+            dsl_name = my_resource
             expect_converge do
               instance_eval("#{dsl_name} 'foo'")
             end.to raise_error(Chef::Exceptions::NoSuchResourceType)
@@ -1239,7 +1239,7 @@ describe "Recipe DSL methods" do
 
           it "blarghle_blarghle_little_star 'foo' returns the resource and emits a warning" do
             Chef::Config[:treat_deprecation_warnings_as_errors] = false
-            dsl_name = self.blarghle_blarghle_little_star
+            dsl_name = blarghle_blarghle_little_star
             recipe = converge do
               instance_eval("#{dsl_name} 'foo'")
             end
@@ -1281,9 +1281,9 @@ describe "Recipe DSL methods" do
               end
 
               it "my_resource runs the provider and does not emit a warning" do
-                my_resource = self.my_resource
+                temp_my_resource = my_resource
                 recipe = converge do
-                  instance_eval("#{my_resource} 'foo'")
+                  instance_eval("#{temp_my_resource} 'foo'")
                 end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
@@ -1311,9 +1311,9 @@ describe "Recipe DSL methods" do
                 end
 
                 it "my_resource runs the first provider" do
-                  my_resource = self.my_resource
+                  temp_my_resource = my_resource
                   recipe = converge do
-                    instance_eval("#{my_resource} 'foo'")
+                    instance_eval("#{temp_my_resource} 'foo'")
                   end
                   expect(recipe.logged_warnings).to eq ""
                   expect(BaseThingy.created_provider).to eq provider_class
@@ -1328,9 +1328,9 @@ describe "Recipe DSL methods" do
 
               # TODO no warning? ick
               it "my_resource runs the provider anyway" do
-                my_resource = self.my_resource
+                temp_my_resource = my_resource
                 recipe = converge do
-                  instance_eval("#{my_resource} 'foo'")
+                  instance_eval("#{temp_my_resource} 'foo'")
                 end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
@@ -1338,7 +1338,7 @@ describe "Recipe DSL methods" do
 
               context "and another provider supporting :my_resource with supports? true" do
                 let(:provider_class2) do
-                  my_resource = self.my_resource
+                  temp_my_resource = my_resource
                   Class.new(BaseThingy::Provider) do
                     def self.name
                       "MyProvider2"
@@ -1351,7 +1351,7 @@ describe "Recipe DSL methods" do
                     def self.called_provides
                       @called_provides
                     end
-                    provides my_resource
+                    provides temp_my_resource
                     def self.supports?(resource, action)
                       true
                     end
@@ -1360,9 +1360,9 @@ describe "Recipe DSL methods" do
                 before { provider_class2 } # make sure the provider class shows up
 
                 it "my_resource runs the other provider" do
-                  my_resource = self.my_resource
+                  temp_my_resource = my_resource
                   recipe = converge do
-                    instance_eval("#{my_resource} 'foo'")
+                    instance_eval("#{temp_my_resource} 'foo'")
                   end
                   expect(recipe.logged_warnings).to eq ""
                   expect(BaseThingy.created_provider).to eq provider_class2
@@ -1373,10 +1373,10 @@ describe "Recipe DSL methods" do
 
           context "with provides? returning true" do
             before do
-              my_resource = self.my_resource
+              temp_my_resource = my_resource
               provider_class.define_singleton_method(:provides?) do |node, resource|
                 @called_provides = true
-                resource.declared_type == my_resource
+                resource.declared_type == temp_my_resource
               end
             end
 
@@ -1386,9 +1386,9 @@ describe "Recipe DSL methods" do
               end
 
               it "my_resource calls the provider (and calls provides?), but does not emit a warning" do
-                my_resource = self.my_resource
+                temp_my_resource = my_resource
                 recipe = converge do
-                  instance_eval("#{my_resource} 'foo'")
+                  instance_eval("#{temp_my_resource} 'foo'")
                 end
                 expect(recipe.logged_warnings).to eq ""
                 expect(BaseThingy.created_provider).to eq provider_class
@@ -1399,9 +1399,9 @@ describe "Recipe DSL methods" do
             context "that does not call provides :my_resource" do
               it "my_resource calls the provider (and calls provides?), and emits a warning" do
                 Chef::Config[:treat_deprecation_warnings_as_errors] = false
-                my_resource = self.my_resource
+                temp_my_resource = my_resource
                 recipe = converge do
-                  instance_eval("#{my_resource} 'foo'")
+                  instance_eval("#{temp_my_resource} 'foo'")
                 end
                 expect(recipe.logged_warnings).to include("WARN: #{provider_class}.provides? returned true when asked if it provides DSL #{my_resource}, but provides :#{my_resource} was never called!")
                 expect(BaseThingy.created_provider).to eq provider_class
@@ -1412,7 +1412,7 @@ describe "Recipe DSL methods" do
 
           context "with provides? returning false to my_resource" do
             before do
-              my_resource = self.my_resource
+              temp_my_resource = my_resource
               provider_class.define_singleton_method(:provides?) do |node, resource|
                 @called_provides = true
                 false
@@ -1426,9 +1426,9 @@ describe "Recipe DSL methods" do
 
               it "my_resource fails to find a provider (and calls provides)" do
                 Chef::Config[:treat_deprecation_warnings_as_errors] = false
-                my_resource = self.my_resource
+                temp_my_resource = my_resource
                 expect_converge do
-                  instance_eval("#{my_resource} 'foo'")
+                  instance_eval("#{temp_my_resource} 'foo'")
                 end.to raise_error(Chef::Exceptions::ProviderNotFound)
                 expect(provider_class.called_provides).to be_truthy
               end
@@ -1437,9 +1437,9 @@ describe "Recipe DSL methods" do
             context "that does not provide :my_resource" do
               it "my_resource fails to find a provider (and calls provides)" do
                 Chef::Config[:treat_deprecation_warnings_as_errors] = false
-                my_resource = self.my_resource
+                temp_my_resource = my_resource
                 expect_converge do
-                  instance_eval("#{my_resource} 'foo'")
+                  instance_eval("#{temp_my_resource} 'foo'")
                 end.to raise_error(Chef::Exceptions::ProviderNotFound)
                 expect(provider_class.called_provides).to be_truthy
               end

data/spec/spec_helper.rb

@@ -152,6 +152,10 @@ RSpec.configure do |config|
   config.filter_run_excluding :windows_powershell_no_dsc_only => true unless ! windows_powershell_dsc?
   config.filter_run_excluding :windows_domain_joined_only => true unless windows_domain_joined?
   config.filter_run_excluding :windows_not_domain_joined_only => true if windows_domain_joined?
+  # We think this line was causing rspec tests to not run on the Jenkins windows
+  # testers. If we ever fix it we should restore it.
+  # config.filter_run_excluding :windows_service_requires_assign_token => true if !STDOUT.isatty && !windows_user_right?("SeAssignPrimaryTokenPrivilege")
+  config.filter_run_excluding :windows_service_requires_assign_token => true
   config.filter_run_excluding :solaris_only => true unless solaris?
   config.filter_run_excluding :system_windows_service_gem_only => true unless system_windows_service_gem?
   config.filter_run_excluding :unix_only => true unless unix?