summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Smith <tsmith@chef.io>2019-01-16 10:50:23 -0800
committerTim Smith <tsmith@chef.io>2019-01-17 15:56:59 -0800
commitd9c39a35f8f65034843751a901d7927d8b5f279f (patch)
tree8ef3c6f3e97baff2c843128d2bbbebf81e54b061
parentec34c38a748228fd3cc2a6c9b101b41c3b07ebc9 (diff)
downloadchef-d9c39a35f8f65034843751a901d7927d8b5f279f.tar.gz
Make sure openssl resources properly use the name_property
We have a name_property, but we're not using it everywhere here. Signed-off-by: Tim Smith <tsmith@chef.io>
-rw-r--r--lib/chef/resource/openssl_ec_private_key.rb2
-rw-r--r--lib/chef/resource/openssl_x509_request.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/chef/resource/openssl_ec_private_key.rb b/lib/chef/resource/openssl_ec_private_key.rb
index 366f2c44f3..7aac4e9a51 100644
--- a/lib/chef/resource/openssl_ec_private_key.rb
+++ b/lib/chef/resource/openssl_ec_private_key.rb
@@ -68,7 +68,7 @@ class Chef
unless new_resource.force || priv_key_file_valid?(new_resource.path, new_resource.key_pass)
converge_by("Create an EC private key #{new_resource.path}") do
log "Generating an #{new_resource.key_curve} "\
- "EC key file at #{new_resource.name}, this may take some time"
+ "EC key file at #{new_resource.path}, this may take some time"
if new_resource.key_pass
unencrypted_ec_key = gen_ec_priv_key(new_resource.key_curve)
diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb
index 6808443d80..b88c0f66f7 100644
--- a/lib/chef/resource/openssl_x509_request.rb
+++ b/lib/chef/resource/openssl_x509_request.rb
@@ -89,7 +89,7 @@ class Chef
unless ::File.exist? new_resource.path
converge_by("Create CSR #{@new_resource}") do
- file new_resource.name do
+ file new_resource.path do
owner new_resource.owner unless new_resource.owner.nil?
group new_resource.group unless new_resource.group.nil?
mode new_resource.mode unless new_resource.mode.nil?