right_link 5.9.0

data/lib/chef/providers/right_script_resource.rb

@@ -0,0 +1,113 @@
+#
+# Copyright (c) 2009-2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+# To install the chef gem:
+# sudo gem sources -a http://gems.opscode.com
+# sudo gem install chef ohai
+
+require 'fileutils'
+require 'right_agent'
+
+class Chef
+
+  class Resource
+
+    # RightScript chef resource.
+    # Allows defining recipes which wrap RightScripts.
+    #
+    # === Example
+    # right_script "APP Mephisto bootstrap configure v2" do
+    #   source_file '/tmp/my_right_script'
+    #   parameters['APPLICATION'] 'My Mephisto App'
+    #   parameters['DB_SCHEMA_NAME'] 'db_schema'
+    #   parameters['RAILS_ENV'] 'production'
+    #   cache_dir '/var/cache/rightscale/app_mephisto'
+    # end
+    class RightScript < Chef::Resource
+
+      # Default directory used to cache RightScript source
+      DEFAULT_CACHE_DIR_ROOT = ::File.join(RightScale::Platform.filesystem.cache_dir, 'rightscale')
+
+      # Initialize RightScript resource with default values
+      #
+      # === Parameters
+      # name(String):: Nickname of RightScript
+      # collection(Array):: Collection of included recipes
+      # node(Chef::Node):: Node where resource will be used
+      def initialize(name, run_context=nil)
+        super(name, run_context)
+        @resource_name = :right_script
+        @cache_dir = ::File.join(DEFAULT_CACHE_DIR_ROOT, RightScale::AgentIdentity.generate)
+        @parameters = {}
+        @display_version = nil
+        @action = :run
+        @allowed_actions.push(:run)
+      end
+
+      # (String) RightScript nickname
+      def nickname(arg=nil)
+        set_or_return(
+          :nickname,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # (String) Path to file containing RightScript source code
+      def source_file(arg=nil)
+        set_or_return(
+          :source_file,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # (Hash) RightScript parameters values keyed by names
+      def parameters(arg=nil)
+        set_or_return(
+          :parameters,
+          arg,
+          :kind_of => [ Hash ]
+        )
+      end
+
+      # (String) Displayable version for RightScript (revision, etc.) or nil
+      def display_version(arg=nil)
+        set_or_return(
+          :display_version,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # (String) Path to directory where attachments source should be saved
+      def cache_dir(arg=nil)
+        set_or_return(
+          :cache_dir,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+    end
+  end
+end

data/lib/chef/providers/rs_shutdown_provider.rb

@@ -0,0 +1,75 @@
+#
+# Copyright (c) 2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Chef
+
+  class Provider
+
+    # Scriptable system reboot chef provider.
+    class RsShutdown < Chef::Provider
+
+      # Load current
+      #
+      # === Return
+      # true:: Always return true
+      def load_current_resource
+        true
+      end
+
+      # Schedules a reboot.
+      #
+      # === Return
+      # true:: Always return true
+      def action_reboot
+        RightScale::ShutdownRequestProxy.submit(:level => ::RightScale::ShutdownRequest::REBOOT, :immediately => @new_resource.immediately)
+        exit 0 if @new_resource.immediately
+        true
+      end
+
+      # Schedules a reboot.
+      #
+      # === Return
+      # true:: Always return true
+      def action_stop
+        RightScale::ShutdownRequestProxy.submit(:level => ::RightScale::ShutdownRequest::STOP, :immediately => @new_resource.immediately)
+        exit 0 if @new_resource.immediately
+        true
+      end
+
+      # Schedules a reboot.
+      #
+      # === Return
+      # true:: Always return true
+      def action_terminate
+        RightScale::ShutdownRequestProxy.submit(:level => ::RightScale::ShutdownRequest::TERMINATE, :immediately => @new_resource.immediately)
+        exit 0 if @new_resource.immediately
+        true
+      end
+
+    end
+
+  end
+
+end
+
+# self-register
+Chef::Platform.platforms[:default].merge!(:rs_shutdown => Chef::Provider::RsShutdown)

data/lib/chef/providers/rs_shutdown_resource.rb

@@ -0,0 +1,55 @@
+#
+# Copyright (c) 2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Chef
+  class Resource
+
+    # Scriptable system shutdown chef resource.
+    class RsShutdown < Chef::Resource
+
+      # Initialize rs_shutdown resource
+      #
+      # === Parameters
+      # name(String):: Tag name
+      # run_context(Chef::RunContext):: Run context or nil
+      def initialize(name, run_context=nil)
+        super(name, run_context)
+        @resource_name = :rs_shutdown
+        @action = :reboot
+        @immediately = false
+        @allowed_actions.push(:reboot, :stop, :terminate)
+      end
+
+      # (String) RightScript nickname
+      def immediately(arg=nil)
+        set_or_return(
+          :immediately,
+          arg,
+          :kind_of => [ TrueClass, FalseClass ]
+        )
+      end
+
+    end
+
+  end
+
+end

data/lib/chef/providers/server_collection_provider.rb

@@ -0,0 +1,66 @@
+# Copyright (c) 2009-2011 RightScale Inc
+#
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Chef
+
+  class Provider
+
+    # ServerCollection chef provider.
+    # Allows retrieving a set of servers by tags
+    class ServerCollection < Chef::Provider
+
+      # Initialize condition variable used to synchronize chef and EM threads
+      def initialize(node, resource, collection=nil, definitions={}, cookbook_loader=nil)
+        super(node, resource)
+      end
+
+      # This provider doesn't actually change any state on the server
+      #
+      # === Return
+      # true:: Always return true
+      def load_current_resource
+        true
+      end
+
+      # Get the tagged servers *synchronously*
+      #
+      # === Return
+      # true:: Always return true
+      def action_load
+        node[:server_collection] ||= {}
+        node[:server_collection][@new_resource.name] = {}
+        return unless @new_resource.tags && !@new_resource.tags.empty?
+
+        result = RightScale::Cook.instance.query_tags(@new_resource.tags, @new_resource.agent_ids, @new_resource.timeout)
+        collection = result.inject({}) { |res, (k, v)| res[k] = v['tags']; res }
+        node[:server_collection][@new_resource.name] = collection
+        true
+      end
+
+    end # ServerCollection
+
+  end # Provider
+
+end # Chef
+
+# self-register
+Chef::Platform.platforms[:default].merge!(:server_collection => Chef::Provider::ServerCollection)

data/lib/chef/providers/server_collection_resource.rb

@@ -0,0 +1,93 @@
+#
+# Copyright (c) 2009-2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+class Chef
+  class Resource
+
+    # Servers with associated tags
+    #
+    class ServerCollection < Chef::Resource
+
+      # Initialize resource
+      #
+      # === Parameters
+      # name(String):: Collection name
+      # collection(Array):: Collection of included recipes
+      # node(Chef::Node):: Node where resource will be used
+      def initialize(name, run_context=nil)
+        super(name, run_context)
+        @resource_name = :server_collection
+        @action = :load
+        @allowed_actions.push(:load)
+        @timeout = 120
+      end
+
+      # List of agent ids whose tags should be retrieved
+      #
+      # === Parameters
+      # arg(String|Array):: List of agent ids (or single agent id) to set
+      # nil:: Return list instead of setting
+      #
+      # === Return
+      # (Array):: List of agent ids
+      def agent_ids(arg=nil)
+        converted_arg = arg.is_a?(String) ? [ arg ] : arg
+        set_or_return(
+          :agent_ids,
+          converted_arg,
+          :kind_of => [ Array ]
+        )
+      end
+
+      # List of tags used to query agents and associated tags
+      #
+      # === Parameters
+      # arg(String|Array):: List of tags (or single tag) to set
+      # nil:: Return list instead of setting
+      #
+      # === Return
+      # (Array):: List of tags
+      def tags(arg=nil)
+        converted_arg = arg.is_a?(String) ? [ arg ] : arg
+        set_or_return(
+          :tags,
+          converted_arg,
+          :kind_of => [ Array ]
+        )
+      end
+
+      # (Fixnum) Common timeout parameter for command line tools
+      def timeout(arg=nil)
+        set_or_return(
+          :timeout,
+          arg,
+          :kind_of => [ Fixnum ]
+        )
+      end
+
+    end
+
+  end
+
+end
+
+

data/lib/chef/providers/windows/powershell_provider.rb

@@ -0,0 +1,151 @@
+#
+# Copyright (c) 2010-2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'fileutils'
+require 'chef/provider/execute'
+require File.normalize_path(File.join(File.dirname(__FILE__), '..', '..', 'windows', 'chef_node_server'))
+
+class Chef
+
+  class Provider
+
+    # Powershell chef provider.
+    class Powershell < Chef::Provider::Execute
+
+      # use a unique dir name instead of cluttering temp directory with leftover
+      # scripts like the original script provider.
+      SCRIPT_TEMP_DIR_PATH = ::File.join(::Dir.tmpdir, "chef-powershell-06D9AC00-8D64-4213-A46A-611FBAFB4426")
+
+      # No concept of a 'current' resource for Powershell execution, this is a no-op
+      #
+      # === Return
+      # true:: Always return true
+      def load_current_resource
+        true
+      end
+
+      # runs the PowerShell script in a child process.
+      #
+      # === Return
+      # true:: Always return true
+      #
+      # === Raise
+      # RightScale::Exceptions::Exec:: Invalid process exit status
+      def action_run
+        nickname         = @new_resource.name
+        source           = @new_resource.source
+        script_file_path = @new_resource.source_path
+        environment      = @new_resource.environment
+        current_state    = all_state
+
+        # 1. Write script source into file, if necessary.
+        if script_file_path
+          (raise RightScale::Exceptions::Exec, "Missing script file \"#{script_file_path}\"") unless ::File.file?(script_file_path)
+        else
+          FileUtils.mkdir_p(SCRIPT_TEMP_DIR_PATH)
+          script_file_path = ::File.join(SCRIPT_TEMP_DIR_PATH, "powershell_provider_source.ps1")
+          ::File.open(script_file_path, "w") { |f| f.write(source) }
+        end
+
+        begin
+          # 2. Setup environment.
+          environment = {} if environment.nil?
+          environment['RS_ALREADY_RUN'] = current_state[:chef_state].past_scripts.include?(nickname) ? '1' : nil
+          environment['RS_REBOOT'] = current_state[:cook_state].reboot?
+          @new_resource.environment(environment)
+
+          # 3. execute and wait
+          RightScale::Windows::ChefNodeServer.instance.start(:node => node)
+
+          # new_resource points to the powershell script resource in this limited
+          # context. there is no current resource in script execution context.
+          RightScale::Windows::ChefNodeServer.instance.new_resource = @new_resource
+
+          command = format_command(script_file_path)
+          @new_resource.command(command)
+          ::Chef::Log.info("Running \"#{nickname}\"")
+          super
+
+          # super provider raises an exception on failure, so record success at
+          # this point.
+          current_state[:chef_state].record_script_execution(nickname)
+          @new_resource.updated_by_last_action(true)
+
+          # a script may have requested reboot via rs_shutdown command line
+          # tool. if the script requested immediate shutdown then we must call
+          # exit here to interrupt the Chef converge (assuming any subsequent
+          # boot recipes are pending). otherwise, defer shutdown until scripts/
+          # recipes finish or another script escalates to an immediate shutdown.
+          exit 0 if RightScale::ShutdownRequestProxy.instance.immediately?
+        ensure
+          (FileUtils.rm_rf(SCRIPT_TEMP_DIR_PATH) rescue nil) if ::File.directory?(SCRIPT_TEMP_DIR_PATH)
+        end
+
+        true
+      end
+
+      protected
+
+      TEMP_DIR_NAME = 'powershell_provider-B6169A26-91B5-4e3e-93AD-F0B4F6EF107E'
+      SOURCE_WINDOWS_PATH = ::File.normalize_path(::File.join(::File.dirname(__FILE__), '..', '..', 'windows'))
+      LOCAL_WINDOWS_BIN_PATH = RightScale::Platform.filesystem.ensure_local_drive_path(::File.join(SOURCE_WINDOWS_PATH, 'bin'), TEMP_DIR_NAME)
+      CHEF_NODE_CMDLET_DLL_PATH = ::File.normalize_path(::File.join(LOCAL_WINDOWS_BIN_PATH, 'ChefNodeCmdlet.dll')).gsub("/", "\\")
+
+      # Provides a view of the current state objects (instance, chef, ...)
+      #
+      # == Returns
+      # result(Hash):: States:
+      #    :cook_state(RightScale::CookState):: current cook state
+      #    :chef_state(RightScale::ChefState):: current chef state
+      def all_state
+        result = {:cook_state => RightScale::CookState, :chef_state => RightScale::ChefState}
+      end
+
+
+      # Formats a command to run the given powershell script.
+      #
+      # === Parameters
+      # script_file_path(String):: powershell script file path
+      #
+      # == Returns
+      # command(String):: command to execute
+      def format_command(script_file_path)
+        platform = RightScale::Platform
+        shell    = platform.shell
+
+        # import ChefNodeCmdlet.dll to allow powershell scripts to call get-ChefNode, etc.
+        lines_before_script = ["import-module #{CHEF_NODE_CMDLET_DLL_PATH}"]
+
+        # enable debug and verbose powershell output if log level allows for it.
+        if ::Chef::Log.debug?
+          lines_before_script << "$VerbosePreference = 'Continue'"
+          lines_before_script << "$DebugPreference = 'Continue'"
+        end
+        return shell.format_powershell_command4(@new_resource.interpreter, lines_before_script, nil, script_file_path)
+      end
+
+    end
+  end
+end
+
+# self-register
+Chef::Platform.platforms[:windows][:default].merge!(:powershell => Chef::Provider::Powershell)

data/lib/chef/providers/windows/powershell_resource.rb

@@ -0,0 +1,111 @@
+#
+# Copyright (c) 2010-2011 RightScale Inc
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+require 'fileutils'
+require 'chef/resource/script'
+
+class Chef
+
+  class Resource
+
+    # Powershell chef resource.
+    # Allows defining recipes which wrap Powershell v1.0 scripts.
+    #
+    # === Example
+    # powershell "My Powershell Script" do
+    #   source "write-output \"Running powershell v1.0 script\""
+    # end
+    class Powershell < Chef::Resource::Script
+
+      # Initialize Powershell resource with default values
+      #
+      # === Parameters
+      # name(String):: Nickname of Powershell
+      # collection(Array):: Collection of included recipes
+      # node(Chef::Node):: Node where resource will be used
+      def initialize(name, run_context=nil)
+        super(name, run_context)
+        @resource_name = :powershell
+        @interpreter = "powershell"
+        @parameters = {}
+        @source = nil
+        @source_path = nil
+        @action = :run
+        @allowed_actions.push(:run)
+      end
+
+      # (String) Powershell nickname
+      def nickname(arg=nil)
+        set_or_return(
+          :nickname,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # (String) text of Powershell source code if inline
+      def source(arg=nil)
+        set_or_return(
+          :source,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # (String) local path for external Powershell source file if not inline
+      def source_path(arg=nil)
+        set_or_return(
+          :source_path,
+          arg,
+          :kind_of => [ String ]
+        )
+      end
+
+      # (Hash) Powershell parameters values keyed by names
+      def parameters(arg=nil)
+        return environment if arg.nil?
+
+        # FIX: support Windows alpha demo-style parameters for now. document
+        # that they are deprecated and to use a simple hash. this method of
+        # parameter passing may be deprecated altogether in future.
+        if arg.kind_of?(Chef::Node::Attribute)
+          arg = arg.attribute
+        end
+
+        # parameters is really a duplication of the environment hash from
+        # the ExecuteResource, so merge the two hashes, if necessary. it seems
+        # valid to continue to distinguish symantically between parameters and
+        # environment because the user does not necessarily need to know that
+        # they are implemented to be the same hash.
+        env = environment
+        if env.nil?
+          env = arg
+        else
+          env.merge!(arg)
+        end
+        environment(env)
+        @parameters = @environment
+      end
+
+    end
+  end
+end