chef 12.0.0.alpha.1 → 12.0.0.alpha.2

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

@@ -17,7 +17,7 @@ class Chef
           })
         end
 
-        def preserve_key(key)
+        def preserve_key?(key)
           return key == 'name'
         end
 

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

@@ -36,7 +36,7 @@ class Chef
           result
         end
 
-        def preserve_key(key)
+        def preserve_key?(key)
           return key == 'name'
         end
 

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

@@ -21,7 +21,7 @@ class Chef
           result
         end
 
-        def preserve_key(key)
+        def preserve_key?(key)
           return key == 'name'
         end
 

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

@@ -0,0 +1,30 @@
+require 'chef/chef_fs/data_handler/data_handler_base'
+
+class Chef
+  module ChefFS
+    module DataHandler
+      class OrganizationDataHandler < DataHandlerBase
+        def normalize(organization, entry)
+          result = normalize_hash(organization, {
+            'name' => entry.org,
+            'full_name' => entry.org,
+            'org_type' => 'Business',
+            'clientname' => "#{entry.org}-validator",
+            'billing_plan' => 'platform-free',
+          })
+          result
+        end
+
+        def preserve_key?(key)
+          return key == 'name'
+        end
+
+        def verify_integrity(object, entry, &on_error)
+          if entry.org != object['name']
+            on_error.call("Name must be '#{entry.org}' (is '#{object['name']}')")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'chef/chef_fs/data_handler/data_handler_base'
+
+class Chef
+  module ChefFS
+    module DataHandler
+      class OrganizationInvitesDataHandler < DataHandlerBase
+        def normalize(invites, entry)
+          invites.map { |invite| invite.is_a?(Hash) ? invite['username'] : invite }.sort.uniq
+        end
+
+        def minimize(invites, entry)
+          invites
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'chef/chef_fs/data_handler/data_handler_base'
+
+class Chef
+  module ChefFS
+    module DataHandler
+      class OrganizationMembersDataHandler < DataHandlerBase
+        def normalize(members, entry)
+          members.map { |member| member.is_a?(Hash) ? member['user']['username'] : member }.sort.uniq
+        end
+
+        def minimize(members, entry)
+          members
+        end
+      end
+    end
+  end
+end

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

@@ -23,7 +23,7 @@ class Chef
           result
         end
 
-        def preserve_key(key)
+        def preserve_key?(key)
           return key == 'name'
         end
 

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

@@ -7,6 +7,7 @@ class Chef
         def normalize(user, entry)
           normalize_hash(user, {
             'name' => remove_dot_json(entry.name),
+            'username' => remove_dot_json(entry.name),
             'admin' => false,
             'json_class' => 'Chef::WebUIUser',
             'chef_type' => 'webui_user',
@@ -16,7 +17,7 @@ class Chef
           })
         end
 
-        def preserve_key(key)
+        def preserve_key?(key)
           return key == 'name'
         end
 

data/lib/chef/chef_fs/file_system.rb

@@ -273,7 +273,6 @@ class Chef
         # case we shouldn't waste time trying PUT if we know the file doesn't
         # exist.
         # Will need to decide how that works with checksums, though.
-
         error = false
         begin
           dest_path = format_path.call(dest_entry) if ui

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

@@ -32,7 +32,7 @@ class Chef
         end
 
         def delete(recurse)
-          raise Chef::ChefFS::FileSystem::OperationNotAllowedError.new(:delete, self, e), "ACLs cannot be deleted."
+          raise Chef::ChefFS::FileSystem::OperationNotAllowedError.new(:delete, self), "ACLs cannot be deleted."
         end
 
         def write(file_contents)

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

@@ -35,7 +35,7 @@ class Chef
             loader = Chef::Cookbook::CookbookVersionLoader.new(file_path, parent.chefignore)
             # We need the canonical cookbook name if we are using versioned cookbooks, but we don't
             # want to spend a lot of time adding code to the main Chef libraries
-            if Chef::Config[:versioned_cookbooks]
+            if root.versioned_cookbooks
               _canonical_name = canonical_cookbook_name(File.basename(file_path))
               fail "When versioned_cookbooks mode is on, cookbook #{file_path} must match format <cookbook_name>-x.y.z"  unless _canonical_name
 

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

@@ -31,8 +31,12 @@ class Chef
           @data_handler = data_handler
         end
 
+        def write_pretty_json=(value)
+          @write_pretty_json = value
+        end
+
         def write_pretty_json
-          root.write_pretty_json
+          @write_pretty_json.nil? ? root.write_pretty_json : @write_pretty_json
         end
 
         def data_handler

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

@@ -33,32 +33,71 @@ require 'chef/chef_fs/data_handler/container_data_handler'
 class Chef
   module ChefFS
     module FileSystem
+      #
+      # Represents the root of a local Chef repository, with directories for
+      # nodes, cookbooks, roles, etc. under it.
+      #
       class ChefRepositoryFileSystemRootDir < BaseFSDir
-        def initialize(child_paths)
+        #
+        # Create a new Chef Repository File System root.
+        #
+        # == Parameters
+        # [child_paths]
+        #   A hash of child paths, e.g.:
+        #     "nodes" => [ '/var/nodes', '/home/jkeiser/nodes' ],
+        #     "roles" => [ '/var/roles' ],
+        #     ...
+        # [root_paths]
+        #   An array of paths representing the top level, where
+        #   +org.json+, +members.json+, and +invites.json+ will be stored.
+        # [chef_config] - a hash of options that looks suspiciously like the ones
+        #   stored in Chef::Config, containing at least these keys:
+        #   :versioned_cookbooks:: whether to include versions in cookbook names
+        def initialize(child_paths, root_paths=[], chef_config=Chef::Config)
           super("", nil)
           @child_paths = child_paths
+          @root_paths = root_paths
+          @versioned_cookbooks = chef_config[:versioned_cookbooks]
         end
 
         attr_accessor :write_pretty_json
 
+        attr_reader :root_paths
         attr_reader :child_paths
+        attr_reader :versioned_cookbooks
+
+        CHILDREN = %w(invitations.json members.json org.json)
 
         def children
-          @children ||= child_paths.keys.sort.map { |name| make_child_entry(name) }.select { |child| !child.nil? }
+          @children ||= begin
+            result = child_paths.keys.sort.map { |name| make_child_entry(name) }.select { |child| !child.nil? }
+            result += root_dir.children.select { |c| CHILDREN.include?(c.name) } if root_dir
+            result.sort_by { |c| c.name }
+          end
         end
 
         def can_have_child?(name, is_dir)
-          child_paths.has_key?(name) && is_dir
+          if is_dir
+            child_paths.has_key?(name)
+          elsif root_dir
+            CHILDREN.include?(name)
+          else
+            false
+          end
         end
 
         def create_child(name, file_contents = nil)
-          child_paths[name].each do |path|
-            begin
-              Dir.mkdir(path)
-            rescue Errno::EEXIST
+          if file_contents
+            child = root_dir.create_child(name, file_contents)
+          else
+            child_paths[name].each do |path|
+              begin
+                Dir.mkdir(path)
+              rescue Errno::EEXIST
+              end
             end
+            child = make_child_entry(name)
           end
-          child = make_child_entry(name)
           @children = nil
           child
         end
@@ -67,17 +106,17 @@ class Chef
           nil
         end
 
-        # Used to print out the filesystem
+        # Used to print out a human-readable file system description
         def fs_description
-          repo_path = File.dirname(child_paths['cookbooks'][0])
-          result = "repository at #{repo_path}\n"
-          if Chef::Config[:versioned_cookbooks]
+          repo_paths = root_paths || [ File.dirname(child_paths['cookbooks'][0]) ]
+          result = "repository at #{repo_paths.join(', ')}\n"
+          if versioned_cookbooks
             result << "  Multiple versions per cookbook\n"
           else
             result << "  One version per cookbook\n"
           end
           child_paths.each_pair do |name, paths|
-            if paths.any? { |path| File.dirname(path) != repo_path }
+            if paths.any? { |path| !repo_paths.include?(File.dirname(path)) }
               result << "  #{name} at #{paths.join(', ')}\n"
             end
           end
@@ -86,6 +125,27 @@ class Chef
 
         private
 
+        #
+        # A FileSystemEntry representing the root path where invites.json,
+        # members.json and org.json may be found.
+        #
+        def root_dir
+          existing_paths = root_paths.select { |path| File.exists?(path) }
+          if existing_paths.size > 0
+            MultiplexedDir.new(existing_paths.map do |path|
+              dir = ChefRepositoryFileSystemEntry.new(name, parent, path)
+              dir.write_pretty_json = !!write_pretty_json
+              dir
+            end)
+          end
+        end
+
+        #
+        # Create a child entry of the appropriate type:
+        # cookbooks, data_bags, acls, etc.  All will be multiplexed (i.e. if
+        # you have multiple paths for cookbooks, the multiplexed dir will grab
+        # cookbooks from all of them when you list or grab them).
+        #
         def make_child_entry(name)
           paths = child_paths[name].select do |path|
             File.exists?(path)

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

@@ -23,6 +23,9 @@ require 'chef/chef_fs/file_system/rest_list_dir'
 require 'chef/chef_fs/file_system/cookbooks_dir'
 require 'chef/chef_fs/file_system/data_bags_dir'
 require 'chef/chef_fs/file_system/nodes_dir'
+require 'chef/chef_fs/file_system/org_entry'
+require 'chef/chef_fs/file_system/organization_invites_entry'
+require 'chef/chef_fs/file_system/organization_members_entry'
 require 'chef/chef_fs/file_system/environments_dir'
 require 'chef/chef_fs/data_handler/client_data_handler'
 require 'chef/chef_fs/data_handler/role_data_handler'
@@ -33,7 +36,35 @@ require 'chef/chef_fs/data_handler/container_data_handler'
 class Chef
   module ChefFS
     module FileSystem
+      #
+      # Represents the root of a Chef server (or organization), under which
+      # nodes, roles, cookbooks, etc. can be found.
+      #
       class ChefServerRootDir < BaseFSDir
+        #
+        # Create a new Chef server root.
+        #
+        # == Parameters
+        #
+        # [root_name]
+        #   A friendly name for the root, for printing--like "remote" or "chef_central".
+        # [chef_config]
+        #   A hash with options that look suspiciously like Chef::Config, including the
+        #   following keys:
+        #   :chef_server_url:: The URL to the Chef server or top of the organization
+        #   :node_name:: The username to authenticate to the Chef server with
+        #   :client_key:: The private key for the user for authentication
+        #   :environment:: The environment in which you are presently working
+        #   :repo_mode::
+        #     The repository mode, :hosted_everything, :everything or :static.
+        #     This determines the set of subdirectories the Chef server will
+        #     offer up.
+        #   :versioned_cookbooks:: whether or not to include versions in cookbook names
+        # [options]
+        #   Other options:
+        #   :cookbook_version:: when cookbooks are retrieved, grab this version for them.
+        #   :freeze:: freeze cookbooks on upload
+        #
         def initialize(root_name, chef_config, options = {})
           super("", nil)
           @chef_server_url = chef_config[:chef_server_url]
@@ -41,6 +72,7 @@ class Chef
           @chef_private_key = chef_config[:client_key]
           @environment = chef_config[:environment]
           @repo_mode = chef_config[:repo_mode]
+          @versioned_cookbooks = chef_config[:versioned_cookbooks]
           @root_name = root_name
           @cookbook_version = options[:cookbook_version] # Used in knife diff and download for server cookbook version
         end
@@ -51,6 +83,7 @@ class Chef
         attr_reader :environment
         attr_reader :repo_mode
         attr_reader :cookbook_version
+        attr_reader :versioned_cookbooks
 
         def fs_description
           "Chef server at #{chef_server_url} (user #{chef_username}), repo_mode = #{repo_mode}"
@@ -81,10 +114,13 @@ class Chef
         end
 
         def org
-          @org ||= if URI.parse(chef_server_url).path =~ /^\/+organizations\/+([^\/]+)$/
-            $1
-          else
-            nil
+          @org ||= begin
+            path = Pathname.new(URI.parse(chef_server_url).path).cleanpath
+            if File.dirname(path) == '/organizations'
+              File.basename(path)
+            else
+              nil
+            end
           end
         end
 
@@ -102,7 +138,10 @@ class Chef
                 RestListDir.new("clients", self, nil, Chef::ChefFS::DataHandler::ClientDataHandler.new),
                 RestListDir.new("containers", self, nil, Chef::ChefFS::DataHandler::ContainerDataHandler.new),
                 RestListDir.new("groups", self, nil, Chef::ChefFS::DataHandler::GroupDataHandler.new),
-                NodesDir.new(self)
+                NodesDir.new(self),
+                OrgEntry.new("org.json", self),
+                OrganizationMembersEntry.new("members.json", self),
+                OrganizationInvitesEntry.new("invitations.json", self)
               ]
             elsif repo_mode != 'static'
               result += [

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

@@ -32,7 +32,7 @@ class Chef
           @exists = options[:exists]
           # If the name is apache2-1.0.0 and versioned_cookbooks is on, we know
           # the actual cookbook_name and version.
-          if Chef::Config[:versioned_cookbooks]
+          if root.versioned_cookbooks
             if name =~ VALID_VERSIONED_COOKBOOK_NAME
               @cookbook_name = $1
               @version = $2

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

@@ -51,7 +51,7 @@ class Chef
 
         def children
           @children ||= begin
-            if Chef::Config[:versioned_cookbooks]
+            if root.versioned_cookbooks
               result = []
               root.get_json("#{api_path}/?num_versions=all").each_pair do |cookbook_name, cookbooks|
                 cookbooks['versions'].each do |cookbook_version|
@@ -71,7 +71,7 @@ class Chef
         end
 
         def upload_cookbook_from(other, options = {})
-          Chef::Config[:versioned_cookbooks] ? upload_versioned_cookbook(other, options) : upload_unversioned_cookbook(other, options)
+          root.versioned_cookbooks ? upload_versioned_cookbook(other, options) : upload_unversioned_cookbook(other, options)
         rescue Timeout::Error => e
           raise Chef::ChefFS::FileSystem::OperationFailedError.new(:write, self, e), "Timeout writing: #{e}"
         rescue Net::HTTPServerException => e
@@ -155,7 +155,7 @@ class Chef
 
         def can_have_child?(name, is_dir)
           return false if !is_dir
-          return false if Chef::Config[:versioned_cookbooks] && name !~ Chef::ChefFS::FileSystem::CookbookDir::VALID_VERSIONED_COOKBOOK_NAME
+          return false if root.versioned_cookbooks && name !~ Chef::ChefFS::FileSystem::CookbookDir::VALID_VERSIONED_COOKBOOK_NAME
           return true
         end
       end

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

@@ -0,0 +1,34 @@
+require 'chef/chef_fs/file_system/rest_list_entry'
+require 'chef/chef_fs/data_handler/organization_data_handler'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      # /organizations/NAME/org.json
+      # Represents the actual data at /organizations/NAME (the full name, etc.)
+      class OrgEntry < RestListEntry
+        def initialize(name, parent, exists = nil)
+          super(name, parent)
+          @exists = exists
+        end
+
+        def data_handler
+          Chef::ChefFS::DataHandler::OrganizationDataHandler.new
+        end
+
+        # /organizations/foo/org.json -> GET /organizations/foo
+        def api_path
+          parent.api_path
+        end
+
+        def exists?
+          parent.exists?
+        end
+
+        def delete(recurse)
+          raise Chef::ChefFS::FileSystem::OperationNotAllowedError.new(:delete, self)
+        end
+      end
+    end
+  end
+end