Merge pull request #8000 from MsysTechnologiesllc/vasundhara/MSYS-936_Fix_fo_windows_certificate_delete_action_fails

windows_certificate: Fix failures in delete action fails if certificate doesn't exist

1 files changed, 6 insertions, 3 deletions

diff --git a/lib/chef/resource/windows_certificate.rb b/lib/chef/resource/windows_certificate.rb
index 157deeddf6..9a2f4bda26 100644
--- a/lib/chef/resource/windows_certificate.rb
+++ b/lib/chef/resource/windows_certificate.rb
@@ -58,7 +58,6 @@ class Chef
 
       action :create do
         description "Creates or updates a certificate."
-
         add_cert(OpenSSL::X509::Certificate.new(raw_source))
       end
 
@@ -90,8 +89,12 @@ class Chef
 
       action :delete do
         description "Deletes a certificate."
-
-        delete_cert
+        cert_obj = fetch_cert
+        if cert_obj
+          converge_by("Deleting certificate #{new_resource.source} from Store #{new_resource.store_name}") do
+            delete_cert
+          end
+        end
       end
 
       action :fetch do