chef 12.15.19 → 12.16.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4f24dbbdd459acf96dabb227da7326a4dff4a49
-  data.tar.gz: d98ceac12bf8f48a05ae367f20cb9d0de810dbe2
+  metadata.gz: 340c1cbda2004926c5f046f561e56586829a141c
+  data.tar.gz: efed35187da59fd2a49ea092312be922d11f90db
 SHA512:
-  metadata.gz: 16eca9e1f4ae67fbf7119be0c84ae229a495837aaa6ffd0fbb97a379a6de0a2f452746f57f6ab16300704e1f0b63abd3958957e283849a05899a50c10199fee5
-  data.tar.gz: 7223d4a4fb15d892ffbd99466345eb1754fab218fb885098e49602af675b7a01300be5d9aac128930269838f6b732b7884636ce9a0474ba882bcfd90357a44af
+  metadata.gz: 0f0e9083844b5a3553acf79a476daab28277cbd3ef1f4d7da0354d88bf28afbe98e967e3470e5967ccaf5139864d11a9fffd58f3a3d733c07b81e8dbc6c7d11d
+  data.tar.gz: c97b133f8aa935250e57a66ef73af2288563547dcfec3cc9031531c0f2205ee52fbc8d8091e3b2d57dc9825f852cb7f7ff4e8332b1c733aae8b4ae3d0ecc7a68

data/Gemfile

@@ -33,7 +33,6 @@ end
 group(:integration) do
   gem "chef-provisioning"
   gem "chef-provisioning-aws"
-  gem "chef-rewind"
   gem "chef-sugar"
   gem "chefspec"
   gem "halite"

data/VERSION

@@ -1 +1 @@
-12.15.19
+12.16.42

data/acceptance/.shared/kitchen_acceptance/.kitchen.ec2.yml

@@ -10,7 +10,9 @@ end
 driver:
   name: ec2
   tags:
-    X-Project: chef-ci-acceptance
+    X-Dept: Eng
+    X-Contact: product-team
+    X-Application: chef-ci-acceptance
   aws_ssh_key_id: <%= ENV['AWS_SSH_KEY_ID'] || ENV['USER'] || ENV['USERNAME'] %>
   # test-specific stuff
   region: us-west-2

data/acceptance/Gemfile.lock

@@ -11,12 +11,12 @@ GEM
   specs:
     addressable (2.4.0)
     artifactory (2.5.0)
-    aws-sdk (2.6.5)
-      aws-sdk-resources (= 2.6.5)
-    aws-sdk-core (2.6.5)
+    aws-sdk (2.6.14)
+      aws-sdk-resources (= 2.6.14)
+    aws-sdk-core (2.6.14)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.6.5)
-      aws-sdk-core (= 2.6.5)
+    aws-sdk-resources (2.6.14)
+      aws-sdk-core (= 2.6.14)
     berkshelf (4.3.5)
       addressable (~> 2.3, >= 2.3.4)
       berkshelf-api-client (~> 2.0, >= 2.0.2)
@@ -53,7 +53,7 @@ GEM
     celluloid-io (0.16.2)
       celluloid (>= 0.16.0)
       nio4r (>= 1.1.0)
-    chef-config (12.14.89)
+    chef-config (12.15.19)
       addressable
       fuzzyurl
       mixlib-config (~> 2.0)
@@ -61,11 +61,11 @@ GEM
     cleanroom (1.0.0)
     coderay (1.1.1)
     diff-lcs (1.2.5)
-    docker-api (1.32.0)
+    docker-api (1.32.1)
       excon (>= 0.38.0)
       json
     erubis (2.7.0)
-    excon (0.53.0)
+    excon (0.54.0)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.14)
@@ -77,7 +77,7 @@ GEM
     hashie (3.4.6)
     hitimes (1.2.4)
     httpclient (2.7.2)
-    inspec (1.0.0)
+    inspec (1.3.0)
       hashie (~> 3.4)
       json (>= 1.8, < 3.0)
       method_source (~> 0.8)
@@ -90,7 +90,7 @@ GEM
       rubyzip (~> 1.1)
       sslshake (~> 1)
       thor (~> 0.19)
-      train (>= 0.19.1, < 1.0)
+      train (>= 0.20.1, < 1.0)
     jmespath (1.3.1)
     json (2.0.2)
     kitchen-ec2 (1.2.0)
@@ -132,7 +132,7 @@ GEM
       net-ssh (>= 2.6.5)
     nio4r (1.2.1)
     nori (2.6.0)
-    octokit (4.3.0)
+    octokit (4.4.1)
       sawyer (~> 0.7.0, >= 0.5.3)
     parallel (1.9.0)
     pry (0.10.4)
@@ -186,7 +186,7 @@ GEM
     solve (2.0.3)
       molinillo (~> 0.4.2)
       semverse (~> 1.1)
-    sslshake (1.0.12)
+    sslshake (1.0.13)
     test-kitchen (1.13.2)
       mixlib-install (>= 1.2, < 3.0)
       mixlib-shellout (>= 1.2, < 3.0)
@@ -198,7 +198,7 @@ GEM
     thor (0.19.1)
     timers (4.0.4)
       hitimes
-    train (0.20.0)
+    train (0.20.1)
       docker-api (~> 1.26)
       json (>= 1.8, < 3.0)
       mixlib-shellout (~> 2.0)
@@ -211,7 +211,7 @@ GEM
       hashie (>= 2.0.2, < 4.0.0)
     windows_chef_zero (2.0.0)
       test-kitchen (>= 1.2.1)
-    winrm (2.0.3)
+    winrm (2.1.0)
       builder (>= 2.1.2)
       erubis (~> 2.7)
       gssapi (~> 1.2)

data/acceptance/data-collector/test/integration/default/serverspec/default_spec.rb

@@ -60,7 +60,7 @@ end
 
 shared_examples_for "counter checks" do |counters_to_check|
   counters_to_check.each do |counter, value|
-    it "counter #{counter} should equal #{value}" do
+    it "counter #{counter} should equal #{value.inspect}" do
       counter_values = JSON.load(command("curl http://localhost:9292/counters").stdout)
       expect(counter_values[counter]).to eq(value)
     end
@@ -91,11 +91,6 @@ shared_examples_for "run_start payload check" do
       expect(missing_fields).to eq([])
     end
 
-    it "does not have any extra fields" do
-      payload = JSON.load(command("curl http://localhost:9292/cache/run_start").stdout)
-      extra_fields = payload.keys.select { |key| !required_fields.include?(key) && !optional_fields.include?(key) }
-      expect(extra_fields).to eq([])
-    end
   end
 end
 
@@ -121,6 +116,7 @@ shared_examples_for "run_converge.success payload check" do
         status
         total_resource_count
         updated_resource_count
+        deprecations
       }
     end
     let(:optional_fields) { [] }
@@ -131,11 +127,6 @@ shared_examples_for "run_converge.success payload check" do
       expect(missing_fields).to eq([])
     end
 
-    it "does not have any extra fields" do
-      payload = JSON.load(command("curl http://localhost:9292/cache/run_converge.success").stdout)
-      extra_fields = payload.keys.select { |key| !required_fields.include?(key) && !optional_fields.include?(key) }
-      expect(extra_fields).to eq([])
-    end
   end
 end
 
@@ -162,6 +153,7 @@ shared_examples_for "run_converge.failure payload check" do
         status
         total_resource_count
         updated_resource_count
+        deprecations
       }
     end
     let(:optional_fields) { [] }

data/distro/common/html/knife_bootstrap.html

@@ -173,7 +173,7 @@
 <div class="highlight-bash"><div class="highlight"><pre><span class="nv">$ </span>knife bootstrap 192.168.1.100 -r <span class="s1">&#39;role[webserver]&#39;</span> -d ubuntu12.04-gems-mine
 </pre></div>
 </div>
-<p>Alternatively, an example bootstrap template can be found in the git source for the chef-repo: <a class="reference external" href="https://github.com/opscode/chef/tree/master/lib/chef/knife/bootstrap">https://github.com/opscode/chef/tree/master/lib/chef/knife/bootstrap</a>. Copy the template to <tt class="docutils literal"><span class="pre">~/.chef-repo/.chef/bootstrap/ubuntu12.04-apt.erb</span></tt> and modify the template appropriately.</p>
+<p>Alternatively, an example bootstrap template can be found in the git source for the chef-repo: <a class="reference external" href="https://github.com/chef/chef/tree/master/lib/chef/knife/bootstrap">https://github.com/chef/chef/tree/master/lib/chef/knife/bootstrap</a>. Copy the template to <tt class="docutils literal"><span class="pre">~/.chef-repo/.chef/bootstrap/ubuntu12.04-apt.erb</span></tt> and modify the template appropriately.</p>
 </div>
 <div class="section" id="debian-and-apt">
 <h3>Debian and Apt<a class="headerlink" href="#debian-and-apt" title="Permalink to this headline">¶</a></h3>

data/distro/common/man/man1/README.md

@@ -9,7 +9,7 @@ that are built into the chef-client are managed.
 ## Source Files
 
 The source files are located in the chef-docs repository:
-https://github.com/opscode/chef-docs
+https://github.com/chef/chef-docs
 
 Each Knife subcommand has its own source folder. The folder naming
 pattern begins with man_.
@@ -55,4 +55,4 @@ at docs.opscode.com/knife_foo.html.
 
 ## Questions?
 
-Open an [Issue](https://github.com/opscode/chef-docs/issues) and ask.
+Open an [Issue](https://github.com/chef/chef-docs/issues) and ask.

data/distro/common/man/man1/knife-client.1

@@ -37,7 +37,7 @@ However, during the first chef\-client run, this private key does not exist. Ins
 .sp
 During the initial chef\-client run, the chef\-client will register with the Chef server using the private key assigned to the chef\-validator, after which the chef\-client will obtain a \fBclient.pem\fP private key for all future authentication requests to the Chef server\&.
 .sp
-After the initial chef\-client run has completed successfully, the chef\-validator is no longer required and may be deleted from the node. Use the \fBdelete_validation\fP recipe found in the \fBchef\-client\fP cookbook (\fI\%https://github.com/opscode\-cookbooks/chef\-client\fP) to remove the chef\-validator\&.
+After the initial chef\-client run has completed successfully, the chef\-validator is no longer required and may be deleted from the node. Use the \fBdelete_validation\fP recipe found in the \fBchef\-client\fP cookbook (\fI\%https://github.com/chef\-cookbooks/chef\-client\fP) to remove the chef\-validator\&.
 .sp
 The \fBknife client\fP subcommand is used to manage an API client list and their associated RSA public key\-pairs. This allows authentication requests to be made to the Chef server by any entity that uses the Chef server API, such as the chef\-client and knife\&.
 .SH COMMON OPTIONS

data/lib/chef/application.rb

@@ -28,7 +28,6 @@ require "mixlib/cli"
 require "tmpdir"
 require "rbconfig"
 require "chef/application/exit_code"
-require "yaml"
 
 class Chef
   class Application
@@ -111,20 +110,13 @@ class Chef
       end
       extra_config_options = config.delete(:config_option)
       Chef::Config.merge!(config)
-      if extra_config_options
-        extra_parsed_options = extra_config_options.inject({}) do |memo, option|
-          # Sanity check value.
-          Chef::Application.fatal!("Unparsable config option #{option.inspect}") if option.empty? || !option.include?("=")
-          # Split including whitespace if someone does truly odd like
-          # --config-option "foo = bar"
-          key, value = option.split(/\s*=\s*/, 2)
-          # Call to_sym because Chef::Config expects only symbol keys. Also
-          # runs a simple parse on the string for some common types.
-          memo[key.to_sym] = YAML.safe_load(value)
-          memo
-        end
-        Chef::Config.merge!(extra_parsed_options)
-      end
+      apply_extra_config_options(extra_config_options)
+    end
+
+    def apply_extra_config_options(extra_config_options)
+      Chef::Config.apply_extra_config_options(extra_config_options)
+    rescue ChefConfig::UnparsableConfigOption => e
+      Chef::Application.fatal!(e.message)
     end
 
     def set_specific_recipes

data/lib/chef/application/client.rb

@@ -202,7 +202,7 @@ class Chef::Application::Client < Chef::Application
     :short        => "-o RunlistItem,RunlistItem...",
     :long         => "--override-runlist RunlistItem,RunlistItem...",
     :description  => "Replace current run list with specified items for a single run",
-    :proc         => lambda {|items|
+    :proc         => lambda { |items|
       items = items.split(",")
       items.compact.map do |item|
         Chef::RunList::RunListItem.new(item)
@@ -213,7 +213,7 @@ class Chef::Application::Client < Chef::Application
     :short        => "-r RunlistItem,RunlistItem...",
     :long         => "--runlist RunlistItem,RunlistItem...",
     :description  => "Permanently replace current run list with specified items",
-    :proc         => lambda {|items|
+    :proc         => lambda { |items|
       items = items.split(",")
       items.compact.map do |item|
         Chef::RunList::RunListItem.new(item)

data/lib/chef/application/solo.rb

@@ -166,7 +166,7 @@ class Chef::Application::Solo < Chef::Application
     :short        => "-o RunlistItem,RunlistItem...",
     :long         => "--override-runlist RunlistItem,RunlistItem...",
     :description  => "Replace current run list with specified items",
-    :proc         => lambda {|items|
+    :proc         => lambda { |items|
       items = items.split(",")
       items.compact.map do |item|
         Chef::RunList::RunListItem.new(item)

data/lib/chef/chef_class.rb

@@ -30,6 +30,7 @@ require "chef/platform/provider_priority_map"
 require "chef/platform/resource_priority_map"
 require "chef/platform/provider_handler_map"
 require "chef/platform/resource_handler_map"
+require "chef/event_dispatch/dsl"
 
 class Chef
   class << self

data/lib/chef/chef_fs/file_system/chef_server/cookbook_file.rb

@@ -39,17 +39,13 @@ class Chef
           def read
             begin
               tmpfile = rest.streaming_request(file[:url])
+              File.open(tmpfile, "rb") { |f| f.read }
             rescue Timeout::Error => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "Timeout reading #{file[:url]}: #{e}")
             rescue Net::HTTPServerException => e
               raise Chef::ChefFS::FileSystem::OperationFailedError.new(:read, self, e, "#{e.message} retrieving #{file[:url]}")
-            end
-
-            begin
-              tmpfile.open
-              tmpfile.read
-            ensure
-              tmpfile.close!
+            rescue Errno::ENOENT
+              raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
             end
           end
 

data/lib/chef/chef_fs/file_system/chef_server/versioned_cookbook_dir.rb

@@ -24,7 +24,7 @@ class Chef
       module ChefServer
         class VersionedCookbookDir < CookbookDir
           # See Erchef code
-          # https://github.com/opscode/chef_objects/blob/968a63344d38fd507f6ace05f73d53e9cd7fb043/src/chef_regex.erl#L94
+          # https://github.com/chef/chef_objects/blob/968a63344d38fd507f6ace05f73d53e9cd7fb043/src/chef_regex.erl#L94
           VALID_VERSIONED_COOKBOOK_NAME = /^([.a-zA-Z0-9_-]+)-(\d+\.\d+\.\d+)$/
 
           def initialize(name, parent, options = {})

data/lib/chef/data_collector.rb

@@ -19,20 +19,66 @@
 #
 
 require "uri"
+require "chef/server_api"
+require "chef/http/simple_json"
 require "chef/event_dispatch/base"
 require "chef/data_collector/messages"
 require "chef/data_collector/resource_report"
 require "ostruct"
+require "set"
 
 class Chef
 
   # == Chef::DataCollector
   # Provides methods for determinine whether a reporter should be registered.
   class DataCollector
+
+    # Whether or not to enable data collection:
+    # * always disabled for why run mode
+    # * disabled when the user sets `Chef::Config[:data_collector][:mode]` to a
+    #   value that excludes the mode (client or solo) that we are running as
+    # * disabled in solo mode if the user did not configure the auth token
+    # * disabled if `Chef::Config[:data_collector][:server_url]` is set to a
+    #   falsey value
     def self.register_reporter?
-      Chef::Config[:data_collector][:server_url] &&
-        !Chef::Config[:why_run] &&
-        self.reporter_enabled_for_current_mode?
+      if why_run?
+        Chef::Log.debug("data collector is disabled for why run mode")
+        return false
+      end
+      unless reporter_enabled_for_current_mode?
+        Chef::Log.debug("data collector is configured to only run in " \
+                        "#{Chef::Config[:data_collector][:mode].inspect} modes, disabling it")
+        return false
+      end
+      unless data_collector_url_configured?
+        Chef::Log.debug("data collector URL is not configured, disabling data collector")
+        return false
+      end
+      if solo? && !token_auth_configured?
+        Chef::Log.debug("Data collector token must be configured to use Chef Automate data collector with Chef Solo")
+      end
+      if !solo? && token_auth_configured?
+        Chef::Log.warn("Data collector token authentication is not recommended for client-server mode" \
+                       "Please upgrade Chef Server to 12.11.0 and remove the token from your config file " \
+                       "to use key based authentication instead")
+      end
+      true
+    end
+
+    def self.data_collector_url_configured?
+      !!Chef::Config[:data_collector][:server_url]
+    end
+
+    def self.why_run?
+      !!Chef::Config[:why_run]
+    end
+
+    def self.token_auth_configured?
+      !!Chef::Config[:data_collector][:token]
+    end
+
+    def self.solo?
+      !!Chef::Config[:solo] || !!Chef::Config[:local_mode]
     end
 
     def self.reporter_enabled_for_current_mode?
@@ -54,7 +100,7 @@ class Chef
     class Reporter < EventDispatch::Base
       attr_reader :all_resource_reports, :status, :exception, :error_descriptions,
                   :expanded_run_list, :run_context, :run_status, :http,
-                  :current_resource_report, :enabled
+                  :current_resource_report, :enabled, :deprecations
 
       def initialize
         validate_data_collector_server_url!
@@ -63,8 +109,10 @@ class Chef
         @current_resource_loaded = nil
         @error_descriptions      = {}
         @expanded_run_list       = {}
-        @http                    = Chef::HTTP.new(data_collector_server_url)
+        @deprecations            = Set.new
         @enabled                 = true
+
+        @http = setup_http_client
       end
 
       # see EventDispatch::Base#run_started
@@ -79,7 +127,7 @@ class Chef
 
         disable_reporter_on_error do
           send_to_data_collector(
-            Chef::DataCollector::Messages.run_start_message(current_run_status).to_json
+            Chef::DataCollector::Messages.run_start_message(current_run_status)
           )
         end
       end
@@ -223,8 +271,27 @@ class Chef
         )
       end
 
+      # see EventDispatch::Base#deprecation
+      # Append a received deprecation to the list of deprecations
+      def deprecation(message, location = caller(2..2)[0])
+        add_deprecation(message, location)
+      end
+
       private
 
+      # Selects the type of HTTP client to use based on whether we are using
+      # token-based or signed header authentication. Token authentication is
+      # intended to be used primarily for Chef Solo in which case no signing
+      # key will be available (in which case `Chef::ServerAPI.new()` would
+      # raise an exception.
+      def setup_http_client
+        if data_collector_token.nil?
+          Chef::ServerAPI.new(data_collector_server_url)
+        else
+          Chef::HTTP::SimpleJSON.new(data_collector_server_url)
+        end
+      end
+
       #
       # Yields to the passed-in block (which is expected to be some interaction
       # with the DataCollector endpoint). If some communication failure occurs,
@@ -255,7 +322,9 @@ class Chef
           Chef::Log.error(msg)
           raise
         else
-          Chef::Log.warn(msg)
+          # Make the message non-scary for folks who don't have automate:
+          msg << " (This is normal if you do not have Chef Automate)"
+          Chef::Log.info(msg)
         end
       end
 
@@ -288,8 +357,9 @@ class Chef
             expanded_run_list: expanded_run_list,
             resources: all_resource_reports,
             status: opts[:status],
-            error_descriptions: error_descriptions
-          ).to_json
+            error_descriptions: error_descriptions,
+            deprecations: deprecations.to_a
+          )
         )
       end
 
@@ -340,6 +410,10 @@ class Chef
         @error_descriptions = discription_hash
       end
 
+      def add_deprecation(message, location)
+        @deprecations << { message: message, location: location }
+      end
+
       def create_resource_report(new_resource, action, current_resource = nil)
         Chef::DataCollector::ResourceReport.new(
           new_resource,