chef 11.14.6-x86-mingw32 → 11.16.0-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f91371bb60065252a97632555f0df556cad3fae
-  data.tar.gz: 1bb4529b9515de55e1ffd4ad6cd617e4545ca1e5
+  metadata.gz: 49b6fe3b7b3cc9463d7faa2c42c063805a8c0622
+  data.tar.gz: bf2edeaa5447924dc2f5d6c4f21409f99e268f03
 SHA512:
-  metadata.gz: df49419774cdffd4dc4605f060b425bd544cebc16f6e244c5baa09f31eef7b88114bd0227fa659040cf7fa9d45b51d089a617d573723d8d5aa29970dd3595b34
-  data.tar.gz: 1c5f519f24807ce4c72996a1faedcddaaee5d07f0b8bc20e0f6e6b57ec440b6eb138c090095ba9f546bbe863354ebb4289b06294b30abea3cbdbdbf85c070a00
+  metadata.gz: edd6c14fb435fc1c2ee3f19ae061221c3f895b650b77f44f5142c5ba6b0af671e7205535c76a90f23d24c4e96fbd5e45fb1eeb5f7e0a754733274d9e770b8057
+  data.tar.gz: 8f044ddd62016822cc9fdbfd3d80c9d1598b34aff1af8c0274bdfcd5339eebe61bdca9d0bd25c53cb114eded9a62fd45d412752eec5ff6064c2516326e71e986

data/lib/chef/exceptions.rb

@@ -117,6 +117,8 @@ class Chef
     class ObsoleteDependencySyntax < ArgumentError; end
     class InvalidDataBagPath < ArgumentError; end
 
+    class PowershellCmdletException < RuntimeError; end
+
     # A different version of a cookbook was added to a
     # VersionedRecipeList than the one already there.
     class CookbookVersionConflict < ArgumentError ; end
@@ -176,6 +178,8 @@ class Chef
 
     class ChildConvergeError < RuntimeError; end
 
+    class NoProviderAvailable < RuntimeError; end
+
     class MissingRole < RuntimeError
       NULL = Object.new
 

data/lib/chef/mixin/windows_architecture_helper.rb

@@ -41,6 +41,22 @@ class Chef
           is_i386_process_on_x86_64_windows?
       end
 
+      def with_os_architecture(node)
+        wow64_redirection_state = nil
+
+        if wow64_architecture_override_required?(node, node_windows_architecture(node))
+          wow64_redirection_state = disable_wow64_file_redirection(node)
+        end
+
+        begin
+          yield
+        ensure
+          if wow64_redirection_state
+            restore_wow64_file_redirection(node, wow64_redirection_state)
+          end
+        end
+      end
+
       def node_supports_windows_architecture?(node, desired_architecture)
         assert_valid_windows_architecture!(desired_architecture)
         return (node_windows_architecture(node) == :x86_64 ||

data/lib/chef/platform/query_helpers.rb

@@ -45,7 +45,11 @@ class Chef
 
         is_server_2003
       end
-    end
 
+      def supports_dsc?(node)
+        node[:languages] && node[:languages][:powershell] &&
+          node[:languages][:powershell][:version].to_i >= 4
+      end
+    end
   end
 end

data/lib/chef/provider/dsc_script.rb

@@ -0,0 +1,148 @@
+#
+# Author:: Adam Edwards (<adamed@getchef.com>)
+#
+# Copyright:: 2014, Chef Software, Inc.
+#
+# 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/util/powershell/cmdlet'
+require 'chef/util/dsc/configuration_generator'
+require 'chef/util/dsc/local_configuration_manager'
+
+class Chef
+  class Provider
+    class DscScript < Chef::Provider
+      def initialize(dsc_resource, run_context)
+        super(dsc_resource, run_context)
+        @dsc_resource = dsc_resource
+        @resource_converged = false
+        @operations = {
+          :set => Proc.new { |config_manager, document|
+            config_manager.set_configuration(document)
+          },
+          :test => Proc.new { |config_manager, document|
+            config_manager.test_configuration(document)
+          }}
+      end
+
+      def action_run
+        if ! @resource_converged
+          converge_by(generate_description) do
+            run_configuration(:set)
+            Chef::Log.info("DSC resource configuration completed successfully")
+          end
+        end
+      end
+
+      def load_current_resource
+        @dsc_resources_info = run_configuration(:test)
+        @resource_converged = @dsc_resources_info.all? do |resource|
+          !resource.changes_state?
+        end
+      end
+
+      def whyrun_supported?
+        true
+      end
+
+      protected
+
+      def run_configuration(operation)
+        config_directory = ::Dir.mktmpdir("chef-dsc-script")
+        configuration_data_path = get_configuration_data_path(config_directory)
+        configuration_flags = get_augmented_configuration_flags(configuration_data_path)
+
+        config_manager = Chef::Util::DSC::LocalConfigurationManager.new(@run_context.node, config_directory)
+
+        begin
+          configuration_document = generate_configuration_document(config_directory, configuration_flags)
+          @operations[operation].call(config_manager, configuration_document)
+        rescue Exception => e
+          Chef::Log.error("DSC operation failed: #{e.message.to_s}")
+          raise e
+        ensure
+          ::FileUtils.rm_rf(config_directory)
+        end
+      end
+
+      def get_augmented_configuration_flags(configuration_data_path)
+        updated_flags = nil
+        if configuration_data_path
+          updated_flags = @dsc_resource.flags.nil? ? {} : @dsc_resource.flags.dup
+          Chef::Util::PathHelper.validate_path(configuration_data_path)
+          updated_flags[:configurationdata] = configuration_data_path
+        end
+        updated_flags
+      end
+
+      def generate_configuration_document(config_directory, configuration_flags)
+        shellout_flags = {
+          :cwd => @dsc_resource.cwd,
+          :environment => @dsc_resource.environment,
+          :timeout => @dsc_resource.timeout
+        }
+
+        generator = Chef::Util::DSC::ConfigurationGenerator.new(@run_context.node, config_directory)
+
+        if @dsc_resource.command
+          generator.configuration_document_from_script_path(@dsc_resource.command, configuration_name, configuration_flags, shellout_flags)
+        else
+          # If code is also not provided, we mimic what the other script resources do (execute nothing)
+          Chef::Log.warn("Neither code or command were provided for dsc_resource[#{@dsc_resource.name}].") unless @dsc_resource.code
+          generator.configuration_document_from_script_code(@dsc_resource.code || '', configuration_flags, shellout_flags)
+        end
+      end
+
+      def get_configuration_data_path(config_directory)
+        if @dsc_resource.configuration_data_script
+          @dsc_resource.configuration_data_script
+        elsif @dsc_resource.configuration_data
+          configuration_data_path = "#{config_directory}/chef_dsc_config_data.psd1"
+          ::File.open(configuration_data_path, 'wt') do | script |
+            script.write(@dsc_resource.configuration_data)
+          end
+          configuration_data_path
+        end
+      end
+
+      def configuration_name
+        @dsc_resource.configuration_name || @dsc_resource.name
+      end
+
+      def configuration_friendly_name
+        if @dsc_resource.code
+          @dsc_resource.name
+        else
+          configuration_name
+        end
+      end
+
+      private
+
+      def generate_description
+        ["converge DSC configuration '#{configuration_friendly_name}'"] +
+          @dsc_resources_info.map do |resource|
+            if resource.changes_state?
+              # We ignore the last log message because it only contains the time it took, which looks weird
+              cleaned_messages = resource.change_log[0..-2].map { |c| c.sub(/^#{Regexp.escape(resource.name)}/, '').strip }
+              "converge DSC resource #{resource.name} by #{cleaned_messages.find_all{ |c| c != ''}.join("\n")}"
+            else
+              # This is needed because a dsc script can have resouces that are both converged and not
+              "converge DSC resource #{resource.name} by doing nothing because it is already converged"
+            end
+          end
+      end
+    end
+  end
+end

data/lib/chef/provider/user/dscl.rb

@@ -110,18 +110,18 @@ user password using shadow hash.")
           @current_resource = Chef::Resource::User.new(@new_resource.username)
           @current_resource.username(@new_resource.username)
 
-          user_info = read_user_info
-          if user_info
-            @current_resource.uid(dscl_get(user_info, :uid))
-            @current_resource.gid(dscl_get(user_info, :gid))
-            @current_resource.home(dscl_get(user_info, :home))
-            @current_resource.shell(dscl_get(user_info, :shell))
-            @current_resource.comment(dscl_get(user_info, :comment))
-            @authentication_authority = dscl_get(user_info, :auth_authority)
-
-            if @new_resource.password && dscl_get(user_info, :password) == "********"
+          @user_info = read_user_info
+          if @user_info
+            @current_resource.uid(dscl_get(@user_info, :uid))
+            @current_resource.gid(dscl_get(@user_info, :gid))
+            @current_resource.home(dscl_get(@user_info, :home))
+            @current_resource.shell(dscl_get(@user_info, :shell))
+            @current_resource.comment(dscl_get(@user_info, :comment))
+            @authentication_authority = dscl_get(@user_info, :auth_authority)
+
+            if @new_resource.password && dscl_get(@user_info, :password) == "********"
               # A password is set. Let's get the password information from shadow file
-              shadow_hash_binary = dscl_get(user_info, :shadow_hash)
+              shadow_hash_binary = dscl_get(@user_info, :shadow_hash)
 
               # Calling shell_out directly since we want to give an input stream
               shadow_hash_xml = convert_binary_plist_to_xml(shadow_hash_binary.string)
@@ -158,22 +158,26 @@ user password using shadow hash.")
 
         def create_user
           dscl_create_user
+          # set_password modifies the plist file of the user directly. So update
+          # the password first before making any modifications to the user.
+          set_password
           dscl_create_comment
           dscl_set_uid
           dscl_set_gid
           dscl_set_home
           dscl_set_shell
-          set_password
         end
 
         def manage_user
+          # set_password modifies the plist file of the user directly. So update
+          # the password first before making any modifications to the user.
+          set_password        if diverged_password?
           dscl_create_user    if diverged?(:username)
           dscl_create_comment if diverged?(:comment)
           dscl_set_uid        if diverged?(:uid)
           dscl_set_gid        if diverged?(:gid)
           dscl_set_home       if diverged?(:home)
           dscl_set_shell      if diverged?(:shell)
-          set_password        if diverged_password?
         end
 
         #
@@ -339,22 +343,18 @@ user password using shadow hash.")
             :input => shadow_info.to_plist, :live_stream => shadow_info_binary)
           command.run_command
 
+          if @user_info.nil?
+            # User is  just created. read_user_info() will read the fresh information
+            # for the user with a cache flush. However with experimentation we've seen
+            # that dscl cache is not immediately updated after the creation of the user
+            # This is odd and needs to be investigated further.
+            sleep 3
+            @user_info = read_user_info
+          end
+
           # Replace the shadow info in user's plist
-          user_info = read_user_info
-          dscl_set(user_info, :shadow_hash, shadow_info_binary)
-
-          #
-          # Before saving the user's plist file we need to wait for dscl to
-          # update its caches and flush them to disk. In order to achieve this
-          # we need to wait first for our changes to get into the dscl cache
-          # and then flush the cache to disk before saving password into the
-          # plist file. 3 seconds is the minimum experimental value for dscl
-          # cache to be updated. We can get rid of this sleep when we find a
-          # trigger to update dscl cache.
-          #
-          sleep 3
-          shell_out("dscacheutil '-flushcache'")
-          save_user_info(user_info)
+          dscl_set(@user_info, :shadow_hash, shadow_info_binary)
+          save_user_info(@user_info)
         end
 
         #
@@ -555,6 +555,10 @@ user password using shadow hash.")
         def read_user_info
           user_info = nil
 
+          # We flush the cache here in order to make sure that we read fresh information
+          # for the user. 
+          shell_out("dscacheutil '-flushcache'")
+
           begin
             user_plist_file = "#{USER_PLIST_DIRECTORY}/#{@new_resource.username}.plist"
             user_plist_info = run_plutil("convert xml1 -o - #{user_plist_file}")

data/lib/chef/providers.rb

@@ -24,6 +24,7 @@ require 'chef/provider/cron/solaris'
 require 'chef/provider/cron/aix'
 require 'chef/provider/deploy'
 require 'chef/provider/directory'
+require 'chef/provider/dsc_script'
 require 'chef/provider/env'
 require 'chef/provider/erl_call'
 require 'chef/provider/execute'

data/lib/chef/resource/dsc_script.rb

@@ -0,0 +1,140 @@
+#
+# Author:: Adam Edwards (<adamed@getchef.com>)
+# Copyright:: Copyright (c) 2014 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/exceptions'
+
+class Chef
+  class Resource
+    class DscScript < Chef::Resource
+
+      provides :dsc_script, :on_platforms => ["windows"]
+
+      def initialize(name, run_context=nil)
+        super
+        @allowed_actions.push(:run)
+        @action = :run
+        if(run_context && Chef::Platform.supports_dsc?(run_context.node))
+          @provider = Chef::Provider::DscScript
+        else
+          raise Chef::Exceptions::NoProviderAvailable,
+            "#{powershell_info_str(run_context)}\nPowershell 4.0 or higher was not detected on your system and is required to use the dsc_script resource."
+        end
+      end
+
+      def code(arg=nil)
+        if arg && command
+          raise ArgumentError, "Only one of 'code' and 'command' attributes may be specified"
+        end
+        if arg && configuration_name
+          raise ArgumentError, "The 'code' and 'command' attributes may not be used together"
+        end
+        set_or_return(
+          :code,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def configuration_name(arg=nil)
+        if arg && code
+          raise ArgumentError, "Attribute `configuration_name` may not be set if `code` is set"
+        end
+        set_or_return(
+          :configuration_name,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def command(arg=nil)
+        if arg && code
+          raise ArgumentError, "The 'code' and 'command' attributes may not be used together"
+        end
+        set_or_return(
+          :command,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def configuration_data(arg=nil)
+        if arg && configuration_data_script
+          raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' attributes may not be used together"
+        end
+        set_or_return(
+          :configuration_data,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def configuration_data_script(arg=nil)
+        if arg && configuration_data
+          raise ArgumentError, "The 'configuration_data' and 'configuration_data_script' attributes may not be used together"
+        end
+        set_or_return(
+          :configuration_data_script,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def flags(arg=nil)
+        set_or_return(
+          :flags,
+          arg,
+          :kind_of => [ Hash ]
+        )
+      end
+
+      def cwd(arg=nil)
+        set_or_return(
+          :cwd,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      def environment(arg=nil)
+        set_or_return(
+          :environment,
+          arg,
+          :kind_of => [ Hash ]
+        )
+      end
+
+      def timeout(arg=nil)
+        set_or_return(
+          :timeout,
+          arg,
+          :kind_of => [ Integer ]
+        )
+      end
+
+      private
+
+      def powershell_info_str(run_context)
+        if run_context && run_context.node[:languages] && run_context.node[:languages][:powershell]
+            install_info = "Powershell #{run_context.node[:languages][:powershell][:version]} was found on the system."
+          else
+            install_info = 'Powershell was not found.'
+          end
+      end
+    end
+  end
+end