chef 10.14.0.beta.3 → 10.14.0.rc.0

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

@@ -24,9 +24,6 @@ __chef-client__ _(options)_
   * `-L`, `--logfile LOGLOCATION`:
     Set the log file location, defaults to STDOUT - recommended for
     daemonizing
-  * `-V`, `--verbose`:
-    Ensures logging goes to STDOUT as well as  to  other  configured
-    log location(s).
   * `-N`, `--node-name NODE_NAME`:
     The node name for this client
   * `-o`, `--override-runlist`:

data/lib/chef/client.rb

@@ -224,6 +224,12 @@ class Chef
         raise Chef::Exceptions::CannotDetermineNodeName, msg
       end
 
+      # node names > 90 bytes only work with authentication protocol >= 1.1
+      # see discussion in config.rb.
+      if name.bytesize > 90
+        Chef::Config[:authentication_protocol_version] = "1.1"
+      end
+
       name
     end
 
@@ -421,10 +427,14 @@ class Chef
         @events.run_completed(node)
         true
       rescue Exception => e
-        run_status.stop_clock
-        run_status.exception = e
-        run_failed
+        # CHEF-3336: Send the error first in case something goes wrong below and we don't know why
         Chef::Log.debug("Re-raising exception: #{e.class} - #{e.message}\n#{e.backtrace.join("\n  ")}")
+        # If we failed really early, we may not have a run_status yet. Too early for these to be of much use.
+        if run_status
+          run_status.stop_clock
+          run_status.exception = e
+          run_failed
+        end
         @events.run_failed(e)
         raise
       ensure

data/lib/chef/config.rb

@@ -232,7 +232,36 @@ class Chef
     # (persist across rabbitmq restarts)
     amqp_consumer_id "default"
 
+    # Sets the version of the signed header authentication protocol to use (see
+    # the 'mixlib-authorization' project for more detail). Currently, versions
+    # 1.0 and 1.1 are available; however, the chef-server must first be
+    # upgraded to support version 1.1 before clients can begin using it.
+    #
+    # Version 1.1 of the protocol is required when using a `node_name` greater
+    # than ~90 bytes (~90 ascii characters), so chef-client will automatically
+    # switch to using version 1.1 when `node_name` is too large for the 1.0
+    # protocol. If you intend to use large node names, ensure that your server
+    # supports version 1.1. Automatic detection of large node names means that
+    # users will generally not need to manually configure this.
+    #
+    # In the future, this configuration option may be replaced with an
+    # automatic negotiation scheme.
+    authentication_protocol_version "1.0"
+
+    # This key will be used to sign requests to the Chef server. This location
+    # must be writable by Chef during initial setup when generating a client
+    # identity on the server.
+    #
+    # The chef-server will look up the public key for the client using the
+    # `node_name` of the client.
     client_key platform_specific_path("/etc/chef/client.pem")
+
+    # If there is no file in the location given by `client_key`, chef-client
+    # will temporarily use the "validator" identity to generate one. If the
+    # `client_key` is not present and the `validation_key` is also not present,
+    # chef-client will not be able to authenticate to the server.
+    #
+    # The `validation_key` is never used if the `client_key` exists.
     validation_key platform_specific_path("/etc/chef/validation.pem")
     validation_client_name "chef-validator"
     web_ui_client_name "chef-webui"

data/lib/chef/environment.rb

@@ -265,8 +265,11 @@ class Chef
 
     def self.list(inflate=false)
       if inflate
-        # TODO: index the environments and use search to inflate - don't inflate for now :(
-        chef_server_rest.get_rest("environments")
+        response = Hash.new
+        Chef::Search::Query.new.search(:environment) do |e|
+          response[e.name] = e unless e.nil?
+        end
+        response
       else
         chef_server_rest.get_rest("environments")
       end

data/lib/chef/file_access_control/unix.rb

@@ -60,7 +60,7 @@ class Chef
       end
 
       def should_update_owner?
-        target_uid != current_uid
+        !target_uid.nil? && target_uid != current_uid
       end
 
       def set_owner!
@@ -103,7 +103,7 @@ class Chef
       end
 
       def should_update_group?
-        target_gid != current_gid
+        !target_gid.nil? && target_gid != current_gid
       end
 
       def set_group!
@@ -136,7 +136,7 @@ class Chef
       end
 
       def should_update_mode?
-        current_mode != target_mode
+        !target_mode.nil? && current_mode != target_mode 
       end
 
       def set_mode!

data/lib/chef/knife.rb

@@ -269,6 +269,10 @@ class Chef
         msg opt_parser
         exit 1
       end
+
+      # copy Mixlib::CLI over so that it cab be configured in knife.rb
+      # config file
+      Chef::Config[:verbosity] = config[:verbosity]
     end
 
     def parse_options(args)
@@ -320,7 +324,7 @@ class Chef
 
       Chef::Config[:color] = config[:color]
 
-      case config[:verbosity]
+      case Chef::Config[:verbosity]
       when 0
         Chef::Config[:log_level] = :error
       when 1
@@ -345,9 +349,11 @@ class Chef
       Chef::Log.level(Chef::Config[:log_level] || :error)
 
       Chef::Log.debug("Using configuration from #{config[:config_file]}")
-
-      if Chef::Config[:node_name].nil?
-        #raise ArgumentError, "No user specified, pass via -u or specifiy 'node_name' in #{config[:config_file] ? config[:config_file] : "~/.chef/knife.rb"}"
+      
+      if Chef::Config[:node_name] && Chef::Config[:node_name].bytesize > 90
+        # node names > 90 bytes only work with authentication protocol >= 1.1
+        # see discussion in config.rb.
+        Chef::Config[:authentication_protocol_version] = "1.1"
       end
     end
 
@@ -401,7 +407,7 @@ class Chef
       enforce_path_sanity
       run
     rescue Exception => e
-      raise if config[:verbosity] == 2
+      raise if Chef::Config[:verbosity] == 2
       humanize_exception(e)
       exit 100
     end

data/lib/chef/knife/bootstrap.rb

@@ -128,7 +128,7 @@ class Chef
           name, path = h.split("=")
           Chef::Config[:knife][:hints][name] = path ? JSON.parse(::File.read(path)) : Hash.new  }
 
-      def load_template(template=nil)
+      def find_template(template=nil)
         # Are we bootstrapping using an already shipped template?
         if config[:template_file]
           bootstrap_files = config[:template_file]
@@ -153,7 +153,7 @@ class Chef
 
         Chef::Log.debug("Found bootstrap template in #{File.dirname(template)}")
 
-        IO.read(template).chomp
+        template
       end
 
       def render_template(template=nil)
@@ -161,13 +161,17 @@ class Chef
         Erubis::Eruby.new(template).evaluate(context)
       end
 
-      def run
+      def read_template
+        IO.read(@template_file).chomp
+      end
 
+      def run
         validate_name_args!
+        @template_file = find_template(config[:bootstrap_template])
         @node_name = Array(@name_args).first
         # back compat--templates may use this setting:
         config[:server_name] = @node_name
-
+        
         $stdout.sync = true
 
         ui.info("Bootstrapping Chef on #{ui.color(@node_name, :bold)}")
@@ -216,7 +220,7 @@ class Chef
       end
 
       def ssh_command
-        command = render_template(load_template(config[:bootstrap_template]))
+        command = render_template(read_template)
 
         if config[:use_sudo]
           command = "sudo #{command}"

data/lib/chef/knife/bootstrap/archlinux-gems.erb

@@ -31,7 +31,6 @@ rm /tmp/encrypted_data_bag_secret
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir -p /etc/chef/ohai/hints
-<% end -%>
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
@@ -40,6 +39,7 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>
+<% end -%>
 
 (
 cat <<'EOP'

data/lib/chef/knife/bootstrap/centos5-gems.erb

@@ -44,7 +44,6 @@ rm /tmp/encrypted_data_bag_secret
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir -p /etc/chef/ohai/hints
-<% end -%>
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
@@ -53,6 +52,7 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>
+<% end -%>
 
 (
 cat <<'EOP'

data/lib/chef/knife/bootstrap/chef-full.erb

@@ -47,7 +47,6 @@ rm /tmp/encrypted_data_bag_secret
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir -p /etc/chef/ohai/hints
-<% end -%>
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
@@ -56,6 +55,7 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>
+<% end -%>
 
 (
 cat <<'EOP'

data/lib/chef/knife/bootstrap/fedora13-gems.erb

@@ -31,7 +31,6 @@ rm /tmp/encrypted_data_bag_secret
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir -p /etc/chef/ohai/hints
-<% end -%>
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
@@ -40,6 +39,7 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>
+<% end -%>
 
 (
 cat <<'EOP'

data/lib/chef/knife/bootstrap/ubuntu10.04-apt.erb

@@ -31,7 +31,6 @@ rm /tmp/encrypted_data_bag_secret
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir -p /etc/chef/ohai/hints
-<% end -%>
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
@@ -40,6 +39,7 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>
+<% end -%>
 
 <% unless @chef_config[:validation_client_name] == "chef-validator" -%>
 [  `grep -qx "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" /etc/chef/client.rb` ] || echo "validation_client_name \"<%= @chef_config[:validation_client_name] %>\"" >> /etc/chef/client.rb

data/lib/chef/knife/bootstrap/ubuntu10.04-gems.erb

@@ -38,7 +38,6 @@ rm /tmp/encrypted_data_bag_secret
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir -p /etc/chef/ohai/hints
-<% end -%>
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
@@ -47,6 +46,7 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>
+<% end -%>
 
 (
 cat <<'EOP'

data/lib/chef/knife/bootstrap/ubuntu12.04-gems.erb

@@ -33,7 +33,6 @@ rm /tmp/encrypted_data_bag_secret
 <%# Generate Ohai Hints -%>
 <% unless @chef_config[:knife][:hints].nil? || @chef_config[:knife][:hints].empty? -%>
 mkdir -p /etc/chef/ohai/hints
-<% end -%>
 
 <% @chef_config[:knife][:hints].each do |name, hash| -%>
 (
@@ -42,6 +41,7 @@ cat <<'EOP'
 EOP
 ) > /etc/chef/ohai/hints/<%= name %>.json
 <% end -%>
+<% end -%>
 
 (
 cat <<'EOP'

data/lib/chef/knife/cookbook_create.rb

@@ -75,6 +75,7 @@ class Chef
         readme_format = ((config[:readme_format] != "false") && config[:readme_format]) || "md"
         create_cookbook(cookbook_path,cookbook_name, copyright, license)
         create_readme(cookbook_path,cookbook_name,readme_format)
+        create_changelog(cookbook_path,cookbook_name)
         create_metadata(cookbook_path,cookbook_name, copyright, email, license,readme_format)
       end
 
@@ -179,6 +180,28 @@ EOH
         end
       end
 
+      def create_changelog(dir, cookbook_name)
+        msg("** Creating CHANGELOG for cookbook: #{cookbook_name}")
+        unless File.exists?(File.join(dir,cookbook_name,'CHANGELOG.md'))
+          open(File.join(dir, cookbook_name, 'CHANGELOG.md'),'w') do |file|
+            file.puts <<-EOH
+# CHANGELOG for #{cookbook_name}
+
+This file is used to list changes made in each version of #{cookbook_name}.
+
+## 0.1.0:
+
+* Initial release of #{cookbook_name}
+
+- - - 
+Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown.
+
+The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown.
+EOH
+          end
+        end
+      end
+
       def create_readme(dir, cookbook_name,readme_format)
         msg("** Creating README for cookbook: #{cookbook_name}")
         unless File.exists?(File.join(dir, cookbook_name, "README.#{readme_format}"))
@@ -253,7 +276,7 @@ maintainer_email "#{email}"
 license          "#{license_name}"
 description      "Installs/Configures #{cookbook_name}"
 #{long_description}
-version          "0.0.1"
+version          "0.1.0"
 EOH
           end
         end

data/lib/chef/knife/ssh.rb

@@ -79,7 +79,7 @@ class Chef
         :short => "-G GATEWAY",
         :long => "--ssh-gateway GATEWAY",
         :description => "The ssh gateway",
-        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gatewa] = key }
+        :proc => Proc.new { |key| Chef::Config[:knife][:ssh_gateway] = key }
 
       option :identity_file,
         :short => "-i IDENTITY_FILE",
@@ -124,7 +124,13 @@ class Chef
                  q = Chef::Search::Query.new
                  @action_nodes = q.search(:node, @name_args[0])[0]
                  @action_nodes.each do |item|
-                   i = format_for_display(item)[config[:attribute]]
+                   # if a command line attribute was not passed, and we have a cloud public_hostname, use that.
+                   # see #configure_attribute for the source of config[:attribute] and config[:override_attribute]
+                   if !config[:override_attribute] && item[:cloud] and item[:cloud][:public_hostname]
+                     i = format_for_display(item)[:cloud][:public_hostname]
+                   else
+                     i = format_for_display(item)[config[:attribute]]
+                   end
                    r.push(i) unless i.nil?
                  end
                  r
@@ -334,6 +340,12 @@ class Chef
       end
 
       def configure_attribute
+        # Setting 'knife[:ssh_attribute] = "foo"' in knife.rb => Chef::Config[:knife][:ssh_attribute] == 'foo'
+        # Running 'knife ssh -a foo' => both Chef::Config[:knife][:ssh_attribute] && config[:attribute] == foo
+        # Thus we can differentiate between a config file value and a command line override at this point by checking config[:attribute]
+        # We can tell here if fqdn was passed from the command line, rather than being the default, by checking config[:attribute]
+        # However, after here, we cannot tell these things, so we must preserve config[:attribute]
+        config[:override_attribute] = config[:attribute]
         config[:attribute] = (Chef::Config[:knife][:ssh_attribute] ||
                               config[:attribute] ||
                               "fqdn").strip

data/lib/chef/platform.rb

@@ -211,7 +211,7 @@ class Chef
           :openindiana => {
             :default => {
               :service => Chef::Provider::Service::Solaris,
-              :package => Chef::Provider::Package::Solaris,
+              :package => Chef::Provider::Package::Ips,
               :cron => Chef::Provider::Cron::Solaris,
               :group => Chef::Provider::Group::Usermod
             }
@@ -219,7 +219,7 @@ class Chef
           :opensolaris => {
             :default => {
               :service => Chef::Provider::Service::Solaris,
-              :package => Chef::Provider::Package::Solaris,
+              :package => Chef::Provider::Package::Ips,
               :cron => Chef::Provider::Cron::Solaris,
               :group => Chef::Provider::Group::Usermod
             }
@@ -232,8 +232,28 @@ class Chef
               :group => Chef::Provider::Group::Usermod
             }
           },
+          :omnios => {
+            :default => {
+              :service => Chef::Provider::Service::Solaris,
+              :package => Chef::Provider::Package::Ips,
+              :cron => Chef::Provider::Cron::Solaris,
+              :group => Chef::Provider::Group::Usermod
+            }
+          },
           :solaris2 => {
             :default => {
+              :service => Chef::Provider::Service::Solaris,
+              :package => Chef::Provider::Package::Ips,
+              :cron => Chef::Provider::Cron::Solaris,
+              :group => Chef::Provider::Group::Usermod
+            },
+            "5.9" => {
+              :service => Chef::Provider::Service::Solaris,
+              :package => Chef::Provider::Package::Solaris,
+              :cron => Chef::Provider::Cron::Solaris,
+              :group => Chef::Provider::Group::Usermod
+            },
+            "5.10" => {
               :service => Chef::Provider::Service::Solaris,
               :package => Chef::Provider::Package::Solaris,
               :cron => Chef::Provider::Cron::Solaris,