chef 12.9.41 → 12.10.24

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

@@ -17,13 +17,21 @@
 #
 
 require "chef/chef_fs/file_system/base_fs_dir"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_acls_dir"
+require "chef/chef_fs/file_system/repository/acls_dir"
+require "chef/chef_fs/file_system/repository/clients_dir"
 require "chef/chef_fs/file_system/repository/cookbooks_dir"
 require "chef/chef_fs/file_system/repository/cookbook_artifacts_dir"
+require "chef/chef_fs/file_system/repository/containers_dir"
 require "chef/chef_fs/file_system/repository/data_bags_dir"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_client_keys_dir"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_policies_dir"
+require "chef/chef_fs/file_system/repository/environments_dir"
+require "chef/chef_fs/file_system/repository/groups_dir"
+require "chef/chef_fs/file_system/repository/nodes_dir"
+require "chef/chef_fs/file_system/repository/policy_groups_dir"
+require "chef/chef_fs/file_system/repository/roles_dir"
+require "chef/chef_fs/file_system/repository/users_dir"
+require "chef/chef_fs/file_system/repository/client_keys_dir"
+require "chef/chef_fs/file_system/repository/file_system_entry"
+require "chef/chef_fs/file_system/repository/policies_dir"
 require "chef/chef_fs/file_system/repository/versioned_cookbooks_dir"
 require "chef/chef_fs/file_system/multiplexed_dir"
 require "chef/chef_fs/data_handler/client_data_handler"
@@ -142,7 +150,7 @@ class Chef
             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 = FileSystemEntry.new(name, parent, path)
                 dir.write_pretty_json = !!write_pretty_json
                 dir
               end)
@@ -166,6 +174,14 @@ class Chef
               return NonexistentFSObject.new(name, self)
             end
             case name
+            when "acls"
+              dirs = paths.map { |path| AclsDir.new(name, self, path) }
+            when "client_keys"
+              dirs = paths.map { |path| ClientKeysDir.new(name, self, path) }
+            when "clients"
+              dirs = paths.map { |path| ClientsDir.new(name, self, path) }
+            when "containers"
+              dirs = paths.map { |path| ContainersDir.new(name, self, path) }
             when "cookbooks"
               if versioned_cookbooks
                 dirs = paths.map { |path| VersionedCookbooksDir.new(name, self, path) }
@@ -174,36 +190,24 @@ class Chef
               end
             when "cookbook_artifacts"
               dirs = paths.map { |path| CookbookArtifactsDir.new(name, self, path) }
-            when "policies"
-              dirs = paths.map { |path| ChefRepositoryFileSystemPoliciesDir.new(name, self, path) }
             when "data_bags"
               dirs = paths.map { |path| DataBagsDir.new(name, self, path) }
-            when "acls"
-              dirs = paths.map { |path| ChefRepositoryFileSystemAclsDir.new(name, self, path) }
-            when "client_keys"
-              dirs = paths.map { |path| ChefRepositoryFileSystemClientKeysDir.new(name, self, path) }
+            when "environments"
+              dirs = paths.map { |path| EnvironmentsDir.new(name, self, path) }
+            when "groups"
+              dirs = paths.map { |path| GroupsDir.new(name, self, path) }
+            when "nodes"
+              dirs = paths.map { |path| NodesDir.new(name, self, path) }
+            when "policy_groups"
+              dirs = paths.map { |path| PolicyGroupsDir.new(name, self, path) }
+            when "policies"
+              dirs = paths.map { |path| PoliciesDir.new(name, self, path) }
+            when "roles"
+              dirs = paths.map { |path| RolesDir.new(name, self, path) }
+            when "users"
+              dirs = paths.map { |path| UsersDir.new(name, self, path) }
             else
-              data_handler = case name
-                             when "clients"
-                               Chef::ChefFS::DataHandler::ClientDataHandler.new
-                             when "environments"
-                               Chef::ChefFS::DataHandler::EnvironmentDataHandler.new
-                             when "nodes"
-                               Chef::ChefFS::DataHandler::NodeDataHandler.new
-                             when "policy_groups"
-                               Chef::ChefFS::DataHandler::PolicyGroupDataHandler.new
-                             when "roles"
-                               Chef::ChefFS::DataHandler::RoleDataHandler.new
-                             when "users"
-                               Chef::ChefFS::DataHandler::UserDataHandler.new
-                             when "groups"
-                               Chef::ChefFS::DataHandler::GroupDataHandler.new
-                             when "containers"
-                               Chef::ChefFS::DataHandler::ContainerDataHandler.new
-                             else
-                               raise "Unknown top level path #{name}"
-                             end
-              dirs = paths.map { |path| ChefRepositoryFileSystemEntry.new(name, self, path, data_handler) }
+              raise "Unknown top level path #{name}"
             end
             MultiplexedDir.new(dirs)
           end

data/lib/chef/chef_fs/file_system/repository/client.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Thom May (<thom@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software 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/data_handler/client_data_handler"
+require "chef/chef_fs/file_system/repository/base_file"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+
+        class Client < BaseFile
+
+          def initialize(name, parent)
+            @data_handler = Chef::ChefFS::DataHandler::ClientDataHandler.new
+            super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/client_key.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Thom May (<thom@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software 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/data_handler/client_key_data_handler"
+require "chef/chef_fs/file_system/repository/base_file"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+
+        class ClientKey < BaseFile
+
+          def initialize(name, parent)
+            @data_handler = Chef::ChefFS::DataHandler::ClientKeyDataHandler.new
+            super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/{chef_repository_file_system_client_keys_dir.rb → client_keys_dir.rb}

@@ -16,21 +16,25 @@
 # limitations under the License.
 #
 
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
+require "chef/chef_fs/file_system/repository/client_keys_sub_dir"
 require "chef/chef_fs/data_handler/client_key_data_handler"
+require "chef/chef_fs/file_system/repository/directory"
 
 class Chef
   module ChefFS
     module FileSystem
       module Repository
-        class ChefRepositoryFileSystemClientKeysDir < ChefRepositoryFileSystemEntry
-          def initialize(name, parent, path = nil)
-            super(name, parent, path, Chef::ChefFS::DataHandler::ClientKeyDataHandler.new)
-          end
+        class ClientKeysDir < Repository::Directory
 
           def can_have_child?(name, is_dir)
             is_dir && !name.start_with?(".")
           end
+
+          protected
+
+          def make_child_entry(child_name)
+            ClientKeysSubDir.new(child_name, self)
+          end
         end
       end
     end

data/lib/chef/chef_fs/file_system/repository/client_keys_sub_dir.rb

@@ -0,0 +1,42 @@
+#
+# Author:: Jordan Running (<jr@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software 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/repository/client_key"
+require "chef/chef_fs/data_handler/client_key_data_handler"
+require "chef/chef_fs/file_system/repository/directory"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+        class ClientKeysSubDir < Repository::Directory
+
+          def can_have_child?(name, is_dir)
+            !is_dir && File.extname(name) == ".json"
+          end
+
+          protected
+
+          def make_child_entry(child_name)
+            ClientKey.new(child_name, self)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/clients_dir.rb

@@ -0,0 +1,40 @@
+#
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Author:: Ho-Sheng Hsiao (<hosh@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");
+# 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/repository/client"
+require "chef/chef_fs/file_system/repository/directory"
+require "chef/chef_fs/file_system/exceptions"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+        class ClientsDir < Repository::Directory
+          def can_have_child?(name, is_dir)
+            !is_dir && File.extname(name) == ".json"
+          end
+
+          def make_child_entry(child_name)
+            Client.new(child_name, self)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/container.rb

@@ -0,0 +1,38 @@
+#
+# Author:: Thom May (<thom@chef.io>)
+# Copyright:: Copyright 2013-2016, Chef Software 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/data_handler/container_data_handler"
+require "chef/chef_fs/file_system/repository/base_file"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+
+        class Container < BaseFile
+
+          def initialize(name, parent)
+            @data_handler = Chef::ChefFS::DataHandler::ContainerDataHandler.new
+            super
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/file_system/repository/containers_dir.rb

@@ -0,0 +1,41 @@
+#
+# Author:: John Keiser (<jkeiser@chef.io>)
+# Author:: Ho-Sheng Hsiao (<hosh@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");
+# 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/repository/container"
+require "chef/chef_fs/file_system/repository/directory"
+require "chef/chef_fs/file_system/exceptions"
+
+class Chef
+  module ChefFS
+    module FileSystem
+      module Repository
+        class ContainersDir < Repository::Directory
+
+          def can_have_child?(name, is_dir)
+            !is_dir && File.extname(name) == ".json"
+          end
+
+          def make_child_entry(child_name)
+            Container.new(child_name, self)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -17,7 +17,6 @@
 #
 
 require "chef/chef_fs/file_system/repository/directory"
-require "chef/chef_fs/file_system/repository/chef_repository_file_system_entry"
 require "chef/chef_fs/file_system/repository/chef_repository_file_system_cookbook_dir"
 require "chef/cookbook/chefignore"
 

data/lib/chef/chef_fs/file_system/repository/data_bag_item.rb

@@ -17,97 +17,21 @@
 #
 
 require "chef/chef_fs/data_handler/data_bag_item_data_handler"
+require "chef/chef_fs/file_system/repository/base_file"
 
 class Chef
   module ChefFS
     module FileSystem
       module Repository
 
-        class DataBagItem
-
-          attr_reader :name
-          attr_reader :parent
-          attr_reader :path
-          attr_reader :file_path
+        class DataBagItem < BaseFile
 
           def initialize(name, parent)
-            @parent = parent
-            @name = name
-            @path = Chef::ChefFS::PathUtils.join(parent.path, name)
             @data_handler = Chef::ChefFS::DataHandler::DataBagItemDataHandler.new
-            @file_path = "#{parent.file_path}/#{name}"
-          end
-
-          # Public API callied by chef_fs/file_system
-          def dir?
-            false
-          end
-
-          def name_valid?
-            !name.start_with?(".") && name.end_with?(".json")
-          end
-
-          def fs_entry_valid?
-            name_valid? && File.file?(file_path)
-          end
-
-          def create(file_contents)
-            if exists?
-              raise Chef::ChefFS::FileSystem::AlreadyExistsError.new(:create_child, self)
-            else
-              write(file_contents)
-            end
-          end
-
-          def can_have_child?(name, is_dir)
-            false
-          end
-
-          def write_pretty_json=(value)
-            @write_pretty_json = value
-          end
-
-          def write_pretty_json
-            @write_pretty_json.nil? ? root.write_pretty_json : @write_pretty_json
+            super
           end
 
-          def path_for_printing
-            file_path
-          end
-
-          def delete(recurse)
-            File.delete(file_path)
-          rescue Errno::ENOENT
-            raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-          end
-
-          def exists?
-            File.exists?(file_path)
-          end
-
-          def read
-            begin
-              File.open(file_path, "rb") { |f| f.read }
-            rescue Errno::ENOENT
-              raise Chef::ChefFS::FileSystem::NotFoundError.new(self, $!)
-            end
-          end
-
-          def write(content)
-            File.open(file_path, "wb") do |file|
-              file.write(content)
-            end
-          end
-
-          def root
-            parent.root
-          end
-
-          def compare_to(other)
-            nil
-          end
         end
-
       end
     end
   end