chef 11.6.2-x86-mingw32 → 11.8.0.rc.1-x86-mingw32

data/distro/common/markdown/man1/knife-bootstrap.mkd

@@ -32,7 +32,7 @@ __knife__ __bootstrap__ _(options)_
   * `--[no-]host-key-verify`:
     Enable host key verification, which is the default behavior.
   * `--hint HINT_NAME[=HINT_FILE]`:
-    Provide the name of a hint (with option JSON file) to set for use by 
+    Provide the name of a hint (with option JSON file) to set for use by
     Ohai plugins.
 
 ## DESCRIPTION

data/distro/common/markdown/man1/knife-configure.mkd

@@ -35,17 +35,17 @@ the specified _directory_.
     field blank to accept the default value. On most systems, the
     default values are acceptable.
 
-    user@host$ knife configure -i  
-    Please enter the chef server URL: [http://localhost:4000]  
-    Please enter a clientname for the new client: [username]  
-    Please enter the existing admin clientname: [chef-webui]  
-    Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]  
-    Please enter the validation clientname: [chef-validator]  
-    Please enter the location of the validation key: [/etc/chef/validation.pem]  
-    Please enter the path to a chef repository (or leave blank):  
-    Creating initial API user...  
-    Created (or updated) client[username]  
-    Configuration file written to /home/username/.chef/knife.rb  
+    user@host$ knife configure -i
+    Please enter the chef server URL: [http://localhost:4000]
+    Please enter a clientname for the new client: [username]
+    Please enter the existing admin clientname: [chef-webui]
+    Please enter the location of the existing admin client's private key: [/etc/chef/webui.pem]
+    Please enter the validation clientname: [chef-validator]
+    Please enter the location of the validation key: [/etc/chef/validation.pem]
+    Please enter the path to a chef repository (or leave blank):
+    Creating initial API user...
+    Created (or updated) client[username]
+    Configuration file written to /home/username/.chef/knife.rb
 
     This creates a new administrator client named _username_, writes
     a configuration file to _/home/username/.chef/knife.rb_, and the

data/distro/common/markdown/man1/knife-cookbook.mkd

@@ -117,11 +117,11 @@ __knife cookbook create cookbook__ _(options)_
     the directory where the cookbook will be created
   * `-r`, `--readme-format format`:
     format of the readme file md, mkd, txt, rdoc
-  * `-c`, `--copyright copyright`:
+  * `-C`, `--copyright copyright`:
     name of copyright holder
   * `-i`, `--license license`:
     license for cookbook, apachev2 or none
-  * `-e`, `--email email`:
+  * `-m`, `--email email`:
     email address of cookbook maintainer
 
 this is a helper command that creates a new cookbook directory in the
@@ -143,7 +143,7 @@ supported readme formats are 'md' (default), 'mkd', 'txt', 'rdoc'. the
 readme file will be written with the specified extension and a set of
 helpful starting headers.
 
-specify `-c` or `--copyright` with the name of the copyright holder as
+specify `-C` or `--copyright` with the name of the copyright holder as
 your name or your company/organization name in a quoted string. if this
 value is not specified an all-caps string `your_company_name` is used
 which can be easily changed with find/replace.
@@ -156,7 +156,7 @@ the cookbook and follow any restrictions they describe. when using
 are pre-filled. the `none` license will be treated as
 non-redistributable.
 
-specify `-e` or `--email` with the email address of the cookbook's
+specify `-m` or `--email` with the email address of the cookbook's
 maintainer. if this value is not specified, an all-caps string
 `your_email` is used which can easily be changed with find/replace.
 

data/distro/common/markdown/man8/chef-expander.mkd

@@ -79,4 +79,4 @@ granted to copy, distribute and / or modify this document under the
 terms of the Apache 2.0 License.
 
 On Debian systems, the complete text of the Apache 2.0 License  can  be
-found in /usr/share/common-licenses/Apache-2.0.
+found in /usr/share/common-licenses/Apache-2.0.

data/distro/common/markdown/man8/chef-expanderctl.mkd

@@ -55,4 +55,4 @@ granted to copy, distribute and / or modify this document under the
 terms of the Apache 2.0 License.
 
 On Debian systems, the complete text of the Apache 2.0 License  can  be
-found in /usr/share/common-licenses/Apache-2.0.
+found in /usr/share/common-licenses/Apache-2.0.

data/distro/debian/etc/init.d/chef-client

@@ -20,7 +20,7 @@ NAME=chef-client
 DESC=chef-client
 PIDFILE=/var/run/chef/client.pid
 
-test -x $DAEMON || exit 0
+test -x $DAEMON || exit 1
 
 . /lib/lsb/init-functions
 

data/distro/debian/etc/init.d/chef-expander

@@ -20,7 +20,7 @@ NAME=chef-expander
 DESC=chef-expander
 PIDFILE=/var/run/chef/expander.pid
 
-test -x $DAEMON || exit 0
+test -x $DAEMON || exit 1
 
 . /lib/lsb/init-functions
 

data/distro/debian/etc/init.d/chef-server

@@ -21,7 +21,7 @@ MAINPID=/var/run/chef/server.main.pid
 NAME=chef-server
 DESC=chef-server
 
-test -x $DAEMON || exit 0
+test -x $DAEMON || exit 1
 
 . /lib/lsb/init-functions
 

data/distro/debian/etc/init.d/chef-server-webui

@@ -21,7 +21,7 @@ MAINPID=/var/run/chef/server-webui.main.pid
 NAME=chef-server-webui
 DESC=chef-server-webui
 
-test -x $DAEMON || exit 0
+test -x $DAEMON || exit 1
 
 . /lib/lsb/init-functions
 

data/distro/debian/etc/init.d/chef-solr

@@ -21,7 +21,7 @@ NAME=chef-solr
 DESC=chef-solr
 PIDFILE=/var/run/chef/solr.pid
 
-test -x $DAEMON || exit 0
+test -x $DAEMON || exit 1
 
 . /lib/lsb/init-functions
 

data/distro/debian/etc/init/chef-client.conf

@@ -11,7 +11,7 @@ respawn
 respawn limit 5 30
 
 pre-start script
-    test -x /usr/bin/chef-client || { stop; exit 0; }
+    test -x /usr/bin/chef-client || { stop; exit 1; }
 end script
 
 exec /usr/bin/chef-client -i 1800 -L /var/log/chef/client.log

data/distro/debian/etc/init/chef-expander.conf

@@ -11,7 +11,7 @@ respawn
 respawn limit 5 30
 
 pre-start script
-    test -x /usr/bin/chef-expander || { stop; exit 0; }
+    test -x /usr/bin/chef-expander || { stop; exit 1; }
 end script
 
 exec /usr/bin/chef-expander -c /etc/chef/solr.rb -L /var/log/chef/expander.log -n 1 -i 1

data/distro/debian/etc/init/chef-server-webui.conf

@@ -11,7 +11,7 @@ respawn
 respawn limit 5 30
 
 pre-start script
-    test -x /usr/bin/chef-server-webui || { stop; exit 0; }
+    test -x /usr/bin/chef-server-webui || { stop; exit 1; }
 end script
 
 exec /usr/bin/chef-server-webui -e production -p 4040 -L /var/log/chef/server-webui.log

data/distro/debian/etc/init/chef-server.conf

@@ -11,7 +11,7 @@ respawn
 respawn limit 5 30
 
 pre-start script
-    test -x /usr/bin/chef-server || { stop; exit 0; }
+    test -x /usr/bin/chef-server || { stop; exit 1; }
 end script
 
 exec /usr/bin/chef-server -e production -p 4000 -L /var/log/chef/server.log

data/distro/debian/etc/init/chef-solr.conf

@@ -11,7 +11,7 @@ respawn
 respawn limit 5 30
 
 pre-start script
-    test -x /usr/bin/chef-solr || { stop; exit 0; }
+    test -x /usr/bin/chef-solr || { stop; exit 1; }
 end script
 
 exec /usr/bin/chef-solr -c /etc/chef/solr.rb -L /var/log/chef/solr.log

data/distro/redhat/etc/init.d/chef-client

@@ -61,7 +61,7 @@ reload() {
     killproc -p $pidfile chef-client -HUP
     retval=$?
     echo
-    return $retval 
+    return $retval
 }
 
 run() {

data/distro/redhat/etc/init.d/chef-server

@@ -11,7 +11,7 @@
 # Required-Stop: $local_fs $network $remote_fs chef-solr chef-expander
 # Should-Start: $named $time
 # Should-Stop: $named $time
-# Short-Description: Startup script for chef-server 
+# Short-Description: Startup script for chef-server
 # Description: Server component of the Chef systems integration framework.
 ### END INIT INFO
 
@@ -50,7 +50,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog 
+    killproc -p $pidfile $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile

data/distro/redhat/etc/init.d/chef-server-webui

@@ -11,7 +11,7 @@
 # Required-Stop: $local_fs $network $remote_fs chef-server
 # Should-Start: $named $time
 # Should-Stop: $named $time
-# Short-Description: Startup script for chef-server-webui 
+# Short-Description: Startup script for chef-server-webui
 # Description: Server WebUI component of the Chef systems integration framework.
 ### END INIT INFO
 
@@ -50,7 +50,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog 
+    killproc -p $pidfile $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile

data/distro/redhat/etc/init.d/chef-solr

@@ -1,5 +1,5 @@
 #!/bin/bash
-# 
+#
 # chef-solr Startup script for the SOLR search engine
 #
 # chkconfig: - 94 06
@@ -42,7 +42,7 @@ start() {
 
 stop() {
     echo -n $"Stopping $prog: "
-    killproc -p $pidfile $prog 
+    killproc -p $pidfile $prog
     retval=$?
     echo
     [ $retval -eq 0 ] && rm -f $lockfile

data/lib/chef/api_client.rb

@@ -36,6 +36,7 @@ class Chef
       @public_key = nil
       @private_key = nil
       @admin = false
+      @validator = false
     end
 
     # Gets or sets the client name.
@@ -74,6 +75,19 @@ class Chef
       )
     end
 
+    # Gets or sets whether this client is a validator.
+    #
+    # @params [Boolean] whether or not the client is a validator.  If
+    #   `nil`, retrieves the already-set value.
+    # @return [Boolean] The current value
+    def validator(arg=nil)
+      set_or_return(
+        :validator,
+        arg,
+        :kind_of => [TrueClass, FalseClass]
+      )
+    end
+
     # Gets or sets the private key.
     #
     # @params [Optional String] The string representation of the private key.
@@ -94,6 +108,7 @@ class Chef
       result = {
         "name" => @name,
         "public_key" => @public_key,
+        "validator" => @validator,
         "admin" => @admin,
         'json_class' => self.class.name,
         "chef_type" => "client"
@@ -115,6 +130,7 @@ class Chef
       client.private_key(o["private_key"]) if o.key?("private_key")
       client.public_key(o["public_key"])
       client.admin(o["admin"])
+      client.validator(o["validator"])
       client
     end
 
@@ -160,11 +176,11 @@ class Chef
     # Save this client via the REST API, returns a hash including the private key
     def save
       begin
-        http_api.put("clients/#{name}", { :name => self.name, :admin => self.admin})
+        http_api.put("clients/#{name}", { :name => self.name, :admin => self.admin, :validator => self.validator})
       rescue Net::HTTPServerException => e
         # If that fails, go ahead and try and update it
         if e.response.code == "404"
-          http_api.post("clients", {:name => self.name, :admin => self.admin })
+          http_api.post("clients", {:name => self.name, :admin => self.admin, :validator => self.validator })
         else
           raise e
         end
@@ -172,7 +188,7 @@ class Chef
     end
 
     def reregister
-      reregistered_self = http_api.put("clients/#{name}", { :name => name, :admin => admin, :private_key => true })
+      reregistered_self = http_api.put("clients/#{name}", { :name => name, :admin => admin, :validator => validator, :private_key => true })
       if reregistered_self.respond_to?(:[])
         private_key(reregistered_self["private_key"])
       else
@@ -192,7 +208,7 @@ class Chef
     end
 
     def inspect
-      "Chef::ApiClient name:'#{name}' admin:'#{admin.inspect}' " +
+      "Chef::ApiClient name:'#{name}' admin:'#{admin.inspect}' validator:'#{validator}' " +
       "public_key:'#{public_key}' private_key:'#{private_key}'"
     end
 
@@ -202,4 +218,3 @@ class Chef
 
   end
 end
-

data/lib/chef/application.rb

@@ -66,31 +66,26 @@ class Chef::Application
     run_application
   end
 
-  # Parse the configuration file
+  # Parse configuration (options and config file)
   def configure_chef
     parse_options
+    load_config_file
+  end
 
-    begin
-      case config[:config_file]
-      when /^(http|https):\/\//
-        Chef::REST.new("", nil, nil).fetch(config[:config_file]) { |f| apply_config(f.path) }
-      else
-        ::File::open(config[:config_file]) { |f| apply_config(f.path) }
-      end
-    rescue Errno::ENOENT => error
+  # Parse the config file
+  def load_config_file
+    config_fetcher = Chef::ConfigFetcher.new(config[:config_file], Chef::Config.config_file_jail)
+    if config[:config_file].nil?
+      Chef::Log.warn("No config file found or specified on command line, using command line options.")
+    elsif config_fetcher.config_missing?
       Chef::Log.warn("*****************************************")
       Chef::Log.warn("Did not find config file: #{config[:config_file]}, using command line options.")
       Chef::Log.warn("*****************************************")
-
-      Chef::Config.merge!(config)
-    rescue SocketError => error
-      Chef::Application.fatal!("Error getting config file #{config[:config_file]}", 2)
-    rescue Chef::Exceptions::ConfigurationError => error
-      Chef::Application.fatal!("Error processing config file #{config[:config_file]} with error #{error.message}", 2)
-    rescue Exception => error
-      Chef::Application.fatal!("Unknown error processing config file #{config[:config_file]} with error #{error.message}", 2)
+    else
+      config_content = config_fetcher.read_config
+      apply_config(config_content, config[:config_file])
     end
-
+    Chef::Config.merge!(config)
   end
 
   # Initialize and configure the logger.
@@ -172,23 +167,59 @@ class Chef::Application
     raise Chef::Exceptions::Application, "#{self.to_s}: you must override run_application"
   end
 
+  def self.setup_server_connectivity
+    if Chef::Config.chef_zero.enabled
+      destroy_server_connectivity
+
+      require 'chef_zero/server'
+      require 'chef/chef_fs/chef_fs_data_store'
+      require 'chef/chef_fs/config'
+
+      chef_fs = Chef::ChefFS::Config.new.local_fs
+      chef_fs.write_pretty_json = true
+      server_options = {}
+      server_options[:data_store] = Chef::ChefFS::ChefFSDataStore.new(chef_fs)
+      server_options[:log_level] = Chef::Log.level
+      server_options[:port] = Chef::Config.chef_zero.port
+      Chef::Log.info("Starting chef-zero on port #{Chef::Config.chef_zero.port} with repository at #{server_options[:data_store].chef_fs.fs_description}")
+      @chef_zero_server = ChefZero::Server.new(server_options)
+      @chef_zero_server.start_background
+      Chef::Config.chef_server_url = @chef_zero_server.url
+    end
+  end
+
+  def self.destroy_server_connectivity
+    if @chef_zero_server
+      @chef_zero_server.stop
+      @chef_zero_server = nil
+    end
+  end
+
   # Initializes Chef::Client instance and runs it
   def run_chef_client
+    Chef::Application.setup_server_connectivity
+
     @chef_client = Chef::Client.new(
-      @chef_client_json, 
+      @chef_client_json,
       :override_runlist => config[:override_runlist]
     )
     @chef_client_json = nil
 
     @chef_client.run
     @chef_client = nil
+
+    Chef::Application.destroy_server_connectivity
   end
 
   private
 
-  def apply_config(config_file_path)
-    Chef::Config.from_file(config_file_path)
-    Chef::Config.merge!(config)
+  def apply_config(config_content, config_file_path)
+    Chef::Config.from_string(config_content, config_file_path)
+  rescue Exception => error
+    Chef::Log.fatal("Configuration error #{error.class}: #{error.message}")
+    filtered_trace = error.backtrace.grep(/#{Regexp.escape(config_file_path)}/)
+    filtered_trace.each {|line| Chef::Log.fatal("  " + line )}
+    Chef::Application.fatal!("Aborting due to error in '#{config_file_path}'", 2)
   end
 
   class << self

data/lib/chef/application/agent.rb

@@ -6,9 +6,9 @@
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
-# 
+#
 #     http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

data/lib/chef/application/client.rb

@@ -22,7 +22,7 @@ require 'chef/client'
 require 'chef/config'
 require 'chef/daemon'
 require 'chef/log'
-require 'chef/rest'
+require 'chef/config_fetcher'
 require 'chef/handler/error_report'
 
 
@@ -34,7 +34,6 @@ class Chef::Application::Client < Chef::Application
   option :config_file,
     :short => "-c CONFIG",
     :long  => "--config CONFIG",
-    :default => Chef::Config.platform_specific_path("/etc/chef/client.rb"),
     :description => "The configuration file to use"
 
   option :formatter,
@@ -197,6 +196,20 @@ class Chef::Application::Client < Chef::Application
     :description  => "Enable reporting data collection for chef runs",
     :boolean      => true
 
+  option :local_mode,
+    :short        => "-z",
+    :long         => "--local-mode",
+    :description  => "Point chef-client at local repository",
+    :boolean      => true
+
+  option :chef_zero_port,
+    :long         => "--chef-zero-port PORT",
+    :description  => "Port to start chef-zero on"
+
+  option :config_file_jail,
+    :long         => "--config-file-jail PATH",
+    :description  => "Directory under which config files are allowed to be loaded (no client.rb or knife.rb outside this path will be loaded)."
+
   if Chef::Platform.windows?
     option :fatal_windows_admin_check,
       :short        => "-A",
@@ -219,6 +232,12 @@ class Chef::Application::Client < Chef::Application
 
     Chef::Config[:chef_server_url] = config[:chef_server_url] if config.has_key? :chef_server_url
 
+    Chef::Config.local_mode = config[:local_mode] if config.has_key?(:local_mode)
+    if Chef::Config.local_mode && !Chef::Config.has_key?(:cookbook_path) && !Chef::Config.has_key?(:chef_repo_path)
+      Chef::Config.chef_repo_path = Chef::Config.find_chef_repo_path(Dir.pwd)
+    end
+    Chef::Config.chef_zero.port = config[:chef_zero_port] if config[:chef_zero_port]
+
     if Chef::Config[:daemonize]
       Chef::Config[:interval] ||= 1800
     end
@@ -229,31 +248,22 @@ class Chef::Application::Client < Chef::Application
     end
 
     if Chef::Config[:json_attribs]
-      begin
-        json_io = case Chef::Config[:json_attribs]
-                  when /^(http|https):\/\//
-                    @rest = Chef::REST.new(Chef::Config[:json_attribs], nil, nil)
-                    @rest.get_rest(Chef::Config[:json_attribs], true).open
-                  else
-                    open(Chef::Config[:json_attribs])
-                  end
-      rescue SocketError => error
-        Chef::Application.fatal!("I cannot connect to #{Chef::Config[:json_attribs]}", 2)
-      rescue Errno::ENOENT => error
-        Chef::Application.fatal!("I cannot find #{Chef::Config[:json_attribs]}", 2)
-      rescue Errno::EACCES => error
-        Chef::Application.fatal!("Permissions are incorrect on #{Chef::Config[:json_attribs]}. Please chmod a+r #{Chef::Config[:json_attribs]}", 2)
-      rescue Exception => error
-        Chef::Application.fatal!("Got an unexpected error reading #{Chef::Config[:json_attribs]}: #{error.message}", 2)
-      end
+      config_fetcher = Chef::ConfigFetcher.new(Chef::Config[:json_attribs])
+      @chef_client_json = config_fetcher.fetch_json
+    end
+  end
 
-      begin
-        @chef_client_json = Chef::JSONCompat.from_json(json_io.read)
-        json_io.close unless json_io.closed?
-      rescue JSON::ParserError => error
-        Chef::Application.fatal!("Could not parse the provided JSON file (#{Chef::Config[:json_attribs]})!: " + error.message, 2)
+  def load_config_file
+    Chef::Config.config_file_jail = config[:config_file_jail] if config[:config_file_jail]
+    if !config.has_key?(:config_file)
+      if config[:local_mode]
+        require 'chef/knife'
+        config[:config_file] = Chef::Knife.locate_config_file
+      else
+        config[:config_file] = Chef::Config.platform_specific_path("/etc/chef/client.rb")
       end
     end
+    super
   end
 
   def configure_logging