chef 14.14.29 → 14.15.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 867f9eae7407b158cb748a5ae3c016ed1663736dafc3879cacb2cb10fa51f679
-  data.tar.gz: 3977733a96ee85e00cc05cb59f96dfaea3b16ef54229646aa7f6efef5ca9327f
+  metadata.gz: 71a9867da465ddeb10ec2910c944b081e372bbc7a3f3479f4ee0c3184c10d0e9
+  data.tar.gz: cb995cd4dde30afb921f8c4601baf53f93c63f3dc001fdb05f8676e8e15aec73
 SHA512:
-  metadata.gz: 12c98f539abdfdc1dee76c8bd94f5cb594bf9b32c4d3458dc666c760232a2c216a7e0b8ca5160583229b907527131ad5b4ec9b58ffa2fdcf7e9bfd7e4a819fb7
-  data.tar.gz: 17e59c3a99dfd164f987c582f671fe7b1f78270c38c7359ee4bff2641b24fde6123f94cbbf3f81dbf93b20bef84f2307f6a5c6719e73b0b5685a639caff38c25
+  metadata.gz: 6b8dba6115942e9f90b146223c45d8e8732b9fc0f4fc49a8dc4ce775f9ceb74b712b9672e0931a31ee44198d40e308f5a47878e7a8f767a2bfde02f655a73761
+  data.tar.gz: 44205e533cf6a6f3e81c4c934400331e04928a3da56b2462841d3a53ab21e5f40d97f0058591b695415b4b5b383180b0c1eaa397c4ed0f77a790848f2281dbf5

data/Gemfile

@@ -11,7 +11,7 @@ gem "chef-config", path: File.expand_path("../chef-config", __FILE__) if File.ex
 gem "cheffish", "~> 14"
 
 group(:omnibus_package) do
-  gem "appbundler"
+  gem "appbundler", "< 1.0"
   gem "rb-readline"
   gem "inspec-core", "~> 3"
   gem "chef-vault"

data/README.md

@@ -1,15 +1,26 @@
-# Chef
+# Chef Infra
 [![Code Climate](https://codeclimate.com/github/chef/chef.svg)](https://codeclimate.com/github/chef/chef)
-[![Build Status Master](https://travis-ci.org/chef/chef.svg?branch=master)](https://travis-ci.org/chef/chef)
-[![Build Status Master](https://ci.appveyor.com/api/projects/status/github/chef/chef?branch=master&svg=true&passingText=master%20-%20Ok&pendingText=master%20-%20Pending&failingText=master%20-%20Failing)](https://ci.appveyor.com/project/Chef/chef/branch/master)
+[![Build Status](https://badge.buildkite.com/f798a31e86518429573be35b496b313f4aee72dbb17e946eda.svg?branch=chef-14)](https://buildkite.com/chef-oss/chef-chef-chef-14-verify)
 [![Gem Version](https://badge.fury.io/rb/chef.svg)](https://badge.fury.io/rb/chef)
-[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef-rfc/blob/master/rfc086-chef-oss-project-policies.md#cadence-release)
+[![](https://img.shields.io/badge/Release%20Policy-Cadence%20Release-brightgreen.svg)](https://github.com/chef/chef/blob/master/docs/dev/design_documents/client_release_cadence.md)
+
+**Umbrella Project**: [Chef Infra](https://github.com/chef/chef-oss-practices/blob/master/projects/chef-infra.md)
+
+**Project State**: [Active](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md#active)
+
+**Issues [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
+
+**Pull Request [Response Time Maximum](https://github.com/chef/chef-oss-practices/blob/master/repo-management/repo-states.md)**: 14 days
 
 ## Getting Started
 
-Want to try Chef?
-For Chef user, please refer to [Quick Start](https://docs.chef.io/quick_start.html)
-For more details, please refer to [learnchef](https://learn.chef.io)
+Chef Infra is a configuration management tool designed to bring automation to your entire infrastructure.
+
+### Want to try Chef Infra?
+
+For Chef Infra usage, please refer to our [Learn Chef Rally](https://learn.chef.io/) website, which includes module-based training for Chef Infra, as well as Automate, Habitat, and InSpec.
+
+Other useful resources for Chef Infra users:
 
 - Documentation: <https://docs.chef.io>
 - Source: <https://github.com/chef/chef/tree/master>

data/Rakefile

@@ -17,10 +17,13 @@
 # limitations under the License.
 #
 
-require_relative "tasks/rspec"
-require_relative "tasks/maintainers"
-require_relative "tasks/dependencies"
-require_relative "tasks/announce"
+begin
+  require_relative "tasks/rspec"
+  require_relative "tasks/dependencies"
+  require_relative "tasks/announce"
+rescue LoadError => e
+  puts "Skipping missing rake dep: #{e}"
+end
 
 # hack the chef-config install to run before the traditional install task
 task :super_install do

data/chef.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.7"
   s.add_dependency "diff-lcs", "~> 1.2", ">= 1.2.4"
 
-  s.add_dependency "chef-zero", ">= 13.0"
+  s.add_dependency "chef-zero", ">= 13.0", "< 15.0"
 
   s.add_dependency "plist", "~> 3.2"
   s.add_dependency "iniparse", "~> 1.4"

data/lib/chef/knife/ssh.rb

@@ -590,6 +590,12 @@ class Chef
       def run
         @longest = 0
 
+        if @name_args.length < 1
+          show_usage
+          ui.fatal("You must specify the SEARCH QUERY.")
+          exit(1)
+        end
+
         configure_user
         configure_password
         @password = config[:ssh_password] if config[:ssh_password]

data/lib/chef/provider/ifconfig.rb

@@ -39,6 +39,10 @@ class Chef
       attr_accessor :config_template
       attr_accessor :config_path
 
+      # @api private
+      # @return [String] the major.minor of the net-tools version as a string
+      attr_accessor :ifconfig_version
+
       def initialize(new_resource, run_context)
         super(new_resource, run_context)
         @config_template = nil
@@ -54,15 +58,20 @@ class Chef
         @ifconfig_version = nil
 
         @net_tools_version = shell_out("ifconfig", "--version")
+        @net_tools_version.stdout.each_line do |line|
+          if line =~ /^net-tools (\d+\.\d+)/
+            @ifconfig_version = line.match(/^net-tools (\d+\.\d+)/)[1]
+          end
+        end
         @net_tools_version.stderr.each_line do |line|
-          if line =~ /^net-tools (\d+.\d+)/
-            @ifconfig_version = line.match(/^net-tools (\d+.\d+)/)[1]
+          if line =~ /^net-tools (\d+\.\d+)/
+            @ifconfig_version = line.match(/^net-tools (\d+\.\d+)/)[1]
           end
         end
 
         if @ifconfig_version.nil?
           raise "net-tools not found - this is required for ifconfig"
-        elsif @ifconfig_version.to_f < 2.0
+        elsif @ifconfig_version.to_i < 2
           # Example output for 1.60 is as follows: (sanitized but format intact)
           # eth0      Link encap:Ethernet  HWaddr 00:00:00:00:00:00
           #           inet addr:192.168.1.1  Bcast:192.168.0.1  Mask:255.255.248.0
@@ -98,7 +107,7 @@ class Chef
             current_resource.mtu(@interface["mtu"])
             current_resource.metric(@interface["metric"])
           end
-        elsif @ifconfig_version.to_f >= 2.0
+        elsif @ifconfig_version.to_i >= 2
           # Example output for 2.10-alpha is as follows: (sanitized but format intact)
           # eth0: flags=4163<UP,BROADCAST,RUNNING,MULTICAST>  mtu 1500
           #       inet 192.168.1.1  netmask 255.255.240.0  broadcast 192.168.0.1
@@ -112,7 +121,7 @@ class Chef
           # Permalink for addr_regex : https://rubular.com/r/JrykUpfjRnYeQD
           @status = shell_out("ifconfig")
           @status.stdout.each_line do |line|
-            addr_regex = /^(\w+)(-?):?(\d*):?\ .+$/
+            addr_regex = /^((\w|-)+):?(\d*):?\ .+$/
             if line =~ addr_regex
               if line.match(addr_regex).nil?
                 @int_name = "nil"

data/lib/chef/provider/windows_task.rb

@@ -328,13 +328,14 @@ class Chef
         def task_needs_update?(task)
           flag = false
           if new_resource.frequency == :none
-            flag = (task.account_information != new_resource.user ||
+            flag = (task.author != new_resource.user ||
             task.application_name != new_resource.command ||
             description_needs_update?(task) ||
             task.parameters != new_resource.command_arguments.to_s ||
             task.principals[:run_level] != run_level ||
             task.settings[:disallow_start_if_on_batteries] != new_resource.disallow_start_if_on_batteries ||
-            task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries)
+            task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries ||
+            task.settings[:start_when_available] != new_resource.start_when_available)
           else
             current_task_trigger = task.trigger(0)
             new_task_trigger = trigger
@@ -351,7 +352,7 @@ class Chef
                   current_task_trigger[:type] != new_task_trigger[:type] ||
                   current_task_trigger[:random_minutes_interval].to_i != new_task_trigger[:random_minutes_interval].to_i ||
                   current_task_trigger[:minutes_interval].to_i != new_task_trigger[:minutes_interval].to_i ||
-                  task.account_information.to_s.casecmp(new_resource.user.to_s) != 0 ||
+                  task.author.to_s.casecmp(new_resource.user.to_s) != 0 ||
                   task.application_name != new_resource.command ||
                   description_needs_update?(task) ||
                   task.parameters != new_resource.command_arguments.to_s ||
@@ -360,7 +361,9 @@ class Chef
                   task.principals[:run_level] != run_level ||
                   PRIORITY[task.priority] != new_resource.priority ||
                   task.settings[:disallow_start_if_on_batteries] != new_resource.disallow_start_if_on_batteries ||
-                  task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries
+                  task.settings[:stop_if_going_on_batteries] != new_resource.stop_if_going_on_batteries ||
+                  task.settings[:start_when_available] != new_resource.start_when_available
+
               if trigger_type == TaskScheduler::MONTHLYDATE
                 flag = true if current_task_trigger[:run_on_last_day_of_month] != new_task_trigger[:run_on_last_day_of_month]
               end
@@ -560,12 +563,13 @@ class Chef
           settings[:priority] = new_resource.priority
           settings[:disallow_start_if_on_batteries] = new_resource.disallow_start_if_on_batteries
           settings[:stop_if_going_on_batteries] = new_resource.stop_if_going_on_batteries
+          settings[:start_when_available] = new_resource.start_when_available
           settings
         end
 
         def principal_settings
           settings = {}
-          settings [:run_level] = run_level
+          settings[:run_level] = run_level
           settings[:logon_type] = logon_type
           settings
         end

data/lib/chef/resource/kernel_module.rb

@@ -16,11 +16,61 @@ class Chef
 
       description "Use the kernel_module resource to manage kernel modules on Linux systems. This resource can load, unload, blacklist, install, and uninstall modules."
       introduced "14.3"
+      examples <<~DOC
+        Install and load a kernel module, and ensure it loads on reboot.
+        ```ruby
+        kernel_module 'loop'
+        ```
+        Install and load a kernel with a specific set of options, and ensure it loads on reboot. Consult kernel module
+        documentation for specific options that are supported.
+        ```ruby
+        kernel_module 'loop' do
+          options [
+            'max_loop=4',
+            'max_part=8'
+          ]
+        end
+        ```
+        Load a kernel module.
+        ```ruby
+        kernel_module 'loop' do
+          action :load
+        end
+        ```
+        Unload a kernel module and remove module config, so it doesn’t load on reboot.
+        ```ruby
+        kernel_module 'loop' do
+          action :uninstall
+        end
+        ```
+        Unload kernel module.
+        ```ruby
+        kernel_module 'loop' do
+          action :unload
+        end
+        ```
+        Blacklist a module from loading.
+        ```ruby
+        kernel_module 'loop' do
+          action :blacklist
+        end
+        ```
+        Disable a kernel module.
+        ```ruby
+        kernel_module 'loop' do
+          action :disable
+        end
+        ```
+      DOC
 
       property :modname, String,
                description: "An optional property to set the kernel module name if it differs from the resource block's name.",
                name_property: true, identity: true
 
+      property :options, Array,
+        description: "An optional property to set options for the kernel module.",
+        introduced: "14.15"
+
       property :load_dir, String,
                description: "The directory to load modules from.",
                default: "/etc/modules-load.d"
@@ -32,6 +82,13 @@ class Chef
       action :install do
         description "Load kernel module, and ensure it loads on reboot."
 
+        # create options file before loading the module
+        unless new_resource.options.nil?
+          file "#{new_resource.unload_dir}/options_#{new_resource.modname}.conf" do
+            content "options #{new_resource.modname} #{new_resource.options.join(" ")}\n"
+          end.run_action(:create)
+        end
+
         # load the module first before installing
         new_resource.run_action(:load)
 
@@ -65,6 +122,10 @@ class Chef
           notifies :run, "execute[update initramfs]", :delayed
         end
 
+        file "#{new_resource.unload_dir}/options_#{new_resource.modname}.conf" do
+          action :delete
+        end
+
         with_run_context :root do
           find_resource(:execute, "update initramfs") do
             command initramfs_command

data/lib/chef/resource/windows_task.rb

@@ -120,6 +120,10 @@ class Chef
                introduced: "14.7",
                description: "The task description."
 
+      property :start_when_available, [TrueClass, FalseClass],
+               introduced: "14.15", default: false,
+               description: "To start the task at any time after its scheduled time has passed."
+
       attr_accessor :exists, :task, :command_arguments
 
       VALID_WEEK_DAYS = %w{ mon tue wed thu fri sat sun * }.freeze

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require "chef/version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("../..", __FILE__)
-  VERSION = Chef::VersionString.new("14.14.29")
+  VERSION = Chef::VersionString.new("14.15.6")
 end
 
 #

data/spec/data/cookbooks/openldap/metadata.rb

@@ -1,6 +1,6 @@
 name              "openldap"
-maintainer        "Opscode, Inc."
-maintainer_email  "cookbooks@opscode.com"
+maintainer        "Chef Software, Inc."
+maintainer_email  "cookbooks@chef.io"
 license           "Apache 2.0"
 description       "Installs and configures all aspects of openldap using Debian style symlinks with helper definitions"
 long_description  "The long description for the openldap cookbook from metadata.rb"

data/spec/data/metadata/quick_start/metadata.rb

@@ -1,5 +1,5 @@
-maintainer        "Opscode, Inc."
-maintainer_email  "cookbooks@opscode.com"
+maintainer        "Chef Software, Inc."
+maintainer_email  "cookbooks@chef.io"
 license           "Apache 2.0"
 description       "Example cookbook for quick_start wiki document"
 version           "0.7"
@@ -12,8 +12,3 @@ version           "0.7"
 }.each do |os|
   supports os
 end
-
-attribute "quick_start/deep_thought",
-  :display_name => "Quick Start Deep Thought",
-  :description => "A deep thought",
-  :default => "If a tree falls in the forest..."

data/spec/functional/audit/runner_spec.rb

@@ -108,7 +108,7 @@ describe Chef::Audit::Runner do
           in_sub_process do
             runner.run
 
-            expect(stdout.string).to match(/Failure\/Error: expect\(2 - 1\)\.to eq\(0\)/)
+            expect(stdout.string).to match(%r{Failure/Error: expect\(2 - 1\)\.to eq\(0\)})
             expect(stdout.string).to match(/1 example, 1 failure/)
             expect(stdout.string).to match(/# control_group_name should fail/)
           end

data/spec/functional/dsl/reboot_pending_spec.rb

@@ -17,10 +17,13 @@
 #
 
 require "chef/dsl/reboot_pending"
+require "chef/dsl/registry_helper"
 require "chef/win32/registry"
 require "spec_helper"
 
 describe Chef::DSL::RebootPending, :windows_only do
+  include Chef::DSL::RegistryHelper
+
   def run_ohai
     node.consume_external_attrs(OHAI_SYSTEM.data, {})
   end
@@ -36,10 +39,6 @@ describe Chef::DSL::RebootPending, :windows_only do
     let(:reg_key) { nil }
     let(:original_set) { false }
 
-    before(:all) { @any_flag = Hash.new }
-
-    after { @any_flag[reg_key] = original_set }
-
     describe 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager\PendingFileRenameOperations' do
       let(:reg_key) { 'HKLM\SYSTEM\CurrentControlSet\Control\Session Manager' }
       let(:original_set) { registry.value_exists?(reg_key, { name: "PendingFileRenameOperations" }) }
@@ -47,7 +46,7 @@ describe Chef::DSL::RebootPending, :windows_only do
       it "returns true if the registry value exists" do
         skip "found existing registry key" if original_set
         registry.set_value(reg_key,
-            { name: "PendingFileRenameOperations", type: :multi_string, data: ['\??\C:\foo.txt|\??\C:\bar.txt'] })
+          { name: "PendingFileRenameOperations", type: :multi_string, data: ['\??\C:\foo.txt|\??\C:\bar.txt'] })
 
         expect(recipe.reboot_pending?).to be_truthy
       end
@@ -59,25 +58,6 @@ describe Chef::DSL::RebootPending, :windows_only do
       end
     end
 
-    describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired' do
-      let(:reg_key) { 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootRequired' }
-      let(:original_set) { registry.key_exists?(reg_key) }
-
-      it "returns true if the registry key exists" do
-        skip "found existing registry key" if original_set
-        pending "Permissions are limited to 'TrustedInstaller' by default"
-        registry.create_key(reg_key, false)
-
-        expect(recipe.reboot_pending?).to be_truthy
-      end
-
-      after do
-        unless original_set
-          registry.delete_key(reg_key, false)
-        end
-      end
-    end
-
     describe 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' do
       let(:reg_key) { 'HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired' }
       let(:original_set) { registry.key_exists?(reg_key) }
@@ -98,7 +78,9 @@ describe Chef::DSL::RebootPending, :windows_only do
 
     describe "when there is nothing to indicate a reboot is pending" do
       it "should return false" do
-        skip "reboot pending" if @any_flag.any? { |_, v| v == true }
+        skip "reboot pending" if registry_value_exists?('HKLM\SYSTEM\CurrentControlSet\Control\Session Manager', { name: "PendingFileRenameOperations" }) ||
+            registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\WindowsUpdate\Auto Update\RebootRequired') ||
+            registry_key_exists?('HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Component Based Servicing\RebootPending')
         expect(recipe.reboot_pending?).to be_falsey
       end
     end

data/spec/functional/event_loggers/windows_eventlog_spec.rb

@@ -49,16 +49,18 @@ describe Chef::EventLoggers::WindowsEventLogger, :windows_only do
     logger.run_start(version)
 
     expect(event_log.read(flags, offset).any? do |e|
-             e.source == "Chef" && e.event_id == 10000 &&
-                                               e.string_inserts[0].include?(version) end).to be_truthy
+      e.source == "Chef" && e.event_id == 10000 &&
+                                        e.string_inserts[0].include?(version)
+    end ).to be_truthy
   end
 
   it "writes run_started event with event_id 10001 and contains the run_id" do
     logger.run_started(run_status)
 
     expect(event_log.read(flags, offset).any? do |e|
-             e.source == "Chef" && e.event_id == 10001 &&
-                                               e.string_inserts[0].include?(run_id) end).to be_truthy
+      e.source == "Chef" && e.event_id == 10001 &&
+                                        e.string_inserts[0].include?(run_id)
+    end ).to be_truthy
   end
 
   it "writes run_completed event with event_id 10002 and contains the run_id and elapsed time" do