chef 10.34.6 → 11.0.0.beta.0

data/lib/chef/{resource/whyrun_safe_ruby_block.rb → chef_fs/file_system/file_system_root_dir.rb}

@@ -1,6 +1,6 @@
 #
-# Author:: Phil Dibowitz (<phild@fb.com>)
-# Copyright:: Copyright (c) 2013 Facebook
+# 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");
@@ -16,16 +16,16 @@
 # limitations under the License.
 #
 
-class Chef
-  class Resource
-    class WhyrunSafeRubyBlock < Chef::Resource::RubyBlock
+require 'chef/chef_fs/file_system/file_system_entry'
 
-      def initialize(name, run_context=nil)
-        super
-        @resource_name = :whyrun_safe_ruby_block
-        @provider = Chef::Provider::WhyrunSafeRubyBlock
+class Chef
+  module ChefFS
+    module FileSystem
+      class FileSystemRootDir < FileSystemEntry
+        def initialize(file_path)
+          super("", nil, file_path)
+        end
       end
-
     end
   end
 end

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

@@ -0,0 +1,31 @@
+#
+# 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 MustDeleteRecursivelyError < FileSystemError
+        def initialize(cause = nil)
+          super(cause)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,47 @@
+#
+# 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'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class NodesDir < RestListDir
+        def initialize(parent)
+          super("nodes", parent)
+        end
+
+        # Override children to respond to environment
+        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
+            if $!.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            else
+              raise
+            end
+          end
+      end
+      end
+    end
+  end
+end

data/lib/chef/{provider/whyrun_safe_ruby_block.rb → chef_fs/file_system/nonexistent_fs_object.rb}

@@ -1,6 +1,6 @@
 #
-# Author:: Phil Dibowitz (<phild@fb.com>)
-# Copyright:: Copyright (c) 2013 Facebook
+# 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");
@@ -16,14 +16,24 @@
 # limitations under the License.
 #
 
+require 'chef/chef_fs/file_system/base_fs_object'
+require 'chef/chef_fs/file_system/not_found_error'
+
 class Chef
-  class Provider
-    class WhyrunSafeRubyBlock < Chef::Provider::RubyBlock
-      def action_create
-        @new_resource.block.call
-        @new_resource.updated_by_last_action(true)
-        @run_context.events.resource_update_applied(@new_resource, :create, "execute the whyrun_safe_ruby_block #{@new_resource.name}")
-        Chef::Log.info("#{@new_resource} called")
+  module ChefFS
+    module FileSystem
+      class NonexistentFSObject < BaseFSObject
+        def initialize(name, parent)
+          super
+        end
+
+        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

@@ -0,0 +1,31 @@
+#
+# 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 NotFoundError < FileSystemError
+        def initialize(cause = nil)
+          super(cause)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,84 @@
+#
+# 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'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class RestListDir < BaseFSDir
+        def initialize(name, parent, api_path = nil)
+          super(name, parent)
+          @api_path = api_path || (parent.api_path == "" ? name : "#{parent.api_path}/#{name}")
+        end
+
+        attr_reader :api_path
+
+        def child(name)
+          result = @children.select { |child| child.name == name }.first if @children
+          result ||= can_have_child?(name, false) ?
+                     _make_child_entry(name) : NonexistentFSObject.new(name, self)
+        end
+
+        def can_have_child?(name, is_dir)
+          name =~ /\.json$/ && !is_dir
+        end
+
+        def children
+          begin
+            @children ||= rest.get_rest(api_path).keys.map do |key|
+              _make_child_entry("#{key}.json", true)
+            end
+          rescue Net::HTTPServerException
+            if $!.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            else
+              raise
+            end
+          end
+        end
+
+        # NOTE if you change this significantly, you will likely need to change
+        # DataBagDir.create_child as well.
+        def create_child(name, file_contents)
+          json = Chef::JSONCompat.from_json(file_contents).to_hash
+          base_name = name[0,name.length-5]
+          if json.include?('name') && json['name'] != base_name
+            raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['name']}')"
+          end
+          rest.post_rest(api_path, json)
+          _make_child_entry(name, true)
+        end
+
+        def environment
+          parent.environment
+        end
+
+        def rest
+          parent.rest
+        end
+
+        def _make_child_entry(name, exists = nil)
+          RestListEntry.new(name, self, exists)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,123 @@
+#
+# 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_object'
+require 'chef/chef_fs/file_system/not_found_error'
+require 'chef/role'
+require 'chef/node'
+
+class Chef
+  module ChefFS
+    module FileSystem
+      class RestListEntry < BaseFSObject
+        def initialize(name, parent, exists = nil)
+          super(name, parent)
+          @exists = exists
+        end
+
+        def api_path
+          if name.length < 5 || name[-5,5] != ".json"
+            raise "Invalid name #{path}: must end in .json"
+          end
+          api_child_name = name[0,name.length-5]
+          "#{parent.api_path}/#{api_child_name}"
+        end
+
+        def environment
+          parent.environment
+        end
+
+        def exists?
+          if @exists.nil?
+            begin
+              @exists = parent.children.any? { |child| child.name == name }
+            rescue Chef::ChefFS::FileSystem::NotFoundError
+              @exists = false
+            end
+          end
+          @exists
+        end
+
+        def delete(recurse)
+          begin
+            rest.delete_rest(api_path)
+          rescue Net::HTTPServerException
+            if $!.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            else
+              raise
+            end
+          end
+        end
+
+        def read
+          Chef::JSONCompat.to_json_pretty(chef_object.to_hash)
+        end
+
+        def chef_object
+          begin
+            # REST will inflate the Chef object using json_class
+            rest.get_rest(api_path)
+          rescue Net::HTTPServerException
+            if $!.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            else
+              raise
+            end
+          end
+        end
+
+        def compare_to(other)
+          begin
+            other_value = other.read
+          rescue Chef::ChefFS::FileSystem::NotFoundError
+            return [ nil, nil, :none ]
+          end
+          begin
+            value = chef_object.to_hash
+          rescue Chef::ChefFS::FileSystem::NotFoundError
+            return [ false, :none, other_value ]
+          end
+          are_same = (value == Chef::JSONCompat.from_json(other_value, :create_additions => false))
+          [ are_same, Chef::JSONCompat.to_json_pretty(value), other_value ]
+        end
+
+        def rest
+          parent.rest
+        end
+
+        def write(file_contents)
+          json = Chef::JSONCompat.from_json(file_contents).to_hash
+          base_name = name[0,name.length-5]
+          if json['name'] != base_name
+            raise "Name in #{path_for_printing}/#{name} must be '#{base_name}' (is '#{json['name']}')"
+          end
+          begin
+            rest.put_rest(api_path, json)
+          rescue Net::HTTPServerException
+            if $!.response.code == "404"
+              raise Chef::ChefFS::FileSystem::NotFoundError.new($!), "#{path_for_printing} not found"
+            else
+              raise
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chef/chef_fs/knife.rb

@@ -0,0 +1,77 @@
+#
+# 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/chef_server_root_dir'
+require 'chef/chef_fs/file_system/chef_repository_file_system_root_dir'
+require 'chef/chef_fs/file_pattern'
+require 'chef/chef_fs/path_utils'
+require 'chef/config'
+
+class Chef
+  module ChefFS
+    class Knife < Chef::Knife
+      def self.common_options
+        option :repo_mode,
+          :long => '--repo-mode MODE',
+          :default => "default",
+          :description => "Specifies the local repository layout.  Values: default or full"
+      end
+
+      def base_path
+        @base_path ||= begin
+          relative_to_base = Chef::ChefFS::PathUtils::relative_to(File.expand_path(Dir.pwd), chef_repo)
+          relative_to_base == '.' ? '/' : "/#{relative_to_base}"
+        end
+      end
+
+      def chef_fs
+        @chef_fs ||= Chef::ChefFS::FileSystem::ChefServerRootDir.new("remote", Chef::Config, config[:repo_mode])
+      end
+
+      def chef_repo
+        @chef_repo ||= File.expand_path(File.join(Chef::Config.cookbook_path, ".."))
+      end
+
+      def format_path(path)
+        if path[0,base_path.length] == base_path
+          if path == base_path
+            return "."
+          elsif path[base_path.length] == "/"
+            return path[base_path.length + 1, path.length - base_path.length - 1]
+          elsif base_path == "/" && path[0] == "/"
+            return path[1, path.length - 1]
+          end
+        end
+        path
+      end
+
+      def local_fs
+        @local_fs ||= Chef::ChefFS::FileSystem::ChefRepositoryFileSystemRootDir.new(chef_repo)
+      end
+
+      def pattern_args
+        @pattern_args ||= pattern_args_from(name_args)
+      end
+
+      def pattern_args_from(args)
+        args.map { |arg| Chef::ChefFS::FilePattern::relative_to(base_path, arg) }.to_a
+      end
+
+    end
+  end
+end