diff options
author | jamesc <james@opscode.com> | 2013-10-11 16:24:48 -0700 |
---|---|---|
committer | jamesc <james@opscode.com> | 2013-10-15 14:53:09 -0700 |
commit | 62265ff2b7a75a6dc0135ae8105002a9803f01ce (patch) | |
tree | 7609785a1dead6a43b14cfa2ca678b3e4def0d66 /spec/support/lib | |
parent | 6d58ff931dda2d5bfa0eb8b7feadf5cd0fb37c8e (diff) | |
download | chef-62265ff2b7a75a6dc0135ae8105002a9803f01ce.tar.gz |
When reporting a resource, before and after should always be a hash
If a Resource (or LWRP) overrides Resource#state (meaning to set an
attribute named state) this collides with the state function used to
gather up the state_attrs
Fix this by not using Resource#state, but copying that logic
into ResourceReporter#state.
Leaving Resource#state as it's used by other things. A full fix so
LWRPs can't override functions in Resource is in scope for Chef 12
Diffstat (limited to 'spec/support/lib')
-rw-r--r-- | spec/support/lib/chef/resource/with_state.rb | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/spec/support/lib/chef/resource/with_state.rb b/spec/support/lib/chef/resource/with_state.rb new file mode 100644 index 0000000000..226de0a6d2 --- /dev/null +++ b/spec/support/lib/chef/resource/with_state.rb @@ -0,0 +1,37 @@ +# +# Author:: Adam Jacob (<adam@opscode.com>) +# Copyright:: Copyright (c) 2008, 2010 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/knife' +require 'chef/json_compat' + +class Chef + class Resource + class WithState < Chef::Resource + attr_accessor :state + + def initialize(name, run_context=nil) + @resource_name = :with_state + super + end + + def state + @state + end + end + end +end |