PR #1428 review fixes

* remove unnecessary sensitive attribute definition in resource/file
* call sensitive method on correct object in failure inpector

2 files changed, 1 insertions, 10 deletions

diff --git a/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
index 59c7249f74..214e8989cb 100644
--- a/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
+++ b/lib/chef/formatters/error_inspectors/resource_failure_inspector.rb
@@ -41,7 +41,7 @@ class Chef
           end
 
           unless dynamic_resource?
-            error_description.section("Resource Declaration:", sensitive ? "suppressed sensitive resource output" : recipe_snippet)
+            error_description.section("Resource Declaration:", resource.sensitive ? "suppressed sensitive resource output" : recipe_snippet)
           end
 
           error_description.section("Compiled Resource:", "#{resource.to_text}")
diff --git a/lib/chef/resource/file.rb b/lib/chef/resource/file.rb
index 3db88dcda0..3c1f4785ef 100644
--- a/lib/chef/resource/file.rb
+++ b/lib/chef/resource/file.rb
@@ -52,7 +52,6 @@ class Chef
         @force_unlink = false
         @manage_symlink_source = nil
         @diff = nil
-        @sensitive = false
       end
 
       def content(arg=nil)
@@ -118,14 +117,6 @@ class Chef
           :kind_of => [ TrueClass, FalseClass ]
         )
       end
-
-      def sensitive(arg=nil)
-        set_or_return(
-          :sensitive,
-          arg,
-          :kind_of => [ TrueClass, FalseClass ]
-        )
-      end
     end
   end
 end