Fixes to allow for JSON Attribute files, removed HTTP header debugging, moved the timer to wrap the entire chef-client run

Author: adamhjk

chef-server/lib/public/stylesheets/master.css

@@ -153,140 +153,21 @@ div.node {
 }
 */
 
-pre.twilight .DiffInserted {
-   background-color: #253B22;
-   color: #F8F8F8;
-}
-pre.twilight .DiffHeader {
-   background-color: #0E2231;
-   color: #F8F8F8;
-   font-style: italic;
-}
-pre.twilight .CssPropertyValue {
-   color: #F9EE98;
-}
-pre.twilight .CCCPreprocessorDirective {
-   color: #AFC4DB;
-}
-pre.twilight .Constant {
-   color: #CF6A4C;
-}
-pre.twilight .DiffChanged {
-   background-color: #4A410D;
-   color: #F8F8F8;
-}
-pre.twilight .EmbeddedSource {
-   background-color: #A3A6AD;
-}
-pre.twilight .Support {
-   color: #9B859D;
-}
-pre.twilight .MarkupList {
-   color: #F9EE98;
-}
-pre.twilight .CssConstructorArgument {
-   color: #8F9D6A;
-}
-pre.twilight .Storage {
-   color: #F9EE98;
-}
-pre.twilight .line-numbers {
-   background-color: #DDF0FF;
-   color: #000000;
-}
-pre.twilight .CssClass {
-   color: #9B703F;
-}
-pre.twilight .StringConstant {
-   color: #DDF2A4;
-}
-pre.twilight .CssAtRule {
-   color: #8693A5;
-}
-pre.twilight .MetaTagInline {
-   color: #E0C589;
-}
-pre.twilight .MarkupHeading {
-   color: #CF6A4C;
-}
-pre.twilight .CssTagName {
-   color: #CDA869;
-}
-pre.twilight .SupportConstant {
-   color: #CF6A4C;
-}
-pre.twilight .DiffDeleted {
-   background-color: #420E09;
-   color: #F8F8F8;
-}
-pre.twilight .CCCPreprocessorLine {
-   color: #8996A8;
-}
-pre.twilight .StringRegexpSpecial {
-   color: #CF7D34;
-}
-pre.twilight .EmbeddedSourceBright {
-   background-color: #9C9EA4;
-}
-pre.twilight .InvalidIllegal {
-   background-color: #241A24;
-   color: #F8F8F8;
-}
-pre.twilight .SupportFunction {
-   color: #DAD085;
-}
-pre.twilight .CssAdditionalConstants {
-   color: #CA7840;
-}
-pre.twilight .MetaTagAll {
-   color: #AC885B;
-}
-pre.twilight .StringRegexp {
-   color: #E9C062;
-}
-pre.twilight .StringEmbeddedSource {
-   color: #DAEFA3;
-}
-pre.twilight .EntityInheritedClass {
-   color: #9B5C2E;
-   font-style: italic;
-}
-pre.twilight .CssId {
-   color: #8B98AB;
-}
-pre.twilight .CssPseudoClass {
-   color: #8F9D6A;
-}
-pre.twilight .StringVariable {
-   color: #8A9A95;
-}
-pre.twilight .String {
-   color: #8F9D6A;
-}
-pre.twilight .Keyword {
-   color: #CDA869;
-}
-pre.twilight {
-   background-color: #141414;
-   color: #F8F8F8;
-}
-pre.twilight .CssPropertyName {
-   color: #C5AF75;
-}
-pre.twilight .DoctypeXmlProcessing {
-   color: #494949;
-}
-pre.twilight .InvalidDeprecated {
-   color: #D2A8A1;
-   font-style: italic;
-}
-pre.twilight .Variable {
-   color: #7587A6;
-}
-pre.twilight .Entity {
-   color: #9B703F;
-}
-pre.twilight .Comment {
-   color: #5F5A60;
-   font-style: italic;
-}
+.ruby .normal {}
+.ruby .comment { color: #005; font-style: italic; }
+.ruby .keyword { color: #A00; font-weight: bold; }
+.ruby .method { color: #077; }
+.ruby .class { color: #074; }
+.ruby .module { color: #050; }
+.ruby .punct { color: #447; font-weight: bold; }
+.ruby .symbol { color: #099; }
+.ruby .string { color: #944; background: #FFE; }
+.ruby .char { color: #F07; }
+.ruby .ident { color: #004; }
+.ruby .constant { color: #07F; }
+.ruby .regex { color: #B66; background: #FEF; }
+.ruby .number { color: #F99; }
+.ruby .attribute { color: #7BB; }
+.ruby .global { color: #7FB; }
+.ruby .expr { color: #227; }
+.ruby .escape { color: #277; }

chef-server/lib/views/search/show.html.haml

@@ -7,7 +7,7 @@
   .search_result
     %h3= "#{h result[:index_name]} (#{h result[:id]})"
     %table
-      - result.each do |k, v|
+      - result.sort { |a,b| a[0] <=> b[0] }.each do |k, v|
         %tr.attr_group
           %td.attr_name= k
           %td.attr_value= v.kind_of?(Array) ? v.join(",") : v

chef-server/pkg/chef-server-0.0.1.gem

@@ -19,20 +19,25 @@
 # limitations under the License.
 
 require 'optparse'
-require 'chef'
 require 'rubygems'
+require 'chef'
 require 'facter'
+require 'json'
 
 config = {
   :config_file => "/etc/chef/client.rb",
   :log_level => :info,
+  :json_attribs => nil,
   :noop => false
 }
 opts = OptionParser.new do |opts|
   opts.banner = "Usage: #{$0} [-d DIR|-r FILE] (options)"
   opts.on("-c CONFIG", "--config CONFIG", "The Chef Config file to use") do |c|
     config[:config_file] = c
   end
+  opts.on("-j JSON_ATTRIBS", "--json-attributes JSON_ATTRIBS", "Load attributes from a JSON file") do |j|
+    config[:json_attribs] = j
+  end
   opts.on("-n", "--noop", "Print what you would do, but don't actually do it.") do
     config[:noop] = true
   end
@@ -49,7 +54,15 @@ opts.parse!(ARGV)
 unless File.exists?(config[:config_file]) && File.readable?(config[:config_file])
   puts "I cannot find or read the config file: #{config[:config_file]}"
   puts opts
-  exit
+  exit 1
+end
+
+if config[:json_attribs]
+  unless File.exists?(config[:json_attribs])
+    puts "I cannot find #{config[:json_attribs]}"
+    exit 2
+  end
+  config[:json_attribs] = JSON.parse(IO.read(config[:json_attribs]))
 end
 
 # Load our config file
@@ -59,4 +72,5 @@ if config[:log_level]
 end
 
 c = Chef::Client.new
+c.json_attribs = config[:json_attribs]
 c.run

chef/bin/chef-client

@@ -28,13 +28,14 @@ class Client
     include Chef::Mixin::GenerateURL
     include Chef::Mixin::Checksum
 
-    attr_accessor :node, :registration, :safe_name
+    attr_accessor :node, :registration, :safe_name, :json_attribs
 
     # Creates a new Chef::Client.
     def initialize()
       @node = nil
       @safe_name = nil
       @registration = nil
+      @json_attribs = nil
       @rest = Chef::REST.new(Chef::Config[:registration_url])
     end
 
@@ -53,6 +54,9 @@ def initialize()
     # === Returns
     # true:: Always returns true.
     def run
+      start_time = Time.now
+      Chef::Log.info("Starting Chef Run")
+      
       build_node
       register
       authenticate
@@ -63,6 +67,9 @@ def run
       save_node
       converge
       save_node
+      
+      end_time = Time.now
+      Chef::Log.info("Chef Run complete in #{end_time - start_time} seconds")
       true
     end
 
@@ -96,7 +103,24 @@ def build_node(node_name=nil)
         @node ||= Chef::Node.new
         @node.name(node_name)
       end
+      if @json_attribs
+        Chef::Log.debug("Adding JSON Attributes")
+        @json_attribs.each do |key, value|
+          if key == "recipes"
+            value.each do |recipe|
+              unless @node.recipes.detect { |r| r == recipe }
+                Chef::Log.debug("Adding recipe #{recipe}")
+                @node.recipes << recipe
+              end
+            end
+          else
+            Chef::Log.debug("JSON Attribute: #{key} - #{value.inspect}")
+            @node[key] = value
+          end
+        end
+      end
       Facter.each do |field, value|
+        Chef::Log.debug("Facter Attribute: #{field} - #{value.inspect}")
         @node[field] = value
       end
       @node
@@ -288,7 +312,7 @@ def converge
       cr.converge
       true
     end
-    
+        
     protected
       # Generates a random password of "len" length.
       def random_password(len)

chef/lib/chef/client.rb

@@ -136,10 +136,6 @@ def run_request(method, url, data=false, limit=10, raw=false)
         res = response
       end
 
-      Chef::Log.debug("HTTP request headers: #{req.to_hash.inspect} ")
-
-      Chef::Log.debug("HTTP response headers: #{res.to_hash.inspect} ")
-
       if res.kind_of?(Net::HTTPSuccess)
         if res['set-cookie']
           @cookies["#{url.host}:#{url.port}"] = res['set-cookie']

chef/lib/chef/rest.rb

@@ -54,8 +54,7 @@ def build_provider(resource)
     end
 
     def converge
-      start_time = Time.now
-      Chef::Log.info("Starting Chef Run")
+
       delayed_actions = Array.new
 
       @collection.each do |resource|
@@ -92,8 +91,7 @@ def converge
 
       # Run all our :delayed actions
       delayed_actions.each { |da| da.call }
-      end_time = Time.now
-      Chef::Log.info("Chef Run complete in #{end_time - start_time} seconds")
+
       true
     end
   end