chef 13.12.14-universal-mingw32 → 14.0.190-universal-mingw32

data/spec/integration/recipes/resource_action_spec.rb

@@ -1,5 +1,30 @@
 require "support/shared/integration/integration_helper"
 
+class NoActionJackson < Chef::Resource
+  use_automatic_resource_name
+
+  def foo(value = nil)
+    @foo = value if value
+    @foo
+  end
+
+  class <<self
+    attr_accessor :action_was
+  end
+end
+
+class WeirdActionJackson < Chef::Resource
+  use_automatic_resource_name
+
+  class <<self
+    attr_accessor :action_was
+  end
+
+  action :Straße do
+    WeirdActionJackson.action_was = action
+  end
+end
+
 # Houses any classes we declare
 module ResourceActionSpec
 
@@ -333,19 +358,6 @@ module ResourceActionSpec
     end
 
     context "With a resource with no actions" do
-      class NoActionJackson < Chef::Resource
-        use_automatic_resource_name
-
-        def foo(value = nil)
-          @foo = value if value
-          @foo
-        end
-
-        class <<self
-          attr_accessor :action_was
-        end
-      end
-
       it "the default action is :nothing" do
         converge do
           no_action_jackson "hi" do
@@ -358,18 +370,6 @@ module ResourceActionSpec
     end
 
     context "With a resource with a UTF-8 action" do
-      class WeirdActionJackson < Chef::Resource
-        use_automatic_resource_name
-
-        class <<self
-          attr_accessor :action_was
-        end
-
-        action :Straße do
-          WeirdActionJackson.action_was = action
-        end
-      end
-
       it "Running the action works" do
         expect_recipe do
           weird_action_jackson "hi"
@@ -378,94 +378,6 @@ module ResourceActionSpec
       end
     end
 
-    context "With a resource with property x" do
-      class ResourceActionSpecWithX < Chef::Resource
-        resource_name :resource_action_spec_with_x
-        property :x, default: 20
-        action :set do
-          # Access x during converge to ensure that we emit no warnings there
-          x
-        end
-      end
-
-      context "And another resource with a property x and an action that sets property x to its value" do
-        class ResourceActionSpecAlsoWithX < Chef::Resource
-          resource_name :resource_action_spec_also_with_x
-          property :x
-          action :set_x_to_x do
-            resource_action_spec_with_x "hi" do
-              x x
-            end
-          end
-          def self.x_warning_line
-            __LINE__ - 4
-          end
-          action :set_x_to_x_in_non_initializer do
-            r = resource_action_spec_with_x "hi" do
-              x 10
-            end
-            x_times_2 = r.x * 2
-          end
-          action :set_x_to_10 do
-            resource_action_spec_with_x "hi" do
-              x 10
-            end
-          end
-        end
-
-        attr_reader :x_warning_line
-
-        it "Using the enclosing resource to set x to x emits a warning that you're using the wrong x" do
-          Chef::Config[:treat_deprecation_warnings_as_errors] = false
-          recipe = converge do
-            resource_action_spec_also_with_x "hi" do
-              x 1
-              action :set_x_to_x
-            end
-          end
-          warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
-          expect(warnings.size).to eq 2
-          expect(warnings[0]).to match(/property x is declared in both resource_action_spec_with_x\[hi\] and resource_action_spec_also_with_x\[hi\] action :set_x_to_x. Use new_resource.x instead. At #{__FILE__}:#{ResourceActionSpecAlsoWithX.x_warning_line}/)
-        end
-
-        it "Using the enclosing resource to set x to x outside the initializer emits no warning" do
-          Chef::Config[:treat_deprecation_warnings_as_errors] = false
-          recipe = converge do
-            resource_action_spec_also_with_x "hi" do
-              x 1
-              action :set_x_to_x_in_non_initializer
-            end
-          end
-          warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
-          expect(warnings.size).to eq 1  # the deprecation warning, not the property masking one
-        end
-
-        it "Using the enclosing resource to set x to 10 emits no warning" do
-          Chef::Config[:treat_deprecation_warnings_as_errors] = false
-          recipe = converge do
-            resource_action_spec_also_with_x "hi" do
-              x 1
-              action :set_x_to_10
-            end
-          end
-          warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
-          expect(warnings.size).to eq 1  # the deprecation warning, not the property masking one
-        end
-
-        it "Using the enclosing resource to set x to 10 emits no warning" do
-          Chef::Config[:treat_deprecation_warnings_as_errors] = false
-          recipe = converge do
-            r = resource_action_spec_also_with_x "hi"
-            r.x 1
-            r.action :set_x_to_10
-          end
-          warnings = recipe.logs.lines.select { |l| l =~ /warn/i }
-          expect(warnings.size).to eq 1  # the deprecation warning, not the property masking one
-        end
-      end
-
-    end
-
     context "With a resource with a set_or_return property named group (same name as a resource)" do
       class ResourceActionSpecWithGroupAction < Chef::Resource
         resource_name :resource_action_spec_set_group_to_nil
@@ -504,13 +416,6 @@ module ResourceActionSpec
           end
         end
       end
-
-      it "Raises an error when attempting to use a template in the action" do
-        Chef::Config[:treat_deprecation_warnings_as_errors] = false
-        expect_converge do
-          has_property_named_template "hi"
-        end.to raise_error(/Property `template` of `has_property_named_template\[hi\]` was incorrectly passed a block. Possible property-resource collision. To call a resource named `template` either rename the property or else use `declare_resource\(:template, ...\)`/)
-      end
     end
 
     context "When a resource declares methods in action_class" do

data/spec/spec_helper.rb

@@ -146,11 +146,9 @@ RSpec.configure do |config|
   config.filter_run_excluding :not_supported_on_mac_osx_106 => true if mac_osx_106?
   config.filter_run_excluding :not_supported_on_mac_osx => true if mac_osx?
   config.filter_run_excluding :mac_osx_only => true if !mac_osx?
-  config.filter_run_excluding :not_supported_on_win2k3 => true if windows_win2k3?
   config.filter_run_excluding :not_supported_on_solaris => true if solaris?
   config.filter_run_excluding :not_supported_on_gce => true if gce?
   config.filter_run_excluding :not_supported_on_nano => true if windows_nano_server?
-  config.filter_run_excluding :win2k3_only => true unless windows_win2k3?
   config.filter_run_excluding :win2012r2_only => true unless windows_2012r2?
   config.filter_run_excluding :windows_2008r2_or_later => true unless windows_2008r2_or_later?
   config.filter_run_excluding :windows64_only => true unless windows64?
@@ -186,6 +184,16 @@ RSpec.configure do |config|
   config.filter_run_excluding :broken => true
   config.filter_run_excluding :not_wpar => true unless wpar?
   config.filter_run_excluding :not_supported_under_fips => true if fips?
+  config.filter_run_excluding :rhel => true unless rhel?
+  config.filter_run_excluding :rhel5 => true unless rhel5?
+  config.filter_run_excluding :rhel6 => true unless rhel6?
+  config.filter_run_excluding :rhel7 => true unless rhel7?
+  config.filter_run_excluding :intel_64bit => true unless intel_64bit?
+  config.filter_run_excluding :not_rhel => true if rhel?
+  config.filter_run_excluding :not_rhel5 => true if rhel5?
+  config.filter_run_excluding :not_rhel6 => true if rhel6?
+  config.filter_run_excluding :not_rhel7 => true if rhel7?
+  config.filter_run_excluding :not_intel_64bit => true if intel_64bit?
 
   # these let us use chef: ">= 13" or ruby: "~> 2.0.0" or any other Gem::Dependency-style constraint
   config.filter_run_excluding chef: DependencyProc.with(Chef::VERSION)

data/spec/support/lib/chef/resource/one_two_three_four.rb

@@ -21,8 +21,6 @@ class Chef
     class OneTwoThreeFour < Chef::Resource
       provides :one_two_three_four
 
-      attr_reader :i_can_count
-
       def i_can_count(tf)
         @i_can_count = tf
       end

data/spec/support/lib/chef/resource/zen_master.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2018, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,8 +25,6 @@ class Chef
       provides :zen_master
       allowed_actions :win, :score
 
-      attr_reader :peace
-
       def peace(tf)
         @peace = tf
       end

data/spec/support/mock/constant.rb

@@ -15,7 +15,7 @@ def mock_constants(constants)
   begin
     yield
   ensure
-    constants.each do |constant, val|
+    constants.each_key do |constant|
       source_object, const_name = parse_constant(constant)
       with_warnings(nil) { source_object.const_set(const_name, saved_constants[constant]) }
     end

data/spec/support/platform_helpers.rb

@@ -51,11 +51,6 @@ def windows_domain_joined?
   computer_system["partofdomain"]
 end
 
-def windows_win2k3?
-  return false unless windows?
-  (host_version && host_version.start_with?("5.2"))
-end
-
 def windows_2008r2_or_later?
   return false unless windows?
   return false unless host_version
@@ -164,6 +159,26 @@ def freebsd?
   !!(RUBY_PLATFORM =~ /freebsd/)
 end
 
+def intel_64bit?
+  !!(ohai[:kernel][:machine] == "x86_64")
+end
+
+def rhel?
+  !!(ohai[:platform_family] == "rhel")
+end
+
+def rhel5?
+  rhel? && !!(ohai[:platform_version].to_i == 5)
+end
+
+def rhel6?
+  rhel? && !!(ohai[:platform_version].to_i == 6)
+end
+
+def rhel7?
+  rhel? && !!(ohai[:platform_version].to_i == 7)
+end
+
 def debian_family?
   !!(ohai[:platform_family] == "debian")
 end
@@ -205,8 +220,7 @@ def selinux_enabled?
 end
 
 def suse?
-  ::File.exists?("/etc/SuSE-release") ||
-    ( ::File.exists?("/etc/os-release") && /sles|suse/.match?(File.read("/etc/os-release")) )
+  File.exists?("/etc/SuSE-release")
 end
 
 def root?
@@ -232,6 +246,9 @@ end
 
 class HttpHelper
   extend Ohai::Mixin::HttpHelper
+  def self.logger
+    Chef::Log
+  end
 end
 
 def gce?

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

@@ -20,7 +20,7 @@ shared_context "client" do
   end
 
   let(:ohai_system) do
-    ohai = instance_double("Ohai::System", :all_plugins => true, :data => ohai_data)
+    ohai = instance_double("Ohai::System", :all_plugins => true, :data => ohai_data, logger: logger)
     allow(ohai).to receive(:[]) do |k|
       ohai_data[k]
     end
@@ -37,19 +37,24 @@ shared_context "client" do
   let(:json_attribs) { nil }
   let(:client_opts) { {} }
 
+  let(:stdout) { STDOUT }
+  let(:stderr) { STDERR }
+
   let(:client) do
     Chef::Config[:event_loggers] = []
-    Chef::Client.new(json_attribs, client_opts).tap do |c|
+    allow(Ohai::System).to receive(:new).and_return(ohai_system)
+    opts = client_opts.merge({ logger: logger })
+    Chef::Client.new(json_attribs, opts).tap do |c|
       c.node = node
     end
   end
 
-  before do
-    Chef::Log.logger = Logger.new(StringIO.new)
+  let(:logger) { instance_double("Mixlib::Log::Child", trace: nil, debug: nil, warn: nil, info: nil, error: nil, fatal: nil) }
 
-    # Node/Ohai data
-    #Chef::Config[:node_name] = fqdn
-    allow(Ohai::System).to receive(:new).and_return(ohai_system)
+  before do
+    stub_const("Chef::Client::STDOUT_FD", stdout)
+    stub_const("Chef::Client::STDERR_FD", stderr)
+    allow(client).to receive(:logger).and_return(logger)
   end
 end
 
@@ -162,9 +167,7 @@ shared_context "a client run" do
     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)
+    Chef::Config[:chef_guid] = "default-guid"
 
     stub_rest_clean
     stub_for_register

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

@@ -14,6 +14,56 @@ shared_examples "a completed run" do
     expect(node.automatic_attrs[:platform]).to eq(platform)
     expect(node.automatic_attrs[:platform_version]).to eq(platform_version)
   end
+
+  describe "setting node GUID" do
+    let(:chef_guid_path) { "/tmp/chef_guid" }
+    let(:chef_guid) { "test-test-test" }
+    let(:metadata_file) { "data_collector_metadata.json" }
+    let(:metadata_path) { Pathname.new(File.join(Chef::Config[:file_cache_path], metadata_file)).cleanpath.to_s }
+    let(:file) { instance_double(File) }
+
+    before do
+      Chef::Config[:chef_guid_path] = chef_guid_path
+      Chef::Config[:chef_guid] = nil
+    end
+
+    it "loads from the config" do
+      expect(File).to receive(:exists?).with(chef_guid_path).and_return(true)
+      expect(File).to receive(:read).with(chef_guid_path).and_return(chef_guid)
+      client.run
+      expect(Chef::Config[:chef_guid]).to eql(chef_guid)
+      expect(node.automatic_attrs[:chef_guid]).to eql(chef_guid)
+    end
+
+    it "loads from the data collector config" do
+      expect(File).to receive(:exists?).with(chef_guid_path).and_return(false)
+      expect(Chef::FileCache).to receive(:load).with(metadata_file).and_return("{\"node_uuid\": \"#{chef_guid}\"}")
+
+      expect(File).to receive(:open).with(chef_guid_path, "w+").and_yield(file)
+      expect(file).to receive(:write).with(chef_guid)
+
+      client.run
+      expect(Chef::Config[:chef_guid]).to eql(chef_guid)
+      expect(node.automatic_attrs[:chef_guid]).to eql(chef_guid)
+    end
+
+    it "creates a new one" do
+      expect(File).to receive(:exists?).with(chef_guid_path).and_return(false)
+      expect(File).to receive(:exists?).with(metadata_path).and_return(false)
+
+      expect(SecureRandom).to receive(:uuid).and_return(chef_guid).at_least(:once)
+
+      # we'll try and write the generated UUID to the data collector too, and that's ok
+      allow(File).to receive(:open).with(metadata_path, "w", 420)
+
+      expect(File).to receive(:open).with(chef_guid_path, "w+").and_yield(file)
+      expect(file).to receive(:write).with(chef_guid)
+
+      client.run
+      expect(Chef::Config[:chef_guid]).to eql(chef_guid)
+      expect(node.automatic_attrs[:chef_guid]).to eql(chef_guid)
+    end
+  end
 end
 
 shared_examples "a completed run with audit failure" do

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

@@ -399,7 +399,7 @@ shared_examples_for "a configured file resource" do
     content
   end
 
-  context "when the target file is a symlink", :not_supported_on_win2k3 do
+  context "when the target file is a symlink" do
     let(:symlink_target) do
       File.join(CHEF_SPEC_DATA, "file-test-target")
     end

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

@@ -81,7 +81,7 @@ shared_context "use Windows permissions", :windows_only do
     SID ||= Chef::ReservedNames::Win32::Security::SID
     ACE ||= Chef::ReservedNames::Win32::Security::ACE
     ACL ||= Chef::ReservedNames::Win32::Security::ACL
-    SecurableObject ||= Chef::ReservedNames::Win32::Security::SecurableObject # rubocop:disable Style/ConstantName
+    SecurableObject ||= Chef::ReservedNames::Win32::Security::SecurableObject # rubocop:disable Naming/ConstantName
   end
 
   def get_security_descriptor(path)
@@ -439,7 +439,7 @@ shared_examples_for "a securable resource without existing target" do
 
     context "with a mode attribute" do
       if windows?
-        Security ||= Chef::ReservedNames::Win32::API::Security # rubocop:disable Style/ConstantName
+        Security ||= Chef::ReservedNames::Win32::API::Security # rubocop:disable Naming/ConstantName
       end
 
       it "respects mode in string form as an octal number" do

data/spec/support/shared/integration/knife_support.rb

@@ -83,6 +83,11 @@ module KnifeSupport
         # running test scenarios against a real chef server. If things don't
         # smell right, abort.
 
+        # To ensure that we don't pick up a user's credentials file we lie through our teeth about
+        # it's existence.
+        allow(File).to receive(:file?).and_call_original
+        allow(File).to receive(:file?).with(File.expand_path("~/.chef/credentials")).and_return(false)
+
         $__KNIFE_INTEGRATION_FAILSAFE_CHECK = "ole"
         instance.configure_chef