chef 10.14.4 → 10.16.0.rc.0

data/lib/chef/resource/http_request.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,8 @@ class Chef
   class Resource
     class HttpRequest < Chef::Resource
       
+      identity_attr :url
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :http_request

data/lib/chef/resource/ifconfig.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Jason K. Jackson (jasonjackson@gmail.com)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Jason K. Jackson
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,10 @@ class Chef
   class Resource
     class Ifconfig < Chef::Resource
       
+      identity_attr :device
+
+      state_attrs :inet_addr, :mask
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :ifconfig

data/lib/chef/resource/link.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -24,7 +25,11 @@ class Chef
     class Link < Chef::Resource
       include Chef::Mixin::Securable
 
-       provides :link, :on_platform  => :all
+      provides :link, :on_platform  => :all
+
+      identity_attr :target_file
+
+      state_attrs :to, :owner, :group
 
       def initialize(name, run_context=nil)
         super

data/lib/chef/resource/log.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Cary Penniman (<cary@rightscale.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -17,22 +18,24 @@
 #
 class Chef
   class Resource
-
-    # Sends a string from a recipe to a log provider
-    #
-    # log "some string to log" do
-    #   level :info  # (default)  also supports :warn, :debug, and :error
-    # end
-    #    
-    # === Example
-    # log "your string to log" 
-    #
-    # or 
-    #
-    # log "a debug string" { level :debug }
-    #  
     class Log < Chef::Resource
-      
+    
+      identity_attr :name
+
+      # Sends a string from a recipe to a log provider
+      #
+      # log "some string to log" do
+      #   level :info  # (default)  also supports :warn, :debug, and :error
+      # end
+      #    
+      # === Example
+      # log "your string to log" 
+      #
+      # or 
+      #
+      # log "a debug string" { level :debug }
+      #
+  
       # Initialize log resource with a name as the string to log 
       #
       # === Parameters
@@ -54,7 +57,7 @@ class Chef
           :equal_to => [ :debug, :info, :warn, :error, :fatal ]
         )
       end
-      
+    
     end
   end  
 end

data/lib/chef/resource/mdadm.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Joe Williams (<joe@joetify.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Joe Williams
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,10 @@ class Chef
   class Resource
     class Mdadm < Chef::Resource
 
+      identity_attr :raid_device
+
+      state_attrs :devices, :level, :chunk
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :mdadm

data/lib/chef/resource/mount.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Joshua Timberman (<joshua@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Opscode, Inc
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,10 @@ class Chef
   class Resource
     class Mount < Chef::Resource
       
+      identity_attr :device
+
+      state_attrs :mount_point, :device_type, :fstype
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :mount

data/lib/chef/resource/ohai.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Michael Leinartas (<mleinartas@gmail.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2010 Michael Leinartas
 # License:: Apache License, Version 2.0
 #
@@ -20,9 +21,14 @@ class Chef
   class Resource
     class Ohai < Chef::Resource
       
+      identity_attr :name
+
+      state_attrs :plugin
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :ohai
+        @name = name
         @allowed_actions.push(:reload)
         @action = :reload
         @plugin = nil
@@ -35,6 +41,14 @@ class Chef
           :kind_of => [ String ]
         )
       end
+
+      def name(arg=nil)
+        set_or_return(
+          :name,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
     end
   end
 end

data/lib/chef/resource/package.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -24,7 +25,7 @@ class Chef
 
       identity_attr :package_name
 
-      state_attrs :version
+      state_attrs :version, :options
 
       def initialize(name, run_context=nil)
         super

data/lib/chef/resource/remote_directory.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -27,6 +28,10 @@ class Chef
 
       provides :remote_directory, :on_platforms => :all
 
+      identity_attr :path
+
+      state_attrs :files_owner, :files_group, :files_mode
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :remote_directory

data/lib/chef/resource/route.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Bryan McLellan (btm@loftninjas.org)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2009 Bryan McLellan
 # License:: Apache License, Version 2.0
 #
@@ -21,7 +22,11 @@ require 'chef/resource'
 class Chef
   class Resource
     class Route < Chef::Resource
-      
+
+      identity_attr :target
+
+      state_attrs :netmask, :gateway
+     
       def initialize(name, run_context=nil)
         super
         @resource_name = :route

data/lib/chef/resource/ruby_block.rb

@@ -21,11 +21,14 @@ class Chef
   class Resource
     class RubyBlock < Chef::Resource
       
+      identity_attr :block_name
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :ruby_block
         @action = "create"
         @allowed_actions.push(:create)
+        @block_name = name
       end
 
       def block(&block)
@@ -35,6 +38,14 @@ class Chef
           @block
         end
       end
+
+      def block_name(arg=nil)
+        set_or_return(
+          :block_name,
+          arg,
+          :kind_of => String
+        )
+      end
     end
   end
 end

data/lib/chef/resource/scm.rb

@@ -23,6 +23,10 @@ class Chef
   class Resource
     class Scm < Chef::Resource
 
+      identity_attr :destination 
+      
+      state_attrs :revision
+
       def initialize(name, run_context=nil)
         super
         @destination = name

data/lib/chef/resource/script.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,8 @@ class Chef
   class Resource
     class Script < Chef::Resource::Execute
       
+      identity_attr :command
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :script

data/lib/chef/resource/service.rb

@@ -1,5 +1,6 @@
 #
 # Author:: AJ Christensen (<aj@hjksolutions.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -22,6 +23,10 @@ class Chef
   class Resource
     class Service < Chef::Resource
       
+      identity_attr :service_name
+
+      state_attrs :enabled, :running
+
       def initialize(name, run_context=nil)
         super
         @resource_name = :service

data/lib/chef/resource/subversion.rb

@@ -1,5 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -21,7 +22,7 @@ require "chef/resource/scm"
 class Chef
   class Resource
     class Subversion < Chef::Resource::Scm
-      
+
       def initialize(name, run_context=nil)
         super
         @svn_arguments = '--no-auth-cache'

data/lib/chef/resource/template.rb

@@ -1,6 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@opscode.com>)
 # Author:: Seth Chisamore (<schisamo@opscode.com>)
+# Author:: Tyler Cloke (<tyler@opscode.com>)
 # Copyright:: Copyright (c) 2008, 2011 Opscode, Inc.
 # License:: Apache License, Version 2.0
 #

data/lib/chef/resource/user.rb

@@ -21,6 +21,10 @@ require 'chef/resource'
 class Chef
   class Resource
     class User < Chef::Resource
+
+      identity_attr :username
+
+      state_attrs :uid, :gid, :home
       
       def initialize(name, run_context=nil)
         super

data/lib/chef/resource_reporter.rb

@@ -58,6 +58,7 @@ class Chef
         as_hash["duration"] = (elapsed_time * 1000).to_i.to_s
         as_hash["delta"]  = new_resource.diff if new_resource.respond_to?("diff")
         as_hash["delta"]  = "" if as_hash["delta"].nil?
+
         # TODO: rename as "action"
         as_hash["result"] = action.to_s
         if success?
@@ -84,12 +85,13 @@ class Chef
     attr_reader :exception
     attr_reader :run_id
     attr_reader :error_descriptions
+    attr_reader :summary_only
 
     def initialize(rest_client)
-      if Chef::Config[:disable_reporting]
-        @reporting_enabled = false
-      else
+      if Chef::Config[:enable_reporting] && !Chef::Config[:why_run]
         @reporting_enabled = true
+      else
+        @reporting_enabled = false
       end
       @updated_resources = []
       @total_res_count = 0
@@ -99,22 +101,31 @@ class Chef
       @run_id = nil
       @rest_client = rest_client
       @node = nil
-      @error_descriptions = nil
+      @error_descriptions = {}
+      @summary_only = true
     end
 
     def node_load_completed(node, expanded_run_list_with_versions, config)
       @node = node
-
       if reporting_enabled?
         begin
-          resource_history_url = "reports/nodes/#{@node.name}/runs"
+          resource_history_url = "reports/nodes/#{node.name}/runs"
           server_response = @rest_client.post_rest(resource_history_url, {:action => :begin})
           run_uri = URI.parse(server_response["uri"])
           @run_id = ::File.basename(run_uri.path)
           Chef::Log.info("Chef server generated run history id: #{@run_id}")
-        rescue Net::HTTPServerException => e
-          raise unless e.response.code.to_s == "404"
-          Chef::Log.debug("Received 404 attempting to generate run history id (URL Path: #{resource_history_url}), assuming feature is not supported.")
+          @summary_only = server_response["summary_only"]
+        rescue Timeout::Error, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError => e
+          if !e.response || e.response.code.to_s != 404
+            if Chef::Config[:enable_reporting_url_fatals]
+              Chef::Log.error("Received exception attempting to generate run history id (URL Path: #{resource_history_url}), and enable_reporting_url_fatals is set, aborting run.")
+              raise
+            else
+              Chef::Log.info("Received exception attempting to generate run history id (URL Path: #{resource_history_url}), disabling reporting for this run.")
+            end
+          else
+            Chef::Log.debug("Received 404 attempting to generate run history id (URL Path: #{resource_history_url}), assuming feature is not supported.")
+          end
           @reporting_enabled = false
         end
       end
@@ -159,42 +170,69 @@ class Chef
     end
 
     def run_completed(node)
-      if reporting_enabled?
-        resource_history_url = "reports/nodes/#{@node.name}/runs/#{run_id}"
-        run_data = report(node)
-        run_data["action"] = "end"
-        Chef::Log.info("Sending resource update report (run-id: #{run_id})")
-        Chef::Log.debug run_data.inspect
-        @rest_client.post_rest(resource_history_url, run_data)
-      else
-        Chef::Log.debug("Server doesn't support resource history, skipping resource report.")
-      end
+      @status = "success"
+      post_reporting_data
     end
 
     def run_failed(exception)
       @exception = exception
       @status = "failure"
+      post_reporting_data
     end
 
-    def report(node)
+    def post_reporting_data
+      if reporting_enabled?
+        run_data = prepare_run_data
+        resource_history_url = "reports/nodes/#{@node.name}/runs/#{@run_id}"
+        Chef::Log.info("Sending resource update report (run-id: #{@run_id})")
+        Chef::Log.debug run_data.inspect
+        compressed_data = encode_gzip(run_data.to_json)
+        #if summary only is enabled send the uncompressed run_data excluding the run_data["resources"] and some additional metrics.
+        if @summary_only
+          run_data = report_summary(run_data, compressed_data)
+          Chef::Log.info("run_data_summary: #{run_data}")
+          @rest_client.post_rest(resource_history_url, run_data)
+        else
+          Chef::Log.debug("Sending Compressed Run Data...")
+          # Since we're posting compressed data we can not directly call
+          # post_rest which expects JSON
+          reporting_url = @rest_client.create_url(resource_history_url)
+          @rest_client.raw_http_request(:POST, reporting_url, {'Content-Encoding' => 'gzip'}, compressed_data)
+        end
+      else
+        Chef::Log.debug("Server doesn't support resource history, skipping resource report.")
+      end
+    end
+    
+    def prepare_run_data
       run_data = {}
+      run_data["action"] = "end"
       run_data["resources"] = updated_resources.map do |resource_record|
         resource_record.for_json
       end
-      run_data["status"] = status
-      run_data["run_list"] = node.run_list.to_json
+      run_data["status"] = @status
+      run_data["run_list"] = @node.run_list.to_json
       run_data["total_res_count"] = @total_res_count.to_s
       run_data["data"] = {}
+
       if exception
-        run_data["data"]["exception"] = {}
-        run_data["data"]["exception"]["class"] = exception.inspect
-        run_data["data"]["exception"]["message"] = exception.message
-        run_data["data"]["exception"]["backtrace"] = exception.backtrace
-        run_data["data"]["exception"]["description"] = @error_descriptions
+        exception_data = {}
+        exception_data["class"] = exception.inspect
+        exception_data["message"] = exception.message
+        exception_data["backtrace"] = exception.backtrace.to_json
+        exception_data["description"] =  @error_descriptions
+        run_data["data"]["exception"] = exception_data
       end
       run_data
     end
 
+    def report_summary(run_data, compressed_data)
+      run_data["updated_res_count"] = updated_resources.count.to_s
+      run_data["post_size"] = compressed_data.bytesize.to_s
+      run_data["resources"] = []
+      run_data
+    end
+
     def run_list_expand_failed(node, exception)
       description = Formatters::ErrorMapper.run_list_expand_failed(node, exception)
       @error_descriptions = description.for_json
@@ -224,5 +262,11 @@ class Chef
       @pending_update && @pending_update.new_resource != new_resource
     end
 
+    def encode_gzip(data)
+      "".tap do |out|
+        Zlib::GzipWriter.wrap(StringIO.new(out)){|gz| gz << data }
+      end
+    end
+
   end
 end