chef 11.4.4 → 11.6.0.hotfix.1

data/lib/chef/provider/windows_script.rb

@@ -0,0 +1,73 @@
+#
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2013 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/provider/script'
+require 'chef/mixin/windows_architecture_helper'
+
+class Chef
+  class Provider
+    class WindowsScript < Chef::Provider::Script
+
+      protected
+      
+      include Chef::Mixin::WindowsArchitectureHelper
+
+      def initialize( new_resource, run_context, script_extension='')
+        super( new_resource, run_context )
+        @script_extension = script_extension
+
+        target_architecture = new_resource.architecture.nil? ?
+          node_windows_architecture(run_context.node) : new_resource.architecture
+
+        @is_wow64 = wow64_architecture_override_required?(run_context.node, target_architecture)
+
+        if ( target_architecture == :i386 ) && ! is_i386_windows_process?
+          raise Chef::Exceptions::Win32ArchitectureIncorrect,
+          "Support for the i386 architecture from a 64-bit Ruby runtime is not yet implemented"
+        end
+      end
+
+      public
+      
+      def action_run
+        wow64_redirection_state = nil
+
+        if @is_wow64
+          wow64_redirection_state = disable_wow64_file_redirection(@run_context.node)
+        end
+        
+        begin
+          super
+        rescue
+          raise
+        ensure
+          if ! wow64_redirection_state.nil?
+            restore_wow64_file_redirection(@run_context.node, wow64_redirection_state)
+          end
+        end
+      end
+        
+      def script_file
+        base_script_name = "chef-script"
+        temp_file_arguments = [ base_script_name, @script_extension ]
+        
+        @script_file ||= Tempfile.open(temp_file_arguments)
+      end
+    end
+  end
+end

data/lib/chef/providers.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+require 'chef/provider/batch'
 require 'chef/provider/breakpoint'
 require 'chef/provider/cookbook_file'
 require 'chef/provider/cron'
@@ -36,6 +37,7 @@ require 'chef/provider/ohai'
 require 'chef/provider/mdadm'
 require 'chef/provider/mount'
 require 'chef/provider/package'
+require 'chef/provider/powershell_script'
 require 'chef/provider/remote_directory'
 require 'chef/provider/remote_file'
 require 'chef/provider/route'
@@ -82,6 +84,7 @@ require 'chef/provider/user/dscl'
 require 'chef/provider/user/pw'
 require 'chef/provider/user/useradd'
 require 'chef/provider/user/windows'
+require 'chef/provider/user/solaris'
 
 require 'chef/provider/group/aix'
 require 'chef/provider/group/dscl'
@@ -99,5 +102,18 @@ require 'chef/provider/mount/windows'
 require 'chef/provider/deploy/revision'
 require 'chef/provider/deploy/timestamped'
 
+require 'chef/provider/remote_file/ftp'
+require 'chef/provider/remote_file/http'
+require 'chef/provider/remote_file/local_file'
+require 'chef/provider/remote_file/fetcher'
+
 require "chef/provider/lwrp_base"
 require 'chef/provider/registry_key'
+
+require 'chef/provider/file/content'
+require 'chef/provider/remote_file/content'
+require 'chef/provider/cookbook_file/content'
+require 'chef/provider/template/content'
+
+require 'chef/provider/ifconfig/redhat'
+require 'chef/provider/ifconfig/debian'

data/lib/chef/resource.rb

@@ -23,6 +23,7 @@ require 'chef/dsl/data_query'
 require 'chef/dsl/registry_helper'
 require 'chef/mixin/convert_to_class_name'
 require 'chef/resource/conditional'
+require 'chef/resource/conditional_action_not_nothing'
 require 'chef/resource_collection'
 require 'chef/resource_platform_map'
 require 'chef/node'
@@ -129,6 +130,17 @@ F
 
     extend Chef::Mixin::ConvertToClassName
 
+
+    if Module.method(:const_defined?).arity == 1
+      def self.strict_const_defined?(const)
+        const_defined?(const)
+      end
+    else
+      def self.strict_const_defined?(const)
+        const_defined?(const, false)
+      end
+    end
+
     # Track all subclasses of Resource. This is used so names can be looked up
     # when attempting to deserialize from JSON. (See: json_compat)
     def self.resource_classes
@@ -393,6 +405,9 @@ F
       # could end up with multiple resources.
       resources = [ resource_spec ].flatten
       resources.each do |resource|
+
+        validate_resource_spec!(resource_spec)
+
         case timing.to_s
         when 'delayed'
           notifies_delayed(action, resource)
@@ -449,6 +464,10 @@ F
       true
     end
 
+    def validate_resource_spec!(resource_spec)
+      run_context.resource_collection.validate_lookup_spec!(resource_spec)
+    end
+
     def is(*args)
       if args.size == 1
         args.first
@@ -654,10 +673,12 @@ F
     # "fails" its check. Subsequent conditionals are not evaluated, so in
     # general it's not a good idea to rely on side effects from not_if or
     # only_if commands/blocks being evaluated.
+    #
+    # Also skips conditional checking when the action is :nothing
     def should_skip?(action)
-      conditionals = only_if + not_if
-      return false if conditionals.empty?
+      conditional_action = ConditionalActionNotNothing.new(action)
 
+      conditionals = [ conditional_action ] + only_if + not_if
       conditionals.find do |conditional|
         if conditional.continue?
           false

data/lib/chef/resource/batch.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2013 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/resource/windows_script'
+
+class Chef
+  class Resource
+    class Batch < Chef::Resource::WindowsScript
+      
+      def initialize(name, run_context=nil)
+        super(name, run_context, :batch, "cmd.exe")
+      end
+      
+    end
+  end
+end

data/lib/chef/resource/conditional.rb

@@ -83,6 +83,10 @@ class Chef
         @block.call
       end
 
+      def short_description
+        @positivity
+      end
+
       def description
         cmd_or_block = @command ? "command `#{@command}`" : "ruby block"
         "#{@positivity} #{cmd_or_block}"

data/lib/chef/resource/conditional_action_not_nothing.rb

@@ -0,0 +1,48 @@
+#
+# Author:: Xabier de Zuazo (<xabier@onddo.com>)
+# Copyright:: Copyright (c) 2013 Onddo Labs, SL.
+# 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.
+#
+
+class Chef
+  class Resource
+    class ConditionalActionNotNothing
+
+      attr_reader :current_action
+
+      def initialize(current_action)
+        @current_action = current_action
+      end
+
+      def continue?
+        # @positivity == not_if
+        @current_action != :nothing
+      end
+
+      def short_description
+        description
+      end
+
+      def description
+        "action :nothing"
+      end
+
+      def to_text
+        "not_if { action == :nothing }"
+      end
+
+    end
+  end
+end

data/lib/chef/resource/file.rb

@@ -18,7 +18,7 @@
 #
 
 require 'chef/resource'
-require 'chef/platform'
+require 'chef/platform/query_helpers'
 require 'chef/provider/file'
 require 'chef/mixin/securable'
 
@@ -36,6 +36,8 @@ class Chef
         state_attrs :checksum, :owner, :group, :mode
       end
 
+      attr_writer :checksum
+
       provides :file, :on_platforms => :all
 
       def initialize(name, run_context=nil)
@@ -46,13 +48,16 @@ class Chef
         @action = "create"
         @allowed_actions.push(:create, :delete, :touch, :create_if_missing)
         @provider = Chef::Provider::File
+        @atomic_update = Chef::Config[:file_atomic_update]
+        @force_unlink = false
+        @manage_symlink_source = nil
         @diff = nil
       end
 
 
       def content(arg=nil)
         set_or_return(
-                      :content,
+          :content,
           arg,
           :kind_of => String
         )
@@ -81,7 +86,7 @@ class Chef
           :kind_of => String
         )
       end
-      
+
       def diff(arg=nil)
         set_or_return(
           :diff,
@@ -90,6 +95,29 @@ class Chef
         )
       end
 
+      def atomic_update(arg=nil)
+        set_or_return(
+          :atomic_update,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def force_unlink(arg=nil)
+        set_or_return(
+          :force_unlink,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+      def manage_symlink_source(arg=nil)
+        set_or_return(
+          :manage_symlink_source,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
 
     end
   end

data/lib/chef/resource/link.rb

@@ -32,6 +32,7 @@ class Chef
       state_attrs :to, :owner, :group
 
       def initialize(name, run_context=nil)
+        verify_links_supported!
         super
         @resource_name = :link
         @to = nil
@@ -87,6 +88,22 @@ class Chef
       def path
         @target_file
       end
+
+      private
+      def verify_links_supported!
+        # On certain versions of windows links are not supported. Make
+        # sure we are not on such a platform.
+
+        if Chef::Platform.windows?
+          require 'chef/win32/file'
+          begin
+            Chef::ReservedNames::Win32::File.verify_links_supported!
+          rescue Chef::Exceptions::Win32APIFunctionNotImplemented => e
+            Chef::Log.fatal("Link resource is not supported on this version of Windows")
+            raise e
+          end
+        end
+      end
     end
   end
 end

data/lib/chef/resource/lwrp_base.rb

@@ -39,7 +39,7 @@ class Chef
 
         # Add log entry if we override an existing light-weight resource.
         class_name = convert_to_class_name(rname)
-        if Resource.const_defined?(class_name, false)
+        if Resource.strict_const_defined?(class_name)
           old_class = Resource.send(:remove_const, class_name)
           # CHEF-3432 -- Chef::Resource keeps a list of subclasses; need to
           # remove old ones from the list when replacing.

data/lib/chef/resource/mount.rb

@@ -25,7 +25,7 @@ class Chef
       
       identity_attr :device
 
-      state_attrs :mount_point, :device_type, :fstype
+      state_attrs :mount_point, :device_type, :fstype, :username, :password, :domain
 
       def initialize(name, run_context=nil)
         super
@@ -42,6 +42,9 @@ class Chef
         @action = :mount
         @supports = { :remount => false }
         @allowed_actions.push(:mount, :umount, :remount, :enable, :disable)
+        @username = nil
+        @password = nil
+        @domain = nil
       end
       
       def mount_point(arg=nil)
@@ -131,7 +134,31 @@ class Chef
           @supports
         end
       end
-      
+
+      def username(arg=nil)
+        set_or_return(
+          :username,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def password(arg=nil)
+        set_or_return(
+          :password,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def domain(arg=nil)
+        set_or_return(
+          :domain,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
     end
   end
 end

data/lib/chef/resource/powershell_script.rb

@@ -0,0 +1,31 @@
+#
+# Author:: Adam Edwards (<adamed@opscode.com>)
+# Copyright:: Copyright (c) 2013 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/resource/windows_script'
+
+class Chef
+  class Resource
+    class PowershellScript < Chef::Resource::WindowsScript
+
+      def initialize(name, run_context=nil)
+        super(name, run_context, :powershell_script, "powershell.exe")
+      end
+      
+    end
+  end
+end