chef 11.12.8 → 11.14.0.alpha.2

data/lib/chef/chef_fs/file_system/chef_repository_file_system_cookbooks_dir.rb

@@ -43,7 +43,7 @@ class Chef
                 map { |child_name| make_child(child_name) }.
                 select do |entry|
                   # empty cookbooks and cookbook directories are ignored
-                  if entry.children.size == 0
+                  if !entry.can_upload?
                     Chef::Log.warn("Cookbook '#{entry.name}' is empty or entirely chefignored at #{entry.path_for_printing}")
                     false
                   else
@@ -59,6 +59,25 @@ class Chef
           is_dir && !name.start_with?('.')
         end
 
+        def write_cookbook(cookbook_path, cookbook_version_json, from_fs)
+          cookbook_name = File.basename(cookbook_path)
+          child = make_child(cookbook_name)
+
+          # Use the copy/diff algorithm to copy it down so we don't destroy
+          # chefignored data.  This is terribly un-thread-safe.
+          Chef::ChefFS::FileSystem.copy_to(Chef::ChefFS::FilePattern.new("/#{cookbook_path}"), from_fs, child, nil, {:purge => true})
+
+          # Write out .uploaded-cookbook-version.json
+          cookbook_file_path = File.join(file_path, cookbook_name)
+          if !File.exists?(cookbook_file_path)
+            FileUtils.mkdir_p(cookbook_file_path)
+          end
+          uploaded_cookbook_version_path = File.join(cookbook_file_path, Chef::Cookbook::CookbookVersionLoader::UPLOADED_COOKBOOK_VERSION_FILE)
+          File.open(uploaded_cookbook_version_path, 'w') do |file|
+            file.write(cookbook_version_json)
+          end
+        end
+
         protected
 
         def make_child(child_name)

data/lib/chef/chef_fs/file_system/file_system_entry.rb

@@ -18,8 +18,9 @@
 
 require 'chef/chef_fs/file_system/base_fs_dir'
 require 'chef/chef_fs/file_system/rest_list_dir'
-require 'chef/chef_fs/file_system/not_found_error'
+require 'chef/chef_fs/file_system/already_exists_error'
 require 'chef/chef_fs/file_system/must_delete_recursively_error'
+require 'chef/chef_fs/file_system/not_found_error'
 require 'chef/chef_fs/path_utils'
 require 'fileutils'
 
@@ -48,15 +49,18 @@ class Chef
 
         def create_child(child_name, file_contents=nil)
           child = make_child(child_name)
+          if child.exists?
+            raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, child)
+          end
           if file_contents
             child.write(file_contents)
           else
             begin
               Dir.mkdir(child.file_path)
             rescue Errno::EEXIST
+              raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, child)
             end
           end
-          @children = nil
           child
         end
 
@@ -75,6 +79,10 @@ class Chef
           end
         end
 
+        def exists?
+          File.exists?(file_path)
+        end
+
         def read
           begin
             File.open(file_path, "rb") {|f| f.read}

data/lib/chef/client.rb

@@ -496,7 +496,7 @@ class Chef
       if Chef::Config[:ssl_verify_mode] == :verify_none and !Chef::Config[:verify_api_cert]
         Chef::Log.warn(<<-WARN)
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 SSL validation of HTTPS requests is disabled. HTTPS connections are still
 encrypted, but chef is not able to detect forged replies or man in the middle
 attacks.
@@ -518,7 +518,7 @@ To check your SSL configuration, or troubleshoot errors, you can use the
   knife ssl check -c #{Chef::Config.config_file}
 ```
 
-* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * 
+* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 WARN
       end
     end
@@ -530,4 +530,3 @@ end
 require 'chef/cookbook_loader'
 require 'chef/cookbook_version'
 require 'chef/cookbook/synchronizer'
-

data/lib/chef/config.rb

@@ -85,7 +85,7 @@ class Chef
     def self.platform_specific_path(path)
       if on_windows?
         # turns /etc/chef/client.rb into C:/chef/client.rb
-        system_drive = ENV['SYSTEMDRIVE'] ? ENV['SYSTEMDRIVE'] : ""
+        system_drive = env['SYSTEMDRIVE'] ? env['SYSTEMDRIVE'] : ""
         path = File.join(system_drive, path.split('/')[2..-1])
         # ensure all forward slashes are backslashes
         path.gsub!(File::SEPARATOR, (File::ALT_SEPARATOR || '\\'))
@@ -489,17 +489,21 @@ class Chef
       default :hints, {}
     end
 
-    # Those lists of regular expressions define what chef considers a
-    # valid user and group name
-    if RUBY_PLATFORM =~ /mswin|mingw|windows/
+    def self.set_defaults_for_windows
+      # Those lists of regular expressions define what chef considers a
+      # valid user and group name
       # From http://technet.microsoft.com/en-us/library/cc776019(WS.10).aspx
-
       principal_valid_regex_part = '[^"\/\\\\\[\]\:;|=,+*?<>]+'
       default :user_valid_regex, [ /^(#{principal_valid_regex_part}\\)?#{principal_valid_regex_part}$/ ]
       default :group_valid_regex, [ /^(#{principal_valid_regex_part}\\)?#{principal_valid_regex_part}$/ ]
 
       default :fatal_windows_admin_check, false
-    else
+    end
+
+    def self.set_defaults_for_nix
+      # Those lists of regular expressions define what chef considers a
+      # valid user and group name
+      #
       # user/group cannot start with '-', '+' or '~'
       # user/group cannot contain ':', ',' or non-space-whitespace or null byte
       # everything else is allowed (UTF-8, spaces, etc) and we delegate to your O/S useradd program to barf or not
@@ -508,9 +512,26 @@ class Chef
       default :group_valid_regex, [ /^[^-+~:,\t\r\n\f\0]+[^:,\t\r\n\f\0]*$/ ]
     end
 
+    # Those lists of regular expressions define what chef considers a
+    # valid user and group name
+    if on_windows?
+      set_defaults_for_windows
+    else
+      set_defaults_for_nix
+    end
+
+    # This provides a hook which rspec can stub so that we can avoid twiddling
+    # global state in tests.
+    def self.env
+      ENV
+    end
+
+    def self.windows_home_path
+      windows_home_path = env['SYSTEMDRIVE'] + env['HOMEPATH'] if env['SYSTEMDRIVE'] && env['HOMEPATH']
+    end
+
     # returns a platform specific path to the user home dir
-    windows_home_path = ENV['SYSTEMDRIVE'] + ENV['HOMEPATH'] if ENV['SYSTEMDRIVE'] && ENV['HOMEPATH']
-    default :user_home, (ENV['HOME'] || windows_home_path || ENV['USERPROFILE'])
+    default( :user_home ) { env['HOME'] || windows_home_path || env['USERPROFILE'] }
 
     # Enable file permission fixup for selinux. Fixup will be done
     # only if selinux is enabled in the system.
@@ -526,6 +547,11 @@ class Chef
     # the directory that files are going to reside.
     default :file_staging_uses_destdir, false
 
+    # Exit if another run is in progress and the chef-client is unable to
+    # get the lock before time expires. If nil, no timeout is enforced. (Exits
+    # immediately if 0.)
+    default :run_lock_timeout, nil
+
     # If installed via an omnibus installer, this gives the path to the
     # "embedded" directory which contains all of the software packaged with
     # omnibus. This is used to locate the cacert.pem file on windows.

data/lib/chef/cookbook/cookbook_version_loader.rb

@@ -17,13 +17,19 @@ class Chef
                                       :resource_filenames,
                                       :provider_filenames]
 
+      UPLOADED_COOKBOOK_VERSION_FILE = ".uploaded-cookbook-version.json".freeze
 
       attr_reader :cookbook_name
       attr_reader :cookbook_settings
+      attr_reader :cookbook_paths
       attr_reader :metadata_filenames
+      attr_reader :frozen
+      attr_reader :uploaded_cookbook_version_file
 
       def initialize(path, chefignore=nil)
-        @cookbook_path = File.expand_path( path )
+        @cookbook_path = File.expand_path( path ) # cookbook_path from which this was loaded
+        # We keep a list of all cookbook paths that have been merged in
+        @cookbook_paths = [ @cookbook_path ]
         @cookbook_name = File.basename( path )
         @chefignore = chefignore
         @metadata = Hash.new
@@ -56,12 +62,21 @@ class Chef
 
         remove_ignored_files
 
+        if File.exists?(File.join(@cookbook_path, UPLOADED_COOKBOOK_VERSION_FILE))
+          @uploaded_cookbook_version_file = File.join(@cookbook_path, UPLOADED_COOKBOOK_VERSION_FILE)
+        end
+
         if File.exists?(File.join(@cookbook_path, "metadata.rb"))
           @metadata_filenames << File.join(@cookbook_path, "metadata.rb")
         elsif File.exists?(File.join(@cookbook_path, "metadata.json"))
           @metadata_filenames << File.join(@cookbook_path, "metadata.json")
+        elsif @uploaded_cookbook_version_file
+          @metadata_filenames << @uploaded_cookbook_version_file
         end
 
+        # Set frozen based on .uploaded-cookbook-version.json
+        set_frozen
+
         if empty?
           Chef::Log.warn "found a directory #{cookbook_name} in the cookbook path, but it contains no cookbook files. skipping."
         end
@@ -71,8 +86,7 @@ class Chef
       def cookbook_version
         return nil if empty?
 
-        Chef::CookbookVersion.new(@cookbook_name.to_sym).tap do |c|
-          c.root_dir             = @cookbook_path
+        Chef::CookbookVersion.new(@cookbook_name.to_sym, *@cookbook_paths).tap do |c|
           c.attribute_filenames  = cookbook_settings[:attribute_filenames].values
           c.definition_filenames = cookbook_settings[:definition_filenames].values
           c.recipe_filenames     = cookbook_settings[:recipe_filenames].values
@@ -84,6 +98,7 @@ class Chef
           c.root_filenames       = cookbook_settings[:root_filenames].values
           c.metadata_filenames   = @metadata_filenames
           c.metadata             = metadata(c)
+          c.freeze_version if @frozen
         end
       end
 
@@ -94,6 +109,8 @@ class Chef
           case metadata_file
           when /\.rb$/
             apply_ruby_metadata(metadata_file)
+          when @uploaded_cookbook_version_file
+            apply_json_cookbook_version_metadata(metadata_file)
           when /\.json$/
             apply_json_metadata(metadata_file)
           else
@@ -104,7 +121,7 @@ class Chef
       end
 
       def empty?
-        @cookbook_settings.values.all? { |files_hash| files_hash.empty? }
+        @cookbook_settings.values.all? { |files_hash| files_hash.empty? } && @metadata_filenames.size == 0
       end
 
       def merge!(other_cookbook_loader)
@@ -113,6 +130,8 @@ class Chef
           file_list.merge!(other_cookbook_settings[file_type])
         end
         @metadata_filenames.concat(other_cookbook_loader.metadata_filenames)
+        @cookbook_paths += other_cookbook_loader.cookbook_paths
+        @frozen = true if other_cookbook_loader.frozen
       end
 
       def chefignore
@@ -122,6 +141,7 @@ class Chef
       def load_root_files
         Dir.glob(File.join(@cookbook_path, '*'), File::FNM_DOTMATCH).each do |file|
           next if File.directory?(file)
+          next if File.basename(file) == UPLOADED_COOKBOOK_VERSION_FILE
           @cookbook_settings[:root_filenames][file[@relative_path, 1]] = file
         end
       end
@@ -166,6 +186,27 @@ class Chef
         end
       end
 
+      def apply_json_cookbook_version_metadata(file)
+        begin
+          data = Chef::JSONCompat.from_json(IO.read(file), :create_additions => false)
+          @metadata.from_hash(data['metadata'])
+        rescue JSON::ParserError
+          Chef::Log.error("Couldn't parse cookbook metadata JSON for #@cookbook_name in " + file)
+          raise
+        end
+      end
+
+      def set_frozen
+        if uploaded_cookbook_version_file
+          begin
+            data = Chef::JSONCompat.from_json(IO.read(uploaded_cookbook_version_file), :create_additions => false)
+            @frozen = data['frozen?']
+          rescue JSON::ParserError
+            Chef::Log.error("Couldn't parse cookbook metadata JSON for #@cookbook_name in #{uploaded_cookbook_version_file}")
+            raise
+          end
+        end
+      end
     end
   end
 end

data/lib/chef/cookbook_version.rb

@@ -26,6 +26,8 @@ require 'chef/recipe'
 require 'chef/cookbook/file_vendor'
 require 'chef/cookbook/metadata'
 require 'chef/version_class'
+require 'pathname'
+require 'chef/monkey_patches/pathname'
 
 class Chef
 
@@ -42,7 +44,7 @@ class Chef
 
     COOKBOOK_SEGMENTS = [ :resources, :providers, :recipes, :definitions, :libraries, :attributes, :files, :templates, :root_files ]
 
-    attr_accessor :root_dir
+    attr_accessor :root_paths
     attr_accessor :definition_filenames
     attr_accessor :template_filenames
     attr_accessor :file_filenames
@@ -66,6 +68,11 @@ class Chef
     attr_reader :recipe_filenames_by_name
     attr_reader :attribute_filenames_by_short_filename
 
+    # The first root path is the primary cookbook dir, from which metadata is loaded
+    def root_dir
+      root_paths[0]
+    end
+
     # This is the one and only method that knows how cookbook files'
     # checksums are generated.
     def self.checksum_cookbook_file(filepath)
@@ -83,8 +90,9 @@ class Chef
     #
     # === Returns
     # object<Chef::CookbookVersion>:: Duh. :)
-    def initialize(name)
+    def initialize(name, *root_paths)
       @name = name
+      @root_paths = root_paths
       @frozen = false
       @attribute_filenames = Array.new
       @definition_filenames = Array.new
@@ -96,7 +104,6 @@ class Chef
       @resource_filenames = Array.new
       @provider_filenames = Array.new
       @metadata_filenames = Array.new
-      @root_dir = nil
       @root_filenames = Array.new
       @status = :ready
       @manifest = nil
@@ -481,11 +488,11 @@ class Chef
     end
 
     def metadata_json_file
-      File.join(root_dir, "metadata.json")
+      File.join(root_paths[0], "metadata.json")
     end
 
     def metadata_rb_file
-      File.join(root_dir, "metadata.rb")
+      File.join(root_paths[0], "metadata.rb")
     end
 
     def reload_metadata!
@@ -605,42 +612,26 @@ class Chef
       })
       checksums_to_on_disk_paths = {}
 
+      if !root_paths || root_paths.size == 0
+        Chef::Log.error("Cookbook #{name} does not have root_paths! Cannot generate manifest.")
+        raise "Cookbook #{name} does not have root_paths! Cannot generate manifest."
+      end
+
       COOKBOOK_SEGMENTS.each do |segment|
         segment_filenames(segment).each do |segment_file|
           next if File.directory?(segment_file)
 
-          file_name = nil
-          path = nil
-          specificity = "default"
-
-          if segment == :root_files
-            matcher = segment_file.match(".+/#{Regexp.escape(name.to_s)}/(.+)")
-            file_name = matcher[1]
-            path = file_name
-          elsif segment == :templates || segment == :files
-            matcher = segment_file.match("/#{Regexp.escape(name.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+?)/(.+))")
-            unless matcher
-              Chef::Log.debug("Skipping file #{segment_file}, as it isn't in any of the proper directories (platform-version, platform or default)")
-              Chef::Log.debug("You probably need to move #{segment_file} into the 'default' sub-directory")
-              next
-            end
-            path = matcher[1]
-            specificity = matcher[2]
-            file_name = matcher[3]
-          else
-            matcher = segment_file.match("/#{Regexp.escape(name.to_s)}/(#{Regexp.escape(segment.to_s)}/(.+))")
-            path = matcher[1]
-            file_name = matcher[2]
-          end
+          path, specificity = parse_segment_file_from_root_paths(segment, segment_file)
+          file_name = File.basename(path)
 
           csum = self.class.checksum_cookbook_file(segment_file)
           checksums_to_on_disk_paths[csum] = segment_file
           rs = Mash.new({
             :name => file_name,
             :path => path,
-            :checksum => csum
+            :checksum => csum,
+            :specificity => specificity
           })
-          rs[:specificity] = specificity
 
           manifest[segment] << rs
         end
@@ -656,6 +647,23 @@ class Chef
       @manifest_records_by_path = extract_manifest_records_by_path(manifest)
     end
 
+    def parse_segment_file_from_root_paths(segment, segment_file)
+      root_paths.each do |root_path|
+        pathname = Pathname.new(segment_file).relative_path_from(Pathname.new(root_path))
+
+        parts = pathname.each_filename.take(2)
+        # Check if path is actually under root_path
+        next if parts[0] == '..'
+        if segment == :templates || segment == :files
+          return [ pathname.to_s, parts[1] ]
+        else
+          return [ pathname.to_s, 'default' ]
+        end
+      end
+      Chef::Log.error("Cookbook file #{segment_file} not under cookbook root paths #{root_paths.inspect}.")
+      raise "Cookbook file #{segment_file} not under cookbook root paths #{root_paths.inspect}."
+    end
+
     def file_vendor
       unless @file_vendor
         @file_vendor = Chef::Cookbook::FileVendor.create_from_manifest(manifest)

data/lib/chef/dsl/recipe.rb

@@ -17,7 +17,6 @@
 # limitations under the License.
 #
 
-require 'chef/resource'
 require 'chef/resource_platform_map'
 require 'chef/mixin/convert_to_class_name'
 
@@ -152,6 +151,10 @@ class Chef
   end
 end
 
+# We require this at the BOTTOM of this file to avoid circular requires (it is used
+# at runtime but not load time)
+require 'chef/resource'
+
 # **DEPRECATED**
 # This used to be part of chef/mixin/recipe_definition_dsl_core. Load the file to activate the deprecation code.
 require 'chef/mixin/recipe_definition_dsl_core'