summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--lib/chef/resource.rb6
-rw-r--r--spec/unit/resource_spec.rb8
2 files changed, 13 insertions, 1 deletions
diff --git a/lib/chef/resource.rb b/lib/chef/resource.rb
index ca6603c06a..5436e3ceb3 100644
--- a/lib/chef/resource.rb
+++ b/lib/chef/resource.rb
@@ -641,7 +641,11 @@ class Chef
all_props = {}
self.class.state_properties.map do |p|
- all_props[p.name.to_s] = p.sensitive? ? '"*sensitive value suppressed*"' : value_to_text(p.get(self))
+ begin
+ all_props[p.name.to_s] = p.sensitive? ? '"*sensitive value suppressed*"' : value_to_text(p.get(self))
+ rescue Chef::Exceptions::ValidationFailed
+ # This space left intentionally blank, the property was probably required or had an invalid default.
+ end
end
ivars = instance_variables.map { |ivar| ivar.to_sym } - HIDDEN_IVARS
diff --git a/spec/unit/resource_spec.rb b/spec/unit/resource_spec.rb
index 6285bad50a..9227c8b12d 100644
--- a/spec/unit/resource_spec.rb
+++ b/spec/unit/resource_spec.rb
@@ -377,6 +377,14 @@ describe Chef::Resource do
expect(resource.to_text).to match(/foo "\*sensitive value suppressed\*"/)
end
end
+
+ context "when property is required" do
+ it "does not propagate vailidation errors" do
+ resource_class = Class.new(Chef::Resource) { property :foo, String, required: true }
+ resource = resource_class.new("required_property_tests")
+ expect { resource.to_text }.to_not raise_error Chef::Exceptions::ValidationFailed
+ end
+ end
end
describe "self.resource_name" do