chef 12.6.0 → 12.7.2

data/spec/support/platforms/prof/gc.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -51,4 +51,3 @@ module RSpec
     end
   end
 end
-

data/spec/support/platforms/prof/win32.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'chef/win32/process'
+require "chef/win32/process"
 
 module RSpec
   module Prof
@@ -43,4 +43,3 @@ module RSpec
     end
   end
 end
-

data/spec/support/platforms/win32/spec_service.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Serdar Sutay (<serdar@lambda.local>)
-# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# Copyright:: Copyright 2013-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require 'win32/daemon'
+require "win32/daemon"
 
 class SpecService < ::Win32::Daemon
   def service_init
@@ -26,7 +26,7 @@ class SpecService < ::Win32::Daemon
   def service_main(*startup_parameters)
     while running? do
       if !File.exists?(@test_service_file)
-        File.open(@test_service_file, 'wb') do |f|
+        File.open(@test_service_file, "wb") do |f|
           f.write("This file is created by SpecService")
         end
       end

data/spec/support/shared/context/client.rb

@@ -1,5 +1,5 @@
 
-require 'spec_helper'
+require "spec_helper"
 
 # Stubs a basic client object
 shared_context "client" do
@@ -15,7 +15,7 @@ shared_context "client" do
       :hostname =>         hostname,
       :machinename =>      machinename,
       :platform =>         platform,
-      :platform_version => platform_version
+      :platform_version => platform_version,
     }
   end
 
@@ -68,9 +68,10 @@ shared_context "a client run" do
   let(:api_client_exists?) { false }
   let(:enable_fork)        { false }
 
-  let(:http_cookbook_sync) { double("Chef::REST (cookbook sync)") }
-  let(:http_node_load)     { double("Chef::REST (node)") }
-  let(:http_node_save)     { double("Chef::REST (node save)") }
+  let(:http_cookbook_sync) { double("Chef::ServerAPI (cookbook sync)") }
+  let(:http_node_load)     { double("Chef::ServerAPI (node)") }
+  let(:http_node_save)     { double("Chef::ServerAPI (node save)") }
+  let(:reporting_rest_client) { double("Chef::ServerAPI (reporting client)") }
 
   let(:runner)       { instance_double("Chef::Runner") }
   let(:audit_runner) { instance_double("Chef::Audit::Runner", :failed? => false) }
@@ -93,10 +94,11 @@ shared_context "a client run" do
 
   def stub_for_node_load
     #   Client.register will then turn around create another
-    #   Chef::REST object, this time with the client key it got from the
+    #   Chef::ServerAPI object, this time with the client key it got from the
     #   previous step.
-    expect(Chef::REST).to receive(:new).
-      with(Chef::Config[:chef_server_url], fqdn, Chef::Config[:client_key]).
+    expect(Chef::ServerAPI).to receive(:new).
+      with(Chef::Config[:chef_server_url], client_name: fqdn,
+                                           signing_key_filename: Chef::Config[:client_key]).
       exactly(:once).
       and_return(http_node_load)
 
@@ -110,14 +112,18 @@ shared_context "a client run" do
     expect_any_instance_of(Chef::ResourceReporter).to receive(:node_load_completed)
   end
 
+  def stub_rest_clean
+    allow(client).to receive(:rest_clean).and_return(reporting_rest_client)
+  end
+
   def stub_for_sync_cookbooks
     # --Client#setup_run_context
     # ---Client#sync_cookbooks -- downloads the list of cookbooks to sync
     #
     expect_any_instance_of(Chef::CookbookSynchronizer).to receive(:sync_cookbooks)
-    expect(Chef::REST).to receive(:new).with(Chef::Config[:chef_server_url]).and_return(http_cookbook_sync)
+    expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_url]).and_return(http_cookbook_sync)
     expect(http_cookbook_sync).to receive(:post).
-      with("environments/_default/cookbook_versions", {:run_list => []}).
+      with("environments/_default/cookbook_versions", { :run_list => [] }).
       and_return({})
   end
 
@@ -139,13 +145,14 @@ shared_context "a client run" do
 
   before do
     Chef::Config[:client_fork] = enable_fork
-    Chef::Config[:cache_path] = windows? ? 'C:\chef' : '/var/chef'
+    Chef::Config[:cache_path] = windows? ? 'C:\chef' : "/var/chef"
     Chef::Config[:why_run] = false
     Chef::Config[:audit_mode] = :enabled
 
     stub_const("Chef::Client::STDOUT_FD", stdout)
     stub_const("Chef::Client::STDERR_FD", stderr)
 
+    stub_rest_clean
     stub_for_register
     stub_for_node_load
     stub_for_sync_cookbooks
@@ -175,8 +182,9 @@ shared_context "converge completed" do
     allow(node).to receive(:data_for_save).and_return(node.for_json)
 
     # --Client#save_updated_node
-    expect(Chef::REST).to receive(:new).with(Chef::Config[:chef_server_url], fqdn, Chef::Config[:client_key], validate_utf8: false).and_return(http_node_save)
-    expect(http_node_save).to receive(:put_rest).with("nodes/#{fqdn}", node.for_json).and_return(true)
+    expect(Chef::ServerAPI).to receive(:new).with(Chef::Config[:chef_server_url], client_name: fqdn,
+                                                                                  signing_key_filename: Chef::Config[:client_key], validate_utf8: false).and_return(http_node_save)
+    expect(http_node_save).to receive(:put).with("nodes/#{fqdn}", node.for_json).and_return(true)
   end
 end
 
@@ -223,7 +231,7 @@ end
 
 shared_context "audit phase completed with failed controls" do
   let(:audit_runner) { instance_double("Chef::Audit::Runner", :failed? => true,
-    :num_failed => 1, :num_total => 3) }
+                                                              :num_failed => 1, :num_total => 3) }
 
   let(:audit_error) do
     err = Chef::Exceptions::AuditsFailed.new(audit_runner.num_failed, audit_runner.num_total)

data/spec/support/shared/context/config.rb

@@ -5,15 +5,15 @@
 #
 
 # Required chef files here:
-require 'chef/config'
+require "chef/config"
 
 # Required spec files here:
-require 'spec_helper'
+require "spec_helper"
 
 # Basic config. Nothing fancy.
 shared_context "default config options" do
   before do
-    Chef::Config[:cache_path] = windows? ? 'C:\chef' : '/var/chef'
+    Chef::Config[:cache_path] = windows? ? 'C:\chef' : "/var/chef"
   end
 
   # Don't need to have an after block to reset the config...

data/spec/support/shared/context/win32.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
+# Copyright:: Copyright 2015-2016, Chef Software, Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,17 +18,17 @@
 RSpec.shared_context "Win32" do
   before(:all) do
     @original_win32 = if defined?(Win32)
-      win32 = Object.send(:const_get, 'Win32')
-      Object.send(:remove_const, 'Win32')
-      win32
-    else
-      nil
-    end
+                        win32 = Object.send(:const_get, "Win32")
+                        Object.send(:remove_const, "Win32")
+                        win32
+                      else
+                        nil
+                      end
     Win32 = Module.new
   end
 
   after(:all) do
-    Object.send(:remove_const, 'Win32') if defined?(Win32)
-    Object.send(:const_set, 'Win32', @original_win32) if @original_win32
+    Object.send(:remove_const, "Win32") if defined?(Win32)
+    Object.send(:const_set, "Win32", @original_win32) if @original_win32
   end
 end

data/spec/support/shared/examples/client.rb

@@ -1,6 +1,6 @@
 
-require 'spec_helper'
-require 'spec/support/shared/context/client'
+require "spec_helper"
+require "spec/support/shared/context/client"
 
 # requires platform and platform_version be defined
 shared_examples "a completed run" do
@@ -24,7 +24,7 @@ shared_examples "a completed run with audit failure" do
   end
 
   it "converges, runs audits, saves the node and raises the error in a wrapping error" do
-    expect{ client.run }.to raise_error(Chef::Exceptions::RunFailedWrappingError) do |error|
+    expect { client.run }.to raise_error(Chef::Exceptions::RunFailedWrappingError) do |error|
       expect(error.wrapped_errors.size).to eq(run_errors.size)
       run_errors.each do |run_error|
         expect(error.wrapped_errors).to include(run_error)
@@ -42,7 +42,7 @@ shared_examples "a failed run" do
   include_context "run failed"
 
   it "skips node save and raises the error in a wrapping error" do
-    expect{ client.run }.to raise_error(Chef::Exceptions::RunFailedWrappingError) do |error|
+    expect { client.run }.to raise_error(Chef::Exceptions::RunFailedWrappingError) do |error|
       expect(error.wrapped_errors.size).to eq(run_errors.size)
       run_errors.each do |run_error|
         expect(error.wrapped_errors).to include(run_error)

data/spec/support/shared/functional/diff_disabled.rb

@@ -1,5 +1,5 @@
 
-shared_context "diff disabled"  do
+shared_context "diff disabled" do
   before do
     Chef::Config[:diff_disabled] = true
   end

data/spec/support/shared/functional/directory_resource.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,7 +20,7 @@ shared_examples_for "a directory resource" do
 
   include_context "diff disabled"
 
-  let(:expect_updated?) {true}
+  let(:expect_updated?) { true }
 
   context "when the target directory does not exist" do
     before do
@@ -48,7 +48,7 @@ shared_examples_for "a directory resource" do
           expect(File).not_to exist(path)
 
           resource.recursive(true)
-          @recursive_path = File.join(path, 'red-headed-stepchild')
+          @recursive_path = File.join(path, "red-headed-stepchild")
           resource.path(@recursive_path)
           resource.run_action(:create)
         end
@@ -68,14 +68,14 @@ shared_examples_for "a directory resource" do
     def allowed_acl(sid, expected_perms)
       [
        ACE.access_allowed(sid, expected_perms[:specific]),
-       ACE.access_allowed(sid, expected_perms[:generic], (Chef::ReservedNames::Win32::API::Security::INHERIT_ONLY_ACE | Chef::ReservedNames::Win32::API::Security::CONTAINER_INHERIT_ACE | Chef::ReservedNames::Win32::API::Security::OBJECT_INHERIT_ACE))
+       ACE.access_allowed(sid, expected_perms[:generic], (Chef::ReservedNames::Win32::API::Security::INHERIT_ONLY_ACE | Chef::ReservedNames::Win32::API::Security::CONTAINER_INHERIT_ACE | Chef::ReservedNames::Win32::API::Security::OBJECT_INHERIT_ACE)),
       ]
     end
 
     def denied_acl(sid, expected_perms)
       [
        ACE.access_denied(sid, expected_perms[:specific]),
-       ACE.access_denied(sid, expected_perms[:generic], (Chef::ReservedNames::Win32::API::Security::INHERIT_ONLY_ACE | Chef::ReservedNames::Win32::API::Security::CONTAINER_INHERIT_ACE | Chef::ReservedNames::Win32::API::Security::OBJECT_INHERIT_ACE))
+       ACE.access_denied(sid, expected_perms[:generic], (Chef::ReservedNames::Win32::API::Security::INHERIT_ONLY_ACE | Chef::ReservedNames::Win32::API::Security::CONTAINER_INHERIT_ACE | Chef::ReservedNames::Win32::API::Security::OBJECT_INHERIT_ACE)),
       ]
     end
 
@@ -133,7 +133,7 @@ shared_examples_for "a directory resource" do
 
       context "with the recursive option" do
         before do
-          FileUtils.mkdir(File.join(path, 'red-headed-stepchild'))
+          FileUtils.mkdir(File.join(path, "red-headed-stepchild"))
           resource.recursive(true)
           resource.run_action(:delete)
         end
@@ -152,7 +152,7 @@ shared_context Chef::Resource::Directory do
   # deployment strategies more completely.
   let(:test_file_dir) do
     if windows?
-      File.join(ENV['systemdrive'], "test-dir")
+      File.join(ENV["systemdrive"], "test-dir")
     else
       File.join(CHEF_SPEC_DATA, "test-dir")
     end

data/spec/support/shared/functional/file_resource.rb

@@ -1,6 +1,6 @@
 #
-# Author:: Seth Chisamore (<schisamo@opscode.com>)
-# Copyright:: Copyright (c) 2011 Opscode, Inc.
+# Author:: Seth Chisamore (<schisamo@chef.io>)
+# Copyright:: Copyright 2011-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -44,7 +44,6 @@ shared_context "deploying via destdir" do
   end
 end
 
-
 shared_examples_for "a file with the wrong content" do
   before do
     # Assert starting state is as expected
@@ -103,7 +102,7 @@ shared_examples_for "a file with the wrong content" do
         end
 
         it "raises an exception" do
-          expect{ resource.run_action(:create) }.to raise_error(Chef::Exceptions::ChecksumMismatch)
+          expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::ChecksumMismatch)
         end
       end
     end
@@ -144,7 +143,7 @@ shared_examples_for "a file with the wrong content" do
   end
 
   context "when diff is enabled" do
-    describe 'sensitive attribute' do
+    describe "sensitive attribute" do
       context "should be insensitive by default" do
         it { expect(resource.sensitive).to(be_falsey) }
       end
@@ -165,7 +164,7 @@ shared_examples_for "a file with the wrong content" do
           end
 
           it "should suppress the diff" do
-            expect(resource.diff).to(include('suppressed sensitive resource'))
+            expect(resource.diff).to(include("suppressed sensitive resource"))
             expect(reporter_messages[1]).to eq("suppressed sensitive resource")
           end
 
@@ -308,14 +307,14 @@ shared_examples_for "a file resource" do
 
   describe "when setting atomic_update" do
     it "booleans should work" do
-      expect {resource.atomic_update(true)}.not_to raise_error
-      expect {resource.atomic_update(false)}.not_to raise_error
+      expect { resource.atomic_update(true) }.not_to raise_error
+      expect { resource.atomic_update(false) }.not_to raise_error
     end
 
     it "anything else should raise an error" do
-      expect {resource.atomic_update(:copy)}.to raise_error(ArgumentError)
-      expect {resource.atomic_update(:move)}.to raise_error(ArgumentError)
-      expect {resource.atomic_update(958)}.to raise_error(ArgumentError)
+      expect { resource.atomic_update(:copy) }.to raise_error(ArgumentError)
+      expect { resource.atomic_update(:move) }.to raise_error(ArgumentError)
+      expect { resource.atomic_update(958) }.to raise_error(ArgumentError)
     end
   end
 
@@ -351,13 +350,13 @@ shared_examples_for "file resource not pointing to a real file" do
 
   describe "when force_unlink is set to false" do
     it ":create raises an error" do
-      expect {resource.run_action(:create) }.to raise_error(Chef::Exceptions::FileTypeMismatch)
+      expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::FileTypeMismatch)
     end
   end
 
   describe "when force_unlink is not set (default)" do
     it ":create raises an error" do
-      expect {resource.run_action(:create) }.to raise_error(Chef::Exceptions::FileTypeMismatch)
+      expect { resource.run_action(:create) }.to raise_error(Chef::Exceptions::FileTypeMismatch)
     end
   end
 end
@@ -405,7 +404,6 @@ shared_examples_for "a configured file resource" do
       File.join(CHEF_SPEC_DATA, "file-test-target")
     }
 
-
     describe "when configured not to manage symlink's target" do
       before(:each) do
         # configure not to manage symlink source
@@ -574,7 +572,6 @@ shared_examples_for "a configured file resource" do
             File.open(path, "wb") { |f| f.write(expected_content) }
           end
 
-
           include_context "setup broken permissions"
 
           include_examples "a securable resource with existing target"
@@ -721,7 +718,7 @@ shared_examples_for "a configured file resource" do
     it_behaves_like "file resource not pointing to a real file"
   end
 
-  context "when the target file is a blockdev",:unix_only, :requires_root, :not_supported_on_solaris do
+  context "when the target file is a blockdev", :unix_only, :requires_root, :not_supported_on_solaris do
     include Chef::Mixin::ShellOut
     let(:path) do
       File.join(CHEF_SPEC_DATA, "testdev")
@@ -739,7 +736,7 @@ shared_examples_for "a configured file resource" do
     it_behaves_like "file resource not pointing to a real file"
   end
 
-  context "when the target file is a chardev",:unix_only, :requires_root, :not_supported_on_solaris do
+  context "when the target file is a chardev", :unix_only, :requires_root, :not_supported_on_solaris do
     include Chef::Mixin::ShellOut
     let(:path) do
       File.join(CHEF_SPEC_DATA, "testdev")
@@ -757,7 +754,7 @@ shared_examples_for "a configured file resource" do
     it_behaves_like "file resource not pointing to a real file"
   end
 
-  context "when the target file is a pipe",:unix_only do
+  context "when the target file is a pipe", :unix_only do
     include Chef::Mixin::ShellOut
     let(:path) do
       File.join(CHEF_SPEC_DATA, "testpipe")
@@ -775,8 +772,8 @@ shared_examples_for "a configured file resource" do
     it_behaves_like "file resource not pointing to a real file"
   end
 
-  context "when the target file is a socket",:unix_only do
-    require 'socket'
+  context "when the target file is a socket", :unix_only do
+    require "socket"
 
     # It turns out that the path to a socket can have at most ~104
     # bytes. Therefore we are creating our sockets in tmpdir so that
@@ -1018,16 +1015,16 @@ shared_examples_for "a configured file resource" do
 
 end
 
-shared_context Chef::Resource::File  do
+shared_context Chef::Resource::File do
   if windows?
-    require 'chef/win32/file'
+    require "chef/win32/file"
   end
 
   # We create the files in a different directory than tmp to exercise
   # different file deployment strategies more completely.
   let(:test_file_dir) do
     if windows?
-      File.join(ENV['systemdrive'], "test-dir")
+      File.join(ENV["systemdrive"], "test-dir")
     else
       File.join(CHEF_SPEC_DATA, "test-dir")
     end