chef 10.34.6-x86-mingw32 → 11.6.2-x86-mingw32

data/lib/chef/daemon.rb

@@ -46,10 +46,7 @@ class Chef
             $stdout.reopen("/dev/null", "a")
             $stderr.reopen($stdout)
             save_pid_file
-            at_exit {
-              Chef::Log.debug("daemon pid #{Process.pid} in at_exit handler")
-              remove_pid_file
-            }
+            at_exit { remove_pid_file }
           rescue NotImplementedError => e
             Chef::Application.fatal!("There is no fork: #{e.message}")
           end
@@ -77,6 +74,24 @@ class Chef
         Chef::Application.fatal!("You don't have access to the PID file at #{pid_file}: #{e.message}")
       end
       
+      # Check if this process if forked from a Chef daemon
+      # ==== Returns
+      # Boolean::
+      # True if this process is forked 
+      # False if this process is not forked
+      #
+      def forked?
+        if running? and Process.ppid == pid_from_file.to_i
+          # chef daemon is running and this process is a child of it
+          true
+        elsif not running? and Process.ppid == 1
+          # an orphaned fork, its parent becomes init, launchd, etc. after chef daemon dies
+          true
+        else
+          false
+        end
+      end
+      
       # Gets the pid file for @name
       # ==== Returns
       # String::
@@ -110,29 +125,19 @@ class Chef
         end
       
         begin
-          pid = Process.pid.to_s
-          File.open(file, "w") { |f| f.write(pid) }
-          Chef::Log.debug("Wrote #{pid} to #{file}")
+          File.open(file, "w") { |f| f.write(Process.pid.to_s) }
         rescue Errno::EACCES => e
           Chef::Application.fatal!("Couldn't write to pidfile #{file}, permission denied: #{e.message}")
         end
       end
-    
+  
       # Delete the PID from the filesystem
       def remove_pid_file
-        return unless File.exists?(pid_file)
-
-        daemon_pid = pid_from_file
-        my_pid = Process.pid
-        if daemon_pid != my_pid
-          Chef::Log.debug("My pid is #{my_pid}; not removing #{pid_file} which contains #{daemon_pid}")
-          return
+        if not forked? then
+          FileUtils.rm(pid_file) if File.exists?(pid_file)
         end
+      end           
 
-        FileUtils.rm(pid_file)
-        Chef::Log.debug("Removed #{pid_file}")
-      end
-           
       # Change process user/group to those specified in Chef::Config
       #
       def change_privilege

data/lib/chef/data_bag.rb

@@ -21,9 +21,7 @@
 require 'chef/config'
 require 'chef/mixin/params_validate'
 require 'chef/mixin/from_file'
-require 'chef/couchdb'
 require 'chef/data_bag_item'
-require 'chef/index_queue'
 require 'chef/mash'
 require 'chef/json_compat'
 
@@ -32,58 +30,18 @@ class Chef
 
     include Chef::Mixin::FromFile
     include Chef::Mixin::ParamsValidate
-    include Chef::IndexQueue::Indexable
 
     VALID_NAME = /^[\-[:alnum:]_]+$/
 
-    DESIGN_DOCUMENT = {
-      "version" => 2,
-      "language" => "javascript",
-      "views" => {
-        "all" => {
-          "map" => <<-EOJS
-          function(doc) {
-            if (doc.chef_type == "data_bag") {
-              emit(doc.name, doc);
-            }
-          }
-          EOJS
-        },
-        "all_id" => {
-          "map" => <<-EOJS
-          function(doc) {
-            if (doc.chef_type == "data_bag") {
-              emit(doc.name, doc.name);
-            }
-          }
-          EOJS
-        },
-        "entries" => {
-          "map" => <<-EOJS
-          function(doc) {
-            if (doc.chef_type == "data_bag_item") {
-              emit(doc.data_bag, doc.raw_data.id);
-            }
-          }
-          EOJS
-        }
-      }
-    }
-
     def self.validate_name!(name)
       unless name =~ VALID_NAME
         raise Exceptions::InvalidDataBagName, "DataBags must have a name matching #{VALID_NAME.inspect}, you gave #{name.inspect}"
       end
     end
 
-    attr_accessor :couchdb_rev, :couchdb_id, :couchdb
-
     # Create a new Chef::DataBag
-    def initialize(couchdb=nil)
+    def initialize
       @name = ''
-      @couchdb_rev = nil
-      @couchdb_id = nil
-      @couchdb = (couchdb || Chef::CouchDB.new)
     end
 
     def name(arg=nil)
@@ -100,7 +58,6 @@ class Chef
         'json_class' => self.class.name,
         "chef_type" => "data_bag",
       }
-      result["_rev"] = @couchdb_rev if @couchdb_rev
       result
     end
 
@@ -121,37 +78,30 @@ class Chef
     def self.json_create(o)
       bag = new
       bag.name(o["name"])
-      bag.couchdb_rev = o["_rev"] if o.has_key?("_rev")
-      bag.couchdb_id = o["_id"] if o.has_key?("_id")
-      bag.index_id = bag.couchdb_id
       bag
     end
 
-    # List all the Chef::DataBag objects in the CouchDB.  If inflate is set to true, you will get
-    # the full list of all Roles, fully inflated.
-    def self.cdb_list(inflate=false, couchdb=nil)
-      rs = (couchdb || Chef::CouchDB.new).list("data_bags", inflate)
-      lookup = (inflate ? "value" : "key")
-      rs["rows"].collect { |r| r[lookup] }
-    end
-
     def self.list(inflate=false)
-      if inflate
-        # Can't search for all data bags like other objects, fall back to N+1 :(
-        list(false).inject({}) do |response, bag_and_uri|
-          response[bag_and_uri.first] = load(bag_and_uri.first)
-          response
+      if Chef::Config[:solo]
+        unless File.directory?(Chef::Config[:data_bag_path])
+          raise Chef::Exceptions::InvalidDataBagPath, "Data bag path '#{Chef::Config[:data_bag_path]}' is invalid"
         end
+
+        names = Dir.glob(File.join(Chef::Config[:data_bag_path], "*")).map{|f|File.basename(f)}.sort
+        names.inject({}) {|h, n| h[n] = n; h}
       else
-        Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data")
+        if inflate
+          # Can't search for all data bags like other objects, fall back to N+1 :(
+          list(false).inject({}) do |response, bag_and_uri|
+            response[bag_and_uri.first] = load(bag_and_uri.first)
+            response
+          end
+        else
+          Chef::REST.new(Chef::Config[:chef_server_url]).get_rest("data")
+        end
       end
     end
 
-    # Load a Data Bag by name from CouchDB
-    def self.cdb_load(name, couchdb=nil)
-      (couchdb || Chef::CouchDB.new).load("data_bag", name)
-    end
-
     # Load a Data Bag by name via either the RESTful API or local data_bag_path if run in solo mode
     def self.load(name)
       if Chef::Config[:solo]
@@ -160,7 +110,7 @@ class Chef
         end
 
         Dir.glob(File.join(Chef::Config[:data_bag_path], "#{name}", "*.json")).inject({}) do |bag, f|
-          item = JSON.parse(IO.read(f))
+          item = Chef::JSONCompat.from_json(IO.read(f))
           bag[item['id']] = item
           bag
         end
@@ -169,37 +119,21 @@ class Chef
       end
     end
 
-    # Remove this Data Bag from CouchDB
-    def cdb_destroy
-      removed = @couchdb.delete("data_bag", @name, @couchdb_rev)
-      rs = @couchdb.get_view("data_bags", "entries", :include_docs => true, :startkey => @name, :endkey => @name)
-      rs["rows"].each do |row|
-        row["doc"].couchdb = couchdb
-        row["doc"].cdb_destroy
-      end
-      removed
-    end
-
     def destroy
       chef_server_rest.delete_rest("data/#{@name}")
     end
 
-    # Save this Data Bag to the CouchDB
-    def cdb_save
-      results = @couchdb.store("data_bag", @name, self)
-      @couchdb_rev = results["rev"]
-    end
-
     # Save the Data Bag via RESTful API
     def save
       begin
         if Chef::Config[:why_run]
           Chef::Log.warn("In whyrun mode, so NOT performing data bag save.")
         else
-          create
+          chef_server_rest.put_rest("data/#{@name}", self)
         end
       rescue Net::HTTPServerException => e
-        raise e unless e.response.code == "409"
+        raise e unless e.response.code == "404"
+        chef_server_rest.post_rest("data", self)
       end
       self
     end
@@ -210,24 +144,6 @@ class Chef
       self
     end
 
-    # List all the items in this Bag from CouchDB
-    # The self.load method does this through the REST API
-    def list(inflate=false)
-      rs = nil
-      if inflate
-        rs = @couchdb.get_view("data_bags", "entries", :include_docs => true, :startkey => @name, :endkey => @name)
-        rs["rows"].collect { |r| r["doc"] }
-      else
-        rs = @couchdb.get_view("data_bags", "entries", :startkey => @name, :endkey => @name)
-        rs["rows"].collect { |r| r["value"] }
-      end
-    end
-
-    # Set up our CouchDB design document
-    def self.create_design_document(couchdb=nil)
-      (couchdb || Chef::CouchDB.new).create_design_document("data_bags", DESIGN_DOCUMENT)
-    end
-
     # As a string
     def to_s
       "data_bag[#{@name}]"

data/lib/chef/data_bag_item.rb

@@ -23,8 +23,6 @@ require 'forwardable'
 require 'chef/config'
 require 'chef/mixin/params_validate'
 require 'chef/mixin/from_file'
-require 'chef/couchdb'
-require 'chef/index_queue'
 require 'chef/data_bag'
 require 'chef/mash'
 require 'chef/json_compat'
@@ -36,35 +34,9 @@ class Chef
 
     include Chef::Mixin::FromFile
     include Chef::Mixin::ParamsValidate
-    include Chef::IndexQueue::Indexable
 
     VALID_ID = /^[\-[:alnum:]_]+$/
 
-    DESIGN_DOCUMENT = {
-      "version" => 1,
-      "language" => "javascript",
-      "views" => {
-        "all" => {
-          "map" => <<-EOJS
-          function(doc) {
-            if (doc.chef_type == "data_bag_item") {
-              emit(doc.name, doc);
-            }
-          }
-          EOJS
-        },
-        "all_id" => {
-          "map" => <<-EOJS
-          function(doc) {
-            if (doc.chef_type == "data_bag_item") {
-              emit(doc.name, doc.name);
-            }
-          }
-          EOJS
-        }
-      }
-    }
-
     def self.validate_id!(id_str)
       if id_str.nil? || ( id_str !~ VALID_ID )
         raise Exceptions::InvalidDataBagItemID, "Data Bag items must have an id matching #{VALID_ID.inspect}, you gave: #{id_str.inspect}"
@@ -74,16 +46,12 @@ class Chef
     # Define all Hash's instance methods as delegating to @raw_data
     def_delegators(:@raw_data, *(Hash.instance_methods - Object.instance_methods))
 
-    attr_accessor :couchdb_rev, :couchdb_id, :couchdb
     attr_reader :raw_data
 
     # Create a new Chef::DataBagItem
-    def initialize(couchdb=nil)
-      @couchdb_rev = nil
-      @couchdb_id = nil
+    def initialize
       @data_bag = nil
       @raw_data = Mash.new
-      @couchdb = couchdb || Chef::CouchDB.new
     end
 
     def chef_server_rest
@@ -138,7 +106,6 @@ class Chef
       result = self.raw_data
       result["chef_type"] = "data_bag_item"
       result["data_bag"] = self.data_bag
-      result["_rev"] = @couchdb_rev if @couchdb_rev
       result
     end
 
@@ -151,7 +118,6 @@ class Chef
         "data_bag" => self.data_bag,
         "raw_data" => self.raw_data
       }
-      result["_rev"] = @couchdb_rev if @couchdb_rev
       result.to_json(*a)
     end
 
@@ -169,24 +135,11 @@ class Chef
       o.delete("chef_type")
       o.delete("json_class")
       o.delete("name")
-      if o.has_key?("_rev")
-        bag_item.couchdb_rev = o["_rev"]
-        o.delete("_rev")
-      end
-      if o.has_key?("_id")
-        bag_item.couchdb_id = o["_id"]
-        bag_item.index_id = bag_item.couchdb_id
-        o.delete("_id")
-      end
+
       bag_item.raw_data = Mash.new(o["raw_data"])
       bag_item
     end
 
-    # Load a Data Bag Item by name from CouchDB
-    def self.cdb_load(data_bag, name, couchdb=nil)
-      (couchdb || Chef::CouchDB.new).load("data_bag_item", object_name(data_bag, name))
-    end
-
     # Load a Data Bag Item by name via either the RESTful API or local data_bag_path if run in solo mode
     def self.load(data_bag, name)
       if Chef::Config[:solo]
@@ -205,21 +158,10 @@ class Chef
       end
     end
 
-    # Remove this Data Bag Item from CouchDB
-    def cdb_destroy
-      Chef::Log.debug "Destroying data bag item: #{self.inspect}"
-      @couchdb.delete("data_bag_item", object_name, @couchdb_rev)
-    end
-
     def destroy(data_bag=data_bag, databag_item=name)
       chef_server_rest.delete_rest("data/#{data_bag}/#{databag_item}")
     end
 
-    # Save this Data Bag Item to CouchDB
-    def cdb_save
-      @couchdb_rev = @couchdb.store("data_bag_item", object_name, self)["rev"]
-    end
-
     # Save this Data Bag Item via RESTful API
     def save(item_id=@raw_data['id'])
       r = chef_server_rest
@@ -242,11 +184,6 @@ class Chef
       self
     end
 
-    # Set up our CouchDB design document
-    def self.create_design_document(couchdb=nil)
-      (couchdb || Chef::CouchDB.new).create_design_document("data_bag_items", DESIGN_DOCUMENT)
-    end
-
     def ==(other)
       other.respond_to?(:to_hash) &&
       other.respond_to?(:data_bag) &&

data/lib/chef/deprecation/mixin/template.rb

@@ -0,0 +1,49 @@
+#
+# Author:: Serdar Sutay (<serdar@opscode.com>)
+# Copyright:: Copyright (c) 2013 Opscode, Inc.
+# License:: Apache License, Version 2.0
+#
+# 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.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'tempfile'
+require 'erubis'
+
+class Chef
+  module Deprecation
+    module Mixin
+      # == Deprecation::Provider::Mixin::Template
+      # This module contains the deprecated functions of
+      # Chef::Mixin::Template. These functions are refactored to different
+      # components. They are frozen and will be removed in Chef 12.
+      #
+
+      module Template
+        def render_template(template, context)
+          begin
+            eruby = Erubis::Eruby.new(template)
+            output = eruby.evaluate(context)
+          rescue Object => e
+            raise TemplateError.new(e, template, context)
+          end
+          Tempfile.open("chef-rendered-template") do |tempfile|
+            tempfile.print(output)
+            tempfile.close
+            yield tempfile
+          end
+        end
+      end
+    end
+  end
+end
+