From 9ed7ba58df31c01c2518c724ae0d13f6070c98d7 Mon Sep 17 00:00:00 2001
From: Bert Blommers <info@bertblommers.nl>
Date: Sat, 20 Jun 2020 12:15:29 +0100
Subject: [PATCH] S3 - Implement delete_object_tagging

---
 IMPLEMENTATION_COVERAGE.md |  2 +-
 moto/s3/models.py          |  4 ++++
 moto/s3/responses.py       | 12 ++++++++++++
 tests/test_s3/test_s3.py   |  8 ++++++--
 4 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/IMPLEMENTATION_COVERAGE.md b/IMPLEMENTATION_COVERAGE.md
index 43983d912..8db762945 100644
--- a/IMPLEMENTATION_COVERAGE.md
+++ b/IMPLEMENTATION_COVERAGE.md
@@ -7093,7 +7093,7 @@
 - [X] delete_bucket_tagging
 - [ ] delete_bucket_website
 - [X] delete_object
-- [ ] delete_object_tagging
+- [x] delete_object_tagging
 - [ ] delete_objects
 - [ ] delete_public_access_block
 - [ ] get_bucket_accelerate_configuration
diff --git a/moto/s3/models.py b/moto/s3/models.py
index 350a4fd15..b809c0fc2 100644
--- a/moto/s3/models.py
+++ b/moto/s3/models.py
@@ -1566,6 +1566,10 @@ class S3Backend(BaseBackend):
         bucket = self.get_bucket(bucket_name)
         bucket.keys[key_name] = FakeDeleteMarker(key=bucket.keys[key_name])
 
+    def delete_object_tagging(self, bucket_name, key_name, version_id=None):
+        key = self.get_object(bucket_name, key_name, version_id=version_id)
+        self.tagger.delete_all_tags_for_resource(key.arn)
+
     def delete_object(self, bucket_name, key_name, version_id=None):
         key_name = clean_key_name(key_name)
         bucket = self.get_bucket(bucket_name)
diff --git a/moto/s3/responses.py b/moto/s3/responses.py
index d4d872a8d..10e68d569 100644
--- a/moto/s3/responses.py
+++ b/moto/s3/responses.py
@@ -1618,6 +1618,12 @@ class ResponseObject(_TemplateEnvironmentMixin, ActionAuthenticatorMixin):
             self.backend.cancel_multipart(bucket_name, upload_id)
             return 204, {}, ""
         version_id = query.get("versionId", [None])[0]
+        if "tagging" in query:
+            self.backend.delete_object_tagging(
+                bucket_name, key_name, version_id=version_id
+            )
+            template = self.response_template(S3_DELETE_KEY_TAGGING_RESPONSE)
+            return 204, {}, template.render(version_id=version_id)
         self.backend.delete_object(bucket_name, key_name, version_id=version_id)
         return 204, {}, ""
 
@@ -1935,6 +1941,12 @@ S3_DELETE_KEYS_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
 {% endfor %}
 </DeleteResult>"""
 
+S3_DELETE_KEY_TAGGING_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
+<DeleteObjectTaggingResult xmlns="http://s3.amazonaws.com/doc/2006-03-01">
+<VersionId>{{version_id}}</VersionId>
+</DeleteObjectTaggingResult>
+"""
+
 S3_OBJECT_ACL_RESPONSE = """<?xml version="1.0" encoding="UTF-8"?>
     <AccessControlPolicy xmlns="http://s3.amazonaws.com/doc/2006-03-01/">
       <Owner>
diff --git a/tests/test_s3/test_s3.py b/tests/test_s3/test_s3.py
index dbdd1b90c..8ac227f4f 100644
--- a/tests/test_s3/test_s3.py
+++ b/tests/test_s3/test_s3.py
@@ -2424,9 +2424,13 @@ def test_boto3_put_object_with_tagging():
 
     s3.put_object(Bucket=bucket_name, Key=key, Body="test", Tagging="foo=bar")
 
-    resp = s3.get_object_tagging(Bucket=bucket_name, Key=key)
+    s3.get_object_tagging(Bucket=bucket_name, Key=key)["TagSet"].should.contain(
+        {"Key": "foo", "Value": "bar"}
+    )
 
-    resp["TagSet"].should.contain({"Key": "foo", "Value": "bar"})
+    s3.delete_object_tagging(Bucket=bucket_name, Key=key)
+
+    s3.get_object_tagging(Bucket=bucket_name, Key=key)["TagSet"].should.equal([])
 
 
 @mock_s3