From 8efa68285874b7d9d98c55dbd54f360d9c80f31f Mon Sep 17 00:00:00 2001
From: Hossein Shafagh <hshafagh@netflix.com>
Date: Tue, 10 Nov 2020 17:43:35 -0800
Subject: [PATCH 1/3] add delete acme token

---
 lemur/plugins/lemur_aws/plugin.py | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/lemur/plugins/lemur_aws/plugin.py b/lemur/plugins/lemur_aws/plugin.py
index b54787ac..8fca73e9 100644
--- a/lemur/plugins/lemur_aws/plugin.py
+++ b/lemur/plugins/lemur_aws/plugin.py
@@ -449,6 +449,34 @@ class S3DestinationPlugin(ExportDestinationPlugin):
         metrics.send(f"{function}", "counter", 1, metric_tags={"result": res,
                                                                "bucket_name": bucket_name,
                                                                "filename": filename})
+        return response
+
+    def delete_acme_token(self, token_path, options, **kwargs):
+
+        current_app.logger.debug("S3 destination plugin is started to delete HTTP-01 challenge")
+
+        function = f"{__name__}.{sys._getframe().f_code.co_name}"
+
+        account_number = self.get_option("accountNumber", options)
+        bucket_name = self.get_option("bucket", options)
+        prefix = self.get_option("prefix", options)
+        filename = token_path.split("/")[-1]
+        response = s3.delete(bucket_name=bucket_name,
+                             prefixed_object_name=prefix + filename,
+                             account_number=account_number)
+        res = "Success" if response else "Failure"
+        log_data = {
+            "function": function,
+            "message": "delete acme token challenge",
+            "result": res,
+            "bucket_name": bucket_name,
+            "filename": filename
+        }
+        current_app.logger.info(log_data)
+        metrics.send(f"{function}", "counter", 1, metric_tags={"result": res,
+                                                               "bucket_name": bucket_name,
+                                                               "filename": filename})
+        return response
 
 
 class SNSNotificationPlugin(ExpirationNotificationPlugin):

From ea77ef08aa2656b8c1b873d782d7932f37a25ab4 Mon Sep 17 00:00:00 2001
From: Hossein Shafagh <hshafagh@netflix.com>
Date: Tue, 10 Nov 2020 17:45:02 -0800
Subject: [PATCH 2/3] testing for delete

---
 lemur/plugins/lemur_aws/tests/test_plugin.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lemur/plugins/lemur_aws/tests/test_plugin.py b/lemur/plugins/lemur_aws/tests/test_plugin.py
index be9b14fd..89a318ca 100644
--- a/lemur/plugins/lemur_aws/tests/test_plugin.py
+++ b/lemur/plugins/lemur_aws/tests/test_plugin.py
@@ -80,3 +80,8 @@ def test_upload_acme_token(app):
 
     # put data, and getting the same data
     assert (response == token_content)
+
+    response = p.delete_acme_token(token_path=token_path,
+                                   options=additional_options,
+                                   account_number=account)
+    assert response

From 252f84cf213b6a66926e72df56c49fb11f68165c Mon Sep 17 00:00:00 2001
From: Hossein Shafagh <hshafagh@netflix.com>
Date: Tue, 10 Nov 2020 17:46:00 -0800
Subject: [PATCH 3/3] adding also response to upload acme token, just for
 future use-cases

---
 lemur/plugins/lemur_aws/plugin.py            | 18 +++++++++---------
 lemur/plugins/lemur_aws/tests/test_plugin.py |  9 +++++----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/lemur/plugins/lemur_aws/plugin.py b/lemur/plugins/lemur_aws/plugin.py
index 8fca73e9..fcc2e0cf 100644
--- a/lemur/plugins/lemur_aws/plugin.py
+++ b/lemur/plugins/lemur_aws/plugin.py
@@ -419,7 +419,7 @@ class S3DestinationPlugin(ExportDestinationPlugin):
         :param kwargs:
         :return:
         """
-        current_app.logger.debug("S3 destination plugin is started for HTTP-01 challenge")
+        current_app.logger.debug("S3 destination plugin is started to upload HTTP-01 challenge")
 
         function = f"{__name__}.{sys._getframe().f_code.co_name}"
 
@@ -431,16 +431,16 @@ class S3DestinationPlugin(ExportDestinationPlugin):
         if not prefix.endswith("/"):
             prefix + "/"
 
-        res = s3.put(bucket_name=bucket_name,
-                     region_name=region,
-                     prefix=prefix + filename,
-                     data=token,
-                     encrypt=False,
-                     account_number=account_number)
-        res = "Success" if res else "Failure"
+        response = s3.put(bucket_name=bucket_name,
+                          region_name=region,
+                          prefix=prefix + filename,
+                          data=token,
+                          encrypt=False,
+                          account_number=account_number)
+        res = "Success" if response else "Failure"
         log_data = {
             "function": function,
-            "message": "check if any valid certificate is revoked",
+            "message": "upload acme token challenge",
             "result": res,
             "bucket_name": bucket_name,
             "filename": filename
diff --git a/lemur/plugins/lemur_aws/tests/test_plugin.py b/lemur/plugins/lemur_aws/tests/test_plugin.py
index 89a318ca..e032cf02 100644
--- a/lemur/plugins/lemur_aws/tests/test_plugin.py
+++ b/lemur/plugins/lemur_aws/tests/test_plugin.py
@@ -68,10 +68,11 @@ def test_upload_acme_token(app):
     s3_client.create_bucket(Bucket=bucket)
     p = plugins.get("aws-s3")
 
-    p.upload_acme_token(token_path=token_path,
-                        token_content=token_content,
-                        token=token_content,
-                        options=additional_options)
+    response = p.upload_acme_token(token_path=token_path,
+                                   token_content=token_content,
+                                   token=token_content,
+                                   options=additional_options)
+    assert response
 
     response = get(bucket_name=bucket,
                    prefixed_object_name=prefix + token_name,