chef 12.18.31 → 13.0.118

data/lib/chef/win32/registry.rb

@@ -170,7 +170,7 @@ class Chef
         rescue Chef::Exceptions::Win32RegHiveMissing => e
           return false
         end
-        return true
+        true
       end
 
       def has_subkeys?(key_path)
@@ -179,7 +179,7 @@ class Chef
         hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg|
           reg.each_key { |key| return true }
         end
-        return false
+        false
       end
 
       def get_subkeys(key_path)
@@ -189,7 +189,7 @@ class Chef
         hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg|
           reg.each_key { |current_key| subkeys << current_key }
         end
-        return subkeys
+        subkeys
       end
 
       # 32-bit chef clients running on 64-bit machines will default to reading the 64-bit registry
@@ -204,7 +204,7 @@ class Chef
         hive.open(key, ::Win32::Registry::KEY_READ | registry_system_architecture) do |reg|
           return true if reg.any? { |val| safely_downcase(val) == safely_downcase(value[:name]) }
         end
-        return false
+        false
       end
 
       def data_exists?(key_path, value)
@@ -219,7 +219,7 @@ class Chef
             end
           end
         end
-        return false
+        false
       end
 
       def value_exists!(key_path, value)
@@ -249,7 +249,7 @@ class Chef
             end
           end
         end
-        return false
+        false
       end
 
       def type_matches!(key_path, value)
@@ -279,7 +279,7 @@ class Chef
         if val.is_a? String
           return val.downcase
         end
-        return val
+        val
       end
 
       def node
@@ -316,7 +316,7 @@ class Chef
 
         raise Chef::Exceptions::Win32RegHiveMissing, "Registry Hive #{hive_name} does not exist" unless hive
 
-        return hive, key
+        [hive, key]
       end
 
       def _type_name_map
@@ -345,7 +345,7 @@ class Chef
           5 => ::Win32::Registry::REG_DWORD_BIG_ENDIAN,
           11 => ::Win32::Registry::REG_QWORD,
         }[val_type]
-        return value
+        value
       end
 
       def create_missing(key_path)

data/lib/chef/win32/security/acl.rb

@@ -48,7 +48,7 @@ class Chef
           0.upto(length - 1) do |i|
             return false if self[i] != other[i]
           end
-          return true
+          true
         end
 
         def pointer
@@ -88,7 +88,7 @@ class Chef
         end
 
         def to_s
-          "[#{self.collect { |ace| ace.to_s }.join(", ")}]"
+          "[#{collect { |ace| ace.to_s }.join(", ")}]"
         end
 
         def self.align_dword(size)

data/lib/chef/win32/security/sid.rb

@@ -59,6 +59,11 @@ class Chef
           Chef::ReservedNames::Win32::Security.lookup_account_sid(self)
         end
 
+        def account_simple_name
+          domain, name, use = account
+          name
+        end
+
         def account_name
           domain, name, use = account
           (!domain.nil? && domain.length > 0) ? "#{domain}\\#{name}" : name

data/lib/chef/win32/security.rb

@@ -239,7 +239,7 @@ class Chef
         security_descriptor = FFI::MemoryPointer.new :pointer
         hr = GetNamedSecurityInfoW(path.to_wstring, type, info, nil, nil, nil, nil, security_descriptor)
         if hr != ERROR_SUCCESS
-          Chef::ReservedNames::Win32::Error.raise!("get_named_security_info(#{path}, #{type}, #{info})")
+          Chef::ReservedNames::Win32::Error.raise!("get_named_security_info(#{path}, #{type}, #{info})", hr)
         end
 
         result_pointer = security_descriptor.read_pointer
@@ -538,7 +538,7 @@ class Chef
 
         hr = SetNamedSecurityInfoW(path.to_wstring, type, security_information, owner, group, dacl, sacl)
         if hr != ERROR_SUCCESS
-          Chef::ReservedNames::Win32::Error.raise!
+          Chef::ReservedNames::Win32::Error.raise! nil, hr
         end
       end
 

data/lib/chef/win32/unicode.rb

@@ -40,13 +40,13 @@ module FFI
         last_char = nil
         while last_char != "\000\000"
           length += 1
-          last_char = self.get_bytes(0, length * 2)[-2..-1]
+          last_char = get_bytes(0, length * 2)[-2..-1]
         end
 
         num_wchars = length
       end
 
-      wide_to_utf8(self.get_bytes(0, num_wchars * 2))
+      wide_to_utf8(get_bytes(0, num_wchars * 2))
     end
   end
 end

data/lib/chef/win32/version.rb

@@ -100,7 +100,7 @@ class Chef
 
       define_method(:marketing_name) do
         marketing_names.each do |mn|
-          break mn[0] if self.send(mn[1])
+          break mn[0] if send(mn[1])
         end
       end
 

data/lib/chef.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,6 @@ require "chef/log"
 require "chef/config"
 require "chef/providers"
 require "chef/resources"
-require "chef/shell_out"
 
 require "chef/daemon"
 

data/spec/data/cookbooks/openldap/templates/default/openldap_nested_variable_stuff.erb

@@ -0,0 +1 @@
+super secret is <%= @secret.first["key"] -%>

data/spec/data/lwrp/providers/buck_passer.rb

@@ -10,7 +10,7 @@ def without_deprecation_warnings(&block)
   end
 end
 
-action :pass_buck do
+def action_pass_buck
   lwrp_foo :prepared_thumbs do
     action :prepare_thumbs
     # We know there will be a deprecation error here; head it off

data/spec/data/lwrp/providers/buck_passer_2.rb

@@ -8,7 +8,7 @@ def without_deprecation_warnings(&block)
   end
 end
 
-action :pass_buck do
+def action_pass_buck
   lwrp_bar :prepared_eyes do
     action :prepare_eyes
     # We know there will be a deprecation error here; head it off

data/spec/data/lwrp/providers/embedded_resource_accesses_providers_scope.rb

@@ -13,7 +13,7 @@ def without_deprecation_warnings(&block)
   end
 end
 
-action :twiddle_thumbs do
+def action_twiddle_thumbs
   @enclosed_resource = lwrp_foo :foo do
     monkey generate_new_name(new_resource.monkey){ 'the monkey' }
     # We know there will be a deprecation error here; head it off

data/spec/data/lwrp/providers/inline_compiler.rb

@@ -1,6 +1,4 @@
 
-use_inline_resources
-
 action :test do
 
   ruby_block "interior-ruby-block-1" do

data/spec/data/lwrp/resources/buck_passer.rb

@@ -0,0 +1,5 @@
+
+provides :buck_passer
+
+default_action :pass_buck
+actions :pass_buck

data/spec/data/lwrp/resources/buck_passer_2.rb

@@ -0,0 +1,3 @@
+
+default_action :pass_buck
+actions :pass_buck

data/spec/data/lwrp/resources/embedded_resource_accesses_providers_scope.rb

@@ -0,0 +1,3 @@
+
+default_action :twiddle_thumbs
+actions :twiddle_thumbs

data/spec/data/lwrp/resources/inline_compiler.rb

@@ -0,0 +1,3 @@
+
+default_action :test
+actions :test, :no_updates

data/spec/data/lwrp/resources/monkey_name_printer.rb

@@ -0,0 +1,5 @@
+
+property :monkey
+
+default_action :twiddle_thumbs
+actions :twiddle_thumbs

data/spec/data/lwrp/resources/paint_drying_watcher.rb

@@ -0,0 +1,3 @@
+
+default_action :prepare_eyes
+actions :prepare_eyes, :watch_paint_dry

data/spec/data/lwrp/resources/thumb_twiddler.rb

@@ -0,0 +1,3 @@
+
+default_action :prepare_thumbs
+actions :prepare_thumbs, :twiddle_thumbs

data/spec/data/prefer_metadata_json/metadata.json

@@ -0,0 +1,51 @@
+{
+  "name": "prefer_metadata_json",
+  "description": "",
+  "long_description": "",
+  "maintainer": null,
+  "maintainer_email": null,
+  "license": "All rights reserved",
+  "platforms": {
+
+  },
+  "dependencies": {
+
+  },
+  "recommendations": {
+
+  },
+  "suggestions": {
+
+  },
+  "conflicting": {
+
+  },
+  "providing": {
+
+  },
+  "replacing": {
+
+  },
+  "attributes": {
+
+  },
+  "groupings": {
+
+  },
+  "recipes": {
+
+  },
+  "version": "1.2.3",
+  "source_url": "",
+  "issues_url": "",
+  "privacy": false,
+  "chef_versions": [
+
+  ],
+  "ohai_versions": [
+
+  ],
+  "gems": [
+
+  ]
+}

data/spec/data/prefer_metadata_json/metadata.rb

@@ -0,0 +1,6 @@
+# these deliberately do not match metadata.json
+name "test"
+version "0.0.1"
+
+# this raises hard if anything even tries to parse it
+raise "TEH SADNESS"

data/spec/data/root_alias_cookbooks/dup_attr/attributes/default.rb

@@ -0,0 +1 @@
+default["aliased"]["attr"] = "other"

data/spec/data/root_alias_cookbooks/dup_attr/attributes.rb

@@ -0,0 +1 @@
+default["aliased"]["attr"] = "value"

data/spec/data/root_alias_cookbooks/dup_attr/metadata.rb

@@ -0,0 +1,2 @@
+name "dup_attr"
+version "1.0.0"

data/spec/data/root_alias_cookbooks/dup_attr/recipe.rb

@@ -0,0 +1,3 @@
+ruby_block "root alias" do
+  block { }
+end

data/spec/data/root_alias_cookbooks/dup_recipe/attributes.rb

@@ -0,0 +1 @@
+default["aliased"]["attr"] = "value"

data/spec/data/root_alias_cookbooks/dup_recipe/metadata.rb

@@ -0,0 +1,2 @@
+name "dup_recipe"
+version "1.0.0"

data/spec/data/root_alias_cookbooks/dup_recipe/recipe.rb

@@ -0,0 +1,3 @@
+ruby_block "root alias" do
+  block { }
+end

data/spec/data/root_alias_cookbooks/dup_recipe/recipes/default.rb

@@ -0,0 +1,3 @@
+ruby_block "other" do
+  block { }
+end

data/spec/data/root_alias_cookbooks/simple/attributes.rb

@@ -0,0 +1 @@
+default["aliased"]["attr"] = "value"

data/spec/data/root_alias_cookbooks/simple/metadata.rb

@@ -0,0 +1,2 @@
+name "simple"
+version "1.0.0"

data/spec/data/root_alias_cookbooks/simple/recipe.rb

@@ -0,0 +1,3 @@
+ruby_block "root alias" do
+  block { }
+end

data/spec/data/shef-config.rb

@@ -1,10 +1,11 @@
-Ohai::Config[:disabled_plugins] << 'darwin::system_profiler' << 'darwin::kernel' << 'darwin::ssh_host_key' << 'network_listeners' 
-Ohai::Config[:disabled_plugins] <<  "virtualization" << "darwin::virtualization"
-Ohai::Config[:disabled_plugins] << 'darwin::uptime' << 'darwin::filesystem' << 'dmi' << 'lanuages' << 'perl' << 'python' << 'java' 
-Ohai::Config[:disabled_plugins] << "linux::block_device" << "linux::kernel" << "linux::ssh_host_key" << "linux::virtualization"
-Ohai::Config[:disabled_plugins] << "linux::cpu" << "linux::memory" << "ec2" << "rackspace" << "eucalyptus" << "ip_scopes"
-Ohai::Config[:disabled_plugins] << "solaris2::cpu" << "solaris2::dmi" << "solaris2::filesystem" << "solaris2::kernel"
-Ohai::Config[:disabled_plugins] << "solaris2::virtualization" << "solaris2::zpools"
-Ohai::Config[:disabled_plugins] << 'c' << 'php' << 'mono' << 'groovy' << 'lua' << 'erlang'
-Ohai::Config[:disabled_plugins] << "kernel" << "linux::filesystem" << "ruby"
-
+ohai[:disabled_plugins] << "darwin::system_profiler" << "darwin::kernel" << "darwin::ssh_host_key" << "network_listeners"
+ohai[:disabled_plugins] << "virtualization" << "darwin::virtualization"
+ohai[:disabled_plugins] << "darwin::uptime" << "darwin::filesystem" << "dmi" << "lanuages" << "perl" << "python" << "java"
+ohai[:disabled_plugins] << "linux::block_device" << "linux::kernel" << "linux::ssh_host_key" << "linux::virtualization"
+ohai[:disabled_plugins] << "linux::cpu" << "linux::memory" << "ec2" << "rackspace" << "eucalyptus" << "ip_scopes"
+ohai[:disabled_plugins] << "solaris2::cpu" << "solaris2::dmi" << "solaris2::filesystem" << "solaris2::kernel"
+ohai[:disabled_plugins] << "solaris2::virtualization" << "solaris2::zpools"
+ohai[:disabled_plugins] << "c" << "php" << "mono" << "groovy" << "lua" << "erlang"
+ohai[:disabled_plugins] << "kernel" << "linux::filesystem" << "ruby"
+chef_repo_path File.dirname(__FILE__)
+cookbook_path  "#{chef_repo_path}/cookbooks"

data/spec/functional/knife/ssh_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2010-2016, Chef Software Inc.
+# Copyright:: Copyright 2010-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -181,7 +181,7 @@ describe Chef::Knife::Ssh do
 
       it "uses the ssh_attribute" do
         @knife.run
-        expect(@knife.get_ssh_attribute(Chef::Node.new)).to eq("ec2.public_hostname")
+        expect(@knife.get_ssh_attribute({ "knife_config" => "ec2.public_hostname" })).to eq("ec2.public_hostname")
       end
     end
 
@@ -193,11 +193,11 @@ describe Chef::Knife::Ssh do
 
       it "uses the default" do
         @knife.run
-        expect(@knife.get_ssh_attribute(Chef::Node.new)).to eq("fqdn")
+        expect(@knife.get_ssh_attribute({ "fqdn" => "fqdn" })).to eq("fqdn")
       end
     end
 
-    context "when -a ec2.public_ipv4 is provided" do
+    context "when -a ec2.public_public_hostname is provided" do
       before do
         setup_knife(["-a ec2.public_hostname", "*:*", "uptime"])
         Chef::Config[:knife][:ssh_attribute] = nil
@@ -246,6 +246,34 @@ describe Chef::Knife::Ssh do
       end
     end
 
+    context "when knife[:ssh_gateway_identity] is set" do
+      before do
+        setup_knife(["*:*", "uptime"])
+        Chef::Config[:knife][:ssh_gateway] = "user@ec2.public_hostname"
+        Chef::Config[:knife][:ssh_gateway_identity] = "~/.ssh/aws-gateway.rsa"
+      end
+
+      it "uses the ssh_gateway_identity file" do
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), :keys_only => true })
+        @knife.run
+        expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
+      end
+    end
+
+    context "when -ssh-gateway-identity is provided and knife[:ssh_gateway] is set" do
+      before do
+        setup_knife(["--ssh-gateway-identity", "~/.ssh/aws-gateway.rsa", "*:*", "uptime"])
+        Chef::Config[:knife][:ssh_gateway] = "user@ec2.public_hostname"
+        Chef::Config[:knife][:ssh_gateway_identity] = nil
+      end
+
+      it "uses the ssh_gateway_identity file" do
+        expect(@knife.session).to receive(:via).with("ec2.public_hostname", "user", { :keys => File.expand_path("#{ENV['HOME']}/.ssh/aws-gateway.rsa").squeeze("/"), :keys_only => true })
+        @knife.run
+        expect(@knife.config[:ssh_gateway_identity]).to eq("~/.ssh/aws-gateway.rsa")
+      end
+    end
+
     context "when the gateway requires a password" do
       before do
         setup_knife(["-G user@ec2.public_hostname", "*:*", "uptime"])
@@ -276,8 +304,8 @@ describe Chef::Knife::Ssh do
     Chef::Config[:client_key] = nil
     Chef::Config[:chef_server_url] = "http://localhost:9000"
 
-    @api.get("/search/node?q=*:*&sort=X_CHEF_id_CHEF_X%20asc&start=0", 200) do
-      %({"total":1, "start":0, "rows":[{"name":"i-xxxxxxxx", "json_class":"Chef::Node", "automatic":{"fqdn":"the.fqdn", "ec2":{"public_hostname":"the_public_hostname"}},"recipes":[]}]})
+    @api.post("/search/node?q=*:*&start=0", 200) do
+      %({"total":1, "start":0, "rows":[{"data": {"fqdn":"the.fqdn", "config": "the_public_hostname", "knife_config": "the_public_hostname" }}]})
     end
   end
 

data/spec/functional/rebooter_spec.rb

@@ -72,6 +72,7 @@ describe Chef::Platform::Rebooter do
         def test_rebooter_method(method_sym, is_windows, expected_reboot_str)
           allow(ChefConfig).to receive(:windows?).and_return(is_windows)
           expect(rebooter).to receive(:shell_out!).once.with(expected_reboot_str)
+          expect(rebooter).to receive(:raise).with(Chef::Exceptions::Reboot)
           expect(rebooter).to receive(method_sym).once.and_call_original
           rebooter.send(method_sym, run_context.node)
         end

data/spec/functional/resource/bash_spec.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Serdar Sutay (<serdar@chef.io>)
-# Copyright:: Copyright 2014-2016, Chef Software Inc.
+# Copyright:: Copyright 2014-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,59 +23,25 @@ describe Chef::Resource::Bash, :unix_only do
   let(:code) { "echo hello" }
   let(:resource) do
     resource = Chef::Resource::Bash.new("foo_resource", run_context)
-    resource.code(code)
+    resource.code(code) unless code.nil?
     resource
   end
 
   describe "when setting the command attribute" do
     let (:command) { "wizard racket" }
 
-    # in Chef-12 the `command` attribute is largely useless, but does set the identity attribute
-    # so that notifications need to target the value of the command.  it will not run the `command`
-    # and if it is given without a code block then it does nothing and always succeeds.
-    describe "in Chef-12", chef: "< 13" do
-      it "gets the commmand attribute from the name" do
-        expect(resource.command).to eql("foo_resource")
-      end
-
-      it "sets the resource identity to the command name" do
-        resource.command command
-        expect(resource.identity).to eql(command)
-      end
-
-      it "warns when the code is not present and a useless `command` is present" do
-        expect(Chef::Log).to receive(:warn).with(/coding error/)
-        expect(Chef::Log).to receive(:warn).with(/deprecated/)
-        resource.code nil
-        resource.command command
-        expect { resource.run_action(:run) }.not_to raise_error
-      end
-
-      describe "when the code is not present" do
-        let(:code) { nil }
-        it "warns" do
-          expect(Chef::Log).to receive(:warn)
-          expect { resource.run_action(:run) }.not_to raise_error
-        end
-      end
+    it "should raise an exception when trying to set the command" do
+      expect { resource.command command }.to raise_error(Chef::Exceptions::Script)
     end
 
-    # in Chef-13 the `command` attribute needs to be for internal use only
-    describe "in Chef-13", chef: ">= 13" do
-      it "should raise an exception when trying to set the command" do
-        expect { resource.command command }.to raise_error # FIXME: add a real error in Chef-13
-      end
-
-      it "should initialize the command to nil" do
-        expect(resource.command).to be_nil
-      end
+    it "should initialize the command to nil" do
+      expect(resource.command).to be_nil
+    end
 
-      describe "when the code is not present" do
-        let(:code) { nil }
-        it "raises an exception" do
-          expect { resource.run_action(:run) }.to raise_error # FIXME: add a real error in Chef-13
-          expect { resource.run_action(:run) }.not_to raise_error
-        end
+    describe "when the code is not present" do
+      let(:code) { nil }
+      it "raises an exception" do
+        expect { resource.run_action(:run) }.to raise_error(Chef::Exceptions::ValidationFailed)
       end
     end
   end

data/spec/functional/resource/batch_spec.rb

@@ -23,7 +23,11 @@ describe Chef::Resource::WindowsScript::Batch, :windows_only do
 
   let(:output_command) { " > " }
 
-  let (:architecture_command) { "@echo %PROCESSOR_ARCHITECTURE%" }
+  let(:architecture_command) { "@echo %PROCESSOR_ARCHITECTURE%" }
+
+  let(:resource) do
+    Chef::Resource::WindowsScript::Batch.new("Batch resource functional test", @run_context)
+  end
 
   it_behaves_like "a Windows script running on Windows"
 

data/spec/functional/resource/cron_spec.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 #
 # Author:: Kaustubh Deorukhkar (<kaustubh@clogeny.com>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2017, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -161,7 +161,7 @@ describe Chef::Resource::Cron, :requires_root, :unix_only do
     end
 
     def cron_create_should_raise_exception
-      expect { new_resource.run_action(:create) }.to raise_error(Chef::Exceptions::Cron, /Error updating state of #{new_resource.name}, exit: 1/)
+      expect { new_resource.run_action(:create) }.to raise_error(Chef::Exceptions::Cron)
       cron_should_not_exists(new_resource.name)
     end
 

data/spec/functional/resource/dsc_script_spec.rb

@@ -65,10 +65,8 @@ describe Chef::Resource::DscScript, :windows_powershell_dsc_only do
   end
 
   def delete_user(target_user)
-    begin
-      shell_out!("net user #{target_user} /delete")
-    rescue Mixlib::ShellOut::ShellCommandFailed
-    end
+    shell_out!("net user #{target_user} /delete")
+  rescue Mixlib::ShellOut::ShellCommandFailed
   end
 
   let(:dsc_env_variable) { "chefenvtest" }

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