chef 12.6.0-universal-mingw32 → 12.7.2-universal-mingw32

data/lib/chef/chef_fs/command_line.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,10 +16,10 @@
 # limitations under the License.
 #
 
-require 'chef/chef_fs/file_system'
-require 'chef/chef_fs/file_system/operation_failed_error'
-require 'chef/chef_fs/file_system/operation_not_allowed_error'
-require 'chef/util/diff'
+require "chef/chef_fs/file_system"
+require "chef/chef_fs/file_system/operation_failed_error"
+require "chef/chef_fs/file_system/operation_not_allowed_error"
+require "chef/util/diff"
 
 class Chef
   module ChefFS
@@ -72,7 +72,7 @@ class Chef
             elsif old_value
               result = "diff --knife #{old_path} #{new_path}\n"
               result << "deleted file\n"
-              result << diff_text(old_path, '/dev/null', old_value, '')
+              result << diff_text(old_path, "/dev/null", old_value, "")
               yield result
             else
               yield "Only in #{format_path.call(old_entry.parent)}: #{old_entry.name}\n"
@@ -87,7 +87,7 @@ class Chef
             elsif new_value
               result = "diff --knife #{old_path} #{new_path}\n"
               result << "new file\n"
-              result << diff_text('/dev/null', new_path, '', new_value)
+              result << diff_text("/dev/null", new_path, "", new_value)
               yield result
             else
               yield "Only in #{format_path.call(new_entry.parent)}: #{new_entry.name}\n"

data/lib/chef/chef_fs/config.rb

@@ -1,6 +1,6 @@
 #
-# Author:: John Keiser (<jkeiser@opscode.com>)
-# Copyright:: Copyright (c) 2012 Opscode, Inc.
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Copyright:: Copyright 2012-2016, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,8 +16,8 @@
 # limitations under the License.
 #
 
-require 'chef/log'
-require 'chef/chef_fs/path_utils'
+require "chef/log"
+require "chef/chef_fs/path_utils"
 
 class Chef
   module ChefFS
@@ -33,6 +33,7 @@ class Chef
         "acls" => "acl",
         "clients" => "client",
         "cookbooks" => "cookbook",
+        "cookbook_artifacts" => "cookbook_artifact",
         "containers" => "container",
         "data_bags" => "data_bag",
         "environments" => "environment",
@@ -40,11 +41,39 @@ class Chef
         "nodes" => "node",
         "roles" => "role",
         "users" => "user",
-        "policies" => "policy"
+        "policies" => "policy",
+        "policy_groups" => "policy_group",
       }
-      INFLECTIONS.each { |k,v| k.freeze; v.freeze }
+      INFLECTIONS.each { |k, v| k.freeze; v.freeze }
       INFLECTIONS.freeze
 
+      # ChefFS supports three modes of operation: "static", "everything", and
+      # "hosted_everything". These names are antiquated since Chef 12 moved
+      # multi-tenant and RBAC to the open source product. In practice, they
+      # mean:
+      #
+      # * static: just static objects that are included in a traditional
+      #   chef-repo, with no support for anything introduced in Chef 12 or
+      #   later.
+      # * everything: all of the objects supported by the open source Chef
+      #   Server 11.x
+      # * hosted_everything: (the name comes from Hosted Chef) supports
+      #   everything in Chef Server 12 and later, including RBAC objects and
+      #   Policyfile objects.
+      #
+      # The "static" and "everything" modes are used for backup and
+      # upgrade/migration of older Chef Servers, so they should be considered
+      # frozen in time.
+
+      CHEF_11_OSS_STATIC_OBJECTS = %w{cookbooks cookbook_artifacts data_bags environments roles}.freeze
+      CHEF_11_OSS_DYNAMIC_OBJECTS = %w{clients nodes users}.freeze
+      RBAC_OBJECT_NAMES = %w{acls containers groups }.freeze
+      CHEF_12_OBJECTS = %w{ cookbook_artifacts policies policy_groups }.freeze
+
+      STATIC_MODE_OBJECT_NAMES = CHEF_11_OSS_STATIC_OBJECTS
+      EVERYTHING_MODE_OBJECT_NAMES = (CHEF_11_OSS_STATIC_OBJECTS + CHEF_11_OSS_DYNAMIC_OBJECTS).freeze
+      HOSTED_EVERYTHING_MODE_OBJECT_NAMES = (EVERYTHING_MODE_OBJECT_NAMES + RBAC_OBJECT_NAMES + CHEF_12_OBJECTS).freeze
+
       #
       # Create a new Config object which can produce a chef_fs and local_fs.
       #
@@ -114,7 +143,7 @@ class Chef
         @cwd = File.expand_path(cwd)
         @cookbook_version = options[:cookbook_version]
 
-        if @chef_config[:repo_mode] == 'everything' && is_hosted? && !ui.nil?
+        if @chef_config[:repo_mode] == "everything" && is_hosted? && !ui.nil?
           ui.warn %Q{You have repo_mode set to 'everything', but your chef_server_url
               looks like it might be a hosted setup.  If this is the case please use
               hosted_everything or allow repo_mode to default}
@@ -122,9 +151,9 @@ class Chef
         # Default to getting *everything* from the server.
         if !@chef_config[:repo_mode]
           if is_hosted?
-            @chef_config[:repo_mode] = 'hosted_everything'
+            @chef_config[:repo_mode] = "hosted_everything"
           else
-            @chef_config[:repo_mode] = 'everything'
+            @chef_config[:repo_mode] = "everything"
           end
         end
       end
@@ -142,8 +171,8 @@ class Chef
       end
 
       def create_chef_fs
-        require 'chef/chef_fs/file_system/chef_server_root_dir'
-        Chef::ChefFS::FileSystem::ChefServerRootDir.new("remote", @chef_config, :cookbook_version => @cookbook_version)
+        require "chef/chef_fs/file_system/chef_server/chef_server_root_dir"
+        Chef::ChefFS::FileSystem::ChefServer::ChefServerRootDir.new("remote", @chef_config, :cookbook_version => @cookbook_version)
       end
 
       def local_fs
@@ -151,8 +180,8 @@ class Chef
       end
 
       def create_local_fs
-        require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir'
-        Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(object_paths, Array(chef_config[:chef_repo_path]).flatten, @chef_config)
+        require "chef/chef_fs/file_system/repository/chef_repository_file_system_root_dir"
+        Chef::ChefFS::FileSystem::Repository::ChefRepositoryFileSystemRootDir.new(object_paths, Array(chef_config[:chef_repo_path]).flatten, @chef_config)
       end
 
       # Returns the given real path's location relative to the server root.
@@ -197,7 +226,7 @@ class Chef
           # path and use realpath because a repo_path if provided *must* exist.
           realest_chef_repo_path = Chef::ChefFS::PathUtils.realest_path(chef_repo_path, @cwd)
           if Chef::ChefFS::PathUtils.os_path_eq?(target_path, realest_chef_repo_path)
-            return '/'
+            return "/"
           end
         end
 
@@ -213,12 +242,12 @@ class Chef
       # Print the given server path, relative to the current directory
       def format_path(entry)
         server_path = entry.path
-        if base_path && server_path[0,base_path.length] == base_path
+        if base_path && server_path[0, base_path.length] == base_path
           if server_path == base_path
-            return '.'
-          elsif server_path[base_path.length,1] == '/'
+            return "."
+          elsif server_path[base_path.length, 1] == "/"
             return server_path[base_path.length + 1, server_path.length - base_path.length - 1]
-          elsif base_path == '/' && server_path[0,1] == '/'
+          elsif base_path == "/" && server_path[0, 1] == "/"
             return server_path[1, server_path.length - 1]
           end
         end
@@ -231,12 +260,12 @@ class Chef
         @object_paths ||= begin
           result = {}
           case @chef_config[:repo_mode]
-          when 'static'
-            object_names = %w(cookbooks data_bags environments roles policies)
-          when 'hosted_everything'
-            object_names = %w(acls clients cookbooks containers data_bags environments groups nodes roles policies)
+          when "static"
+            object_names = STATIC_MODE_OBJECT_NAMES
+          when "hosted_everything"
+            object_names = HOSTED_EVERYTHING_MODE_OBJECT_NAMES
           else
-            object_names = %w(clients cookbooks data_bags environments nodes roles users policies)
+            object_names = EVERYTHING_MODE_OBJECT_NAMES
           end
           object_names.each do |object_name|
             # cookbooks -> cookbook_path

data/lib/chef/chef_fs/data_handler/acl_data_handler.rb

@@ -1,4 +1,4 @@
-require 'chef/chef_fs/data_handler/data_handler_base'
+require "chef/chef_fs/data_handler/data_handler_base"
 
 class Chef
   module ChefFS
@@ -7,16 +7,16 @@ class Chef
         def normalize(acl, entry)
           # Normalize the order of the keys for easier reading
           result = normalize_hash(acl, {
-            'create' => {},
-            'read' => {},
-            'update' => {},
-            'delete' => {},
-            'grant' => {}
-            })
+            "create" => {},
+            "read" => {},
+            "update" => {},
+            "delete" => {},
+            "grant" => {},
+            },)
           result.keys.each do |key|
-            result[key] = normalize_hash(result[key], { 'actors' => [], 'groups' => [] })
-            result[key]['actors'] = result[key]['actors'].sort
-            result[key]['groups'] = result[key]['groups'].sort
+            result[key] = normalize_hash(result[key], { "actors" => [], "groups" => [] })
+            result[key]["actors"] = result[key]["actors"].sort
+            result[key]["groups"] = result[key]["groups"].sort
           end
           result
         end

data/lib/chef/chef_fs/data_handler/client_data_handler.rb

@@ -1,5 +1,5 @@
-require 'chef/chef_fs/data_handler/data_handler_base'
-require 'chef/api_client'
+require "chef/chef_fs/data_handler/data_handler_base"
+require "chef/api_client"
 
 class Chef
   module ChefFS
@@ -7,25 +7,25 @@ class Chef
       class ClientDataHandler < DataHandlerBase
         def normalize(client, entry)
           defaults = {
-            'name' => remove_dot_json(entry.name),
-            'clientname' => remove_dot_json(entry.name),
-            'admin' => false,
-            'validator' => false,
-            'chef_type' => 'client'
+            "name" => remove_dot_json(entry.name),
+            "clientname" => remove_dot_json(entry.name),
+            "admin" => false,
+            "validator" => false,
+            "chef_type" => "client",
           }
           # Handle the fact that admin/validator have changed type from string -> boolean
-          client['admin'] = (client['admin'] == 'true') if client['admin'].is_a?(String)
-          client['validator'] = (client['validator'] == 'true') if client['validator'].is_a?(String)
+          client["admin"] = (client["admin"] == "true") if client["admin"].is_a?(String)
+          client["validator"] = (client["validator"] == "true") if client["validator"].is_a?(String)
           if entry.respond_to?(:org) && entry.org
-            defaults['orgname'] = entry.org
+            defaults["orgname"] = entry.org
           end
           result = normalize_hash(client, defaults)
-          result.delete('json_class')
+          result.delete("json_class")
           result
         end
 
         def preserve_key?(key)
-          return key == 'name'
+          return key == "name"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/container_data_handler.rb

@@ -1,4 +1,4 @@
-require 'chef/chef_fs/data_handler/data_handler_base'
+require "chef/chef_fs/data_handler/data_handler_base"
 
 class Chef
   module ChefFS
@@ -6,18 +6,18 @@ class Chef
       class ContainerDataHandler < DataHandlerBase
         def normalize(container, entry)
           normalize_hash(container, {
-            'containername' => remove_dot_json(entry.name),
-            'containerpath' => remove_dot_json(entry.name)
-          })
+            "containername" => remove_dot_json(entry.name),
+            "containerpath" => remove_dot_json(entry.name),
+          },)
         end
 
         def preserve_key?(key)
-          return key == 'containername'
+          return key == "containername"
         end
 
         def verify_integrity(object, entry, &on_error)
           base_name = remove_dot_json(entry.name)
-          if object['containername'] != base_name
+          if object["containername"] != base_name
             on_error.call("Name in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['name']}')")
           end
         end

data/lib/chef/chef_fs/data_handler/cookbook_data_handler.rb

@@ -1,5 +1,5 @@
-require 'chef/chef_fs/data_handler/data_handler_base'
-require 'chef/cookbook/metadata'
+require "chef/chef_fs/data_handler/data_handler_base"
+require "chef/cookbook/metadata"
 
 class Chef
   module ChefFS
@@ -9,22 +9,22 @@ class Chef
           version = entry.name
           name = entry.parent.name
           result = normalize_hash(cookbook, {
-            'name' => "#{name}-#{version}",
-            'version' => version,
-            'cookbook_name' => name,
-            'json_class' => 'Chef::CookbookVersion',
-            'chef_type' => 'cookbook_version',
-            'frozen?' => false,
-            'metadata' => {}
-          })
-          result['metadata'] = normalize_hash(result['metadata'], {
-            'version' => version,
-            'name' => name
-          })
+            "name" => "#{name}-#{version}",
+            "version" => version,
+            "cookbook_name" => name,
+            "json_class" => "Chef::CookbookVersion",
+            "chef_type" => "cookbook_version",
+            "frozen?" => false,
+            "metadata" => {},
+          },)
+          result["metadata"] = normalize_hash(result["metadata"], {
+            "version" => version,
+            "name" => name,
+          },)
         end
 
         def preserve_key?(key)
-          return key == 'cookbook_name' || key == 'version'
+          return key == "cookbook_name" || key == "version"
         end
 
         def chef_class

data/lib/chef/chef_fs/data_handler/data_bag_item_data_handler.rb

@@ -1,5 +1,5 @@
-require 'chef/chef_fs/data_handler/data_handler_base'
-require 'chef/data_bag_item'
+require "chef/chef_fs/data_handler/data_handler_base"
+require "chef/data_bag_item"
 
 class Chef
   module ChefFS
@@ -7,26 +7,26 @@ class Chef
       class DataBagItemDataHandler < DataHandlerBase
         def normalize(data_bag_item, entry)
           # If it's wrapped with raw_data, unwrap it.
-          if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
-            data_bag_item = data_bag_item['raw_data']
+          if data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
+            data_bag_item = data_bag_item["raw_data"]
           end
           # chef_type and data_bag come back in PUT and POST results, but we don't
           # use those in knife-essentials.
           normalize_hash(data_bag_item, {
-            'id' => remove_dot_json(entry.name)
-          })
+            "id" => remove_dot_json(entry.name)
+          },)
         end
 
         def normalize_for_post(data_bag_item, entry)
-          if data_bag_item['json_class'] == 'Chef::DataBagItem' && data_bag_item['raw_data']
-            data_bag_item = data_bag_item['raw_data']
+          if data_bag_item["json_class"] == "Chef::DataBagItem" && data_bag_item["raw_data"]
+            data_bag_item = data_bag_item["raw_data"]
           end
           {
             "name" => "data_bag_item_#{entry.parent.name}_#{remove_dot_json(entry.name)}",
             "json_class" => "Chef::DataBagItem",
             "chef_type" => "data_bag_item",
             "data_bag" => entry.parent.name,
-            "raw_data" => normalize(data_bag_item, entry)
+            "raw_data" => normalize(data_bag_item, entry),
           }
         end
 
@@ -35,7 +35,7 @@ class Chef
         end
 
         def preserve_key?(key)
-          return key == 'id'
+          return key == "id"
         end
 
         def chef_class
@@ -44,7 +44,7 @@ class Chef
 
         def verify_integrity(object, entry, &on_error)
           base_name = remove_dot_json(entry.name)
-          if object['raw_data']['id'] != base_name
+          if object["raw_data"]["id"] != base_name
             on_error.call("ID in #{entry.path_for_printing} must be '#{base_name}' (is '#{object['raw_data']['id']}')")
           end
         end

data/lib/chef/chef_fs/data_handler/data_handler_base.rb

@@ -28,10 +28,10 @@ class Chef
         # Takes a name like blah.json and removes the .json from it.
         #
         def remove_dot_json(name)
-          if name.length < 5 || name[-5,5] != ".json"
+          if name.length < 5 || name[-5, 5] != ".json"
             raise "Invalid name #{path}: must end in .json"
           end
-          name[0,name.length-5]
+          name[0, name.length - 5]
         end
 
         #
@@ -94,7 +94,7 @@ class Chef
         # name to recipe[name].  Then calls uniq on the result.
         #
         def normalize_run_list(run_list)
-          run_list.map{|item|
+          run_list.map {|item|
             case item.to_s
             when /^recipe\[.*\]$/
               item # explicit recipe
@@ -117,7 +117,7 @@ class Chef
         # Turn a JSON hash into a bona fide Chef object (like Chef::Node).
         #
         def chef_object(object)
-          chef_class.json_create(object)
+          chef_class.from_hash(object)
         end
 
         #
@@ -147,18 +147,18 @@ class Chef
         #   environment "desert"'
         #
         def to_ruby_keys(object, keys)
-          result = ''
+          result = ""
           keys.each do |key|
             if object[key]
               if object[key].is_a?(Hash)
                 if object[key].size > 0
                   result << key
                   first = true
-                  object[key].each_pair do |k,v|
+                  object[key].each_pair do |k, v|
                     if first
                       first = false
                     else
-                      result << ' '*key.length
+                      result << " " * key.length
                     end
                     result << " #{k.inspect} => #{v.inspect}\n"
                   end
@@ -191,7 +191,7 @@ class Chef
         #
         def verify_integrity(object, entry, &on_error)
           base_name = remove_dot_json(entry.name)
-          if object['name'] != base_name
+          if object["name"] != base_name
             on_error.call("Name must be '#{base_name}' (is '#{object['name']}')")
           end
         end