diff options
| author | Lamont Granquist <lamont@chef.io> | 2020-08-03 17:38:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-03 17:38:43 -0700 |
| commit | bc745530496c192f7feff6d5c14ef668fb040b2a (patch) | |
| tree | 446d87c5adf34987b97b0e707260c8358143ede4 | |
| parent | ada22d450e07fe19ae2af12adbdfa4e11177917b (diff) | |
| download | chef-bc745530496c192f7feff6d5c14ef668fb040b2a.tar.gz | |
Update lib/chef/resource/openssl_x509_request.rb
Co-authored-by: pete higgins <pete@peterhiggins.org>
| -rw-r--r-- | lib/chef/resource/openssl_x509_request.rb | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/lib/chef/resource/openssl_x509_request.rb b/lib/chef/resource/openssl_x509_request.rb index 15c823b6cf..104b26800b 100644 --- a/lib/chef/resource/openssl_x509_request.rb +++ b/lib/chef/resource/openssl_x509_request.rb @@ -149,14 +149,12 @@ class Chef action_class do def key_file @key_file ||= - begin - if new_resource.key_file - new_resource.key_file - else - path, file = ::File.split(new_resource.path) - filename = ::File.basename(file, ::File.extname(file)) - path + "/" + filename + ".key" - end + if new_resource.key_file + new_resource.key_file + else + path, file = ::File.split(new_resource.path) + filename = ::File.basename(file, ::File.extname(file)) + path + "/" + filename + ".key" end end |