chef 11.4.4 → 11.6.0.hotfix.1

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

@@ -34,14 +34,16 @@ class Chef
 
         def children
           begin
-            @children ||= rest.get_rest(api_path).keys.map do |entry|
+            @children ||= Chef::ChefFS::RawRequest.raw_json(rest, api_path).keys.sort.map do |entry|
               DataBagDir.new(entry, self, true)
             end
-          rescue Net::HTTPServerException
-            if $!.response.code == "404"
-              raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+          rescue Timeout::Error => e
+            raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e), "Timeout getting children: #{e}"
+          rescue Net::HTTPServerException => e
+            if e.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new(self, e)
             else
-              raise
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e), "HTTP error getting children: #{e}"
             end
           end
         end
@@ -53,9 +55,13 @@ class Chef
         def create_child(name, file_contents)
           begin
             rest.post_rest(api_path, { 'name' => name })
-          rescue Net::HTTPServerException
-            if $!.response.code != "409"
-              raise
+          rescue Timeout::Error => e
+            raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "Timeout creating child '#{name}': #{e}"
+          rescue Net::HTTPServerException => e
+            if e.response.code == "409"
+              raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self, e), "Cannot create #{name} under #{path}: already exists"
+            else
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:create_child, self, e), "HTTP error creating child '#{name}': #{e}"
             end
           end
           DataBagDir.new(name, self, true)

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

@@ -0,0 +1,36 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 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 'chef/chef_fs/file_system/operation_not_allowed_error'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class DefaultEnvironmentCannotBeModifiedError < OperationNotAllowedError
+        def initialize(operation, entry, cause = nil)
+          super(operation, entry, cause)
+        end
+
+        def reason
+          result = super
+          result + " (default environment cannot be modified)"
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 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 'chef/chef_fs/file_system/base_fs_dir'
+require 'chef/chef_fs/file_system/rest_list_entry'
+require 'chef/chef_fs/file_system/not_found_error'
+require 'chef/chef_fs/file_system/default_environment_cannot_be_modified_error'
+require 'chef/chef_fs/data_handler/environment_data_handler'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class EnvironmentsDir < RestListDir
+        def initialize(parent)
+          super("environments", parent, nil, Chef::ChefFS::DataHandler::EnvironmentDataHandler.new)
+        end
+
+        def _make_child_entry(name, exists = nil)
+          if name == '_default.json'
+            DefaultEnvironmentEntry.new(name, self, exists)
+          else
+            super
+          end
+        end
+
+        class DefaultEnvironmentEntry < RestListEntry
+          def initialize(name, parent, exists = nil)
+            super(name, parent)
+            @exists = exists
+          end
+
+          def delete(recurse)
+            raise NotFoundError.new(self) if !exists?
+            raise DefaultEnvironmentCannotBeModifiedError.new(:delete, self), "#{path_for_printing} cannot be deleted."
+          end
+
+          def write(file_contents)
+            raise NotFoundError.new(self) if !exists?
+            raise DefaultEnvironmentCannotBeModifiedError.new(:write, self), "#{path_for_printing} cannot be updated."
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,6 +19,7 @@
 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/must_delete_recursively_error'
 require 'chef/chef_fs/path_utils'
 require 'fileutils'
 
@@ -34,14 +35,14 @@ class Chef
         attr_reader :file_path
 
         def path_for_printing
-          Chef::ChefFS::PathUtils::relative_to(file_path, File.expand_path(Dir.pwd))
+          file_path
         end
 
         def children
           begin
-            @children ||= Dir.entries(file_path).select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
+            @children ||= Dir.entries(file_path).sort.select { |entry| entry != '.' && entry != '..' }.map { |entry| FileSystemEntry.new(entry, self) }
           rescue Errno::ENOENT
-            raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{file_path} not found"
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
           end
         end
 
@@ -61,11 +62,10 @@ class Chef
 
         def delete(recurse)
           if dir?
-            if recurse
-              FileUtils.rm_rf(file_path)
-            else
-              File.rmdir(file_path)
+            if !recurse
+              raise MustDeleteRecursivelyError.new(self, $!)
             end
+            FileUtils.rm_rf(file_path)
           else
             File.delete(file_path)
           end
@@ -75,7 +75,7 @@ class Chef
           begin
             File.open(file_path, "rb") {|f| f.read}
           rescue Errno::ENOENT
-            raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{file_path} not found"
+            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
           end
         end
 

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

@@ -20,10 +20,12 @@ class Chef
   module ChefFS
     module FileSystem
       class FileSystemError < StandardError
-        def initialize(cause = nil)
+        def initialize(entry, cause = nil)
+          @entry = entry
           @cause = cause
         end
 
+        attr_reader :entry
         attr_reader :cause
       end
     end

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

@@ -0,0 +1,52 @@
+require 'chef/chef_fs/file_system/base_fs_dir'
+require 'chef/chef_fs/file_system/nonexistent_fs_object'
+require 'chef/chef_fs/file_system/memory_file'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class MemoryDir < Chef::ChefFS::FileSystem::BaseFSDir
+        def initialize(name, parent)
+          super(name, parent)
+          @children = []
+        end
+
+        attr_reader :children
+
+        def child(name)
+          @children.select { |child| child.name == name }.first || Chef::ChefFS::FileSystem::NonexistentFSObject.new(name, self)
+        end
+
+        def add_child(child)
+          @children.push(child)
+        end
+
+        def can_have_child?(name, is_dir)
+          root.cannot_be_in_regex ? (name !~ root.cannot_be_in_regex) : true
+        end
+
+        def add_file(path, value)
+          path_parts = path.split('/')
+          dir = add_dir(path_parts[0..-2].join('/'))
+          file = MemoryFile.new(path_parts[-1], dir, value)
+          dir.add_child(file)
+          file
+        end
+
+        def add_dir(path)
+          path_parts = path.split('/')
+          dir = self
+          path_parts.each do |path_part|
+            subdir = dir.child(path_part)
+            if !subdir.exists?
+              subdir = MemoryDir.new(path_part, dir)
+              dir.add_child(subdir)
+            end
+            dir = subdir
+          end
+          dir
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+require 'chef/chef_fs/file_system/base_fs_object'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class MemoryFile < Chef::ChefFS::FileSystem::BaseFSObject
+        def initialize(name, parent, value)
+          super(name, parent)
+          @value = value
+        end
+        def read
+          return @value
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+require 'chef/chef_fs/file_system/memory_dir'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class MemoryRoot < MemoryDir
+        def initialize(pretty_name, cannot_be_in_regex = nil)
+          super('', nil)
+          @pretty_name = pretty_name
+          @cannot_be_in_regex = cannot_be_in_regex
+        end
+
+        attr_reader :cannot_be_in_regex
+
+        def path_for_printing
+          @pretty_name
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+require 'chef/chef_fs/file_system/base_fs_object'
+require 'chef/chef_fs/file_system/nonexistent_fs_object'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class MultiplexedDir < BaseFSDir
+        def initialize(*multiplexed_dirs)
+          @multiplexed_dirs = multiplexed_dirs.flatten
+          super(@multiplexed_dirs[0].name, @multiplexed_dirs[0].parent)
+        end
+
+        attr_reader :multiplexed_dirs
+
+        def write_dir
+          multiplexed_dirs[0]
+        end
+
+        def children
+          @children ||= begin
+            result = []
+            seen = {}
+            # If multiple things have the same name, the first one wins.
+            multiplexed_dirs.each do |dir|
+              dir.children.each do |child|
+                if seen[child.name]
+                  Chef::Log.warn("Child with name '#{child.name}' found in multiple directories: #{seen[child.name].path_for_printing} and #{child.path_for_printing}")
+                else
+                  result << child
+                  seen[child.name] = child
+                end
+              end
+            end
+            result
+          end
+        end
+
+        def can_have_child?(name, is_dir)
+          write_dir.can_have_child?(name, is_dir)
+        end
+
+        def create_child(name, file_contents = nil)
+          write_dir.create_child(name, file_contents)
+        end
+      end
+    end
+  end
+end

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

@@ -22,8 +22,8 @@ class Chef
   module ChefFS
     module FileSystem
       class MustDeleteRecursivelyError < FileSystemError
-        def initialize(cause = nil)
-          super(cause)
+        def initialize(entry, cause = nil)
+          super(entry, cause)
         end
       end
     end

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

@@ -19,28 +19,36 @@
 require 'chef/chef_fs/file_system/base_fs_dir'
 require 'chef/chef_fs/file_system/rest_list_entry'
 require 'chef/chef_fs/file_system/not_found_error'
+require 'chef/chef_fs/data_handler/node_data_handler'
 
 class Chef
   module ChefFS
     module FileSystem
       class NodesDir < RestListDir
         def initialize(parent)
-          super("nodes", parent)
+          super("nodes", parent, nil, Chef::ChefFS::DataHandler::NodeDataHandler.new)
         end
 
-        # Override children to respond to environment
+        # Identical to RestListDir.children, except supports environments
         def children
-          @children ||= begin
-            env_api_path = environment ? "environments/#{environment}/#{api_path}" : api_path
-            rest.get_rest(env_api_path).keys.map { |key| RestListEntry.new("#{key}.json", self, true) }
-          rescue Net::HTTPServerException
+          begin
+            @children ||= Chef::ChefFS::RawRequest.raw_json(rest, env_api_path).keys.sort.map do |key|
+              _make_child_entry("#{key}.json", true)
+            end
+          rescue Timeout::Error => e
+            raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e), "Timeout retrieving children: #{e}"
+          rescue Net::HTTPServerException => e
             if $!.response.code == "404"
-              raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
             else
-              raise
+              raise Chef::ChefFS::FileSystem::OperationFailedError.new(:children, self, e), "HTTP error retrieving children: #{e}"
             end
           end
-      end
+        end
+
+        def env_api_path
+          environment ? "environments/#{environment}/#{api_path}" : api_path
+        end
       end
     end
   end

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

@@ -30,10 +30,6 @@ class Chef
         def exists?
           false
         end
-
-        def read
-          raise Chef::ChefFS::FileSystem::NotFoundError, "Nonexistent #{path_for_printing}"
-        end
       end
     end
   end

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

@@ -22,8 +22,8 @@ class Chef
   module ChefFS
     module FileSystem
       class NotFoundError < FileSystemError
-        def initialize(cause = nil)
-          super(cause)
+        def initialize(entry, cause = nil)
+          super(entry, cause)
         end
       end
     end

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

@@ -0,0 +1,34 @@
+#
+# Author:: John Keiser (<jkeiser@opscode.com>)
+# Copyright:: Copyright (c) 2012 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 'chef/chef_fs/file_system/file_system_error'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class OperationFailedError < FileSystemError
+        def initialize(operation, entry, cause = nil)
+          super(entry, cause)
+          @operation = operation
+        end
+
+        attr_reader :operation
+      end
+    end
+  end
+end