rgw/pubsub: remove deprecated pubsub event types

Signed-off-by: Yuval Lifshitz <ylifshit@redhat.com>

diff --git a/src/rgw/rgw_notify_event_type.cc b/src/rgw/rgw_notify_event_type.cc
index 8ee52c674dba47fc5cbbed733b33b4b64911b89d..7a0ef9568e15a98910ae4b3f89631f0429fa913b 100644 (file)
--- a/src/rgw/rgw_notify_event_type.cc
+++ b/src/rgw/rgw_notify_event_type.cc
@@ -56,48 +56,12 @@ namespace rgw::notify {
     return "s3:UnknownEvent";
   }
 
-  std::string to_ceph_string(EventType t) {
-    switch (t) {
-    case ObjectCreated:
-    case ObjectCreatedPut:
-    case ObjectCreatedPost:
-    case ObjectCreatedCopy:
-    case ObjectCreatedCompleteMultipartUpload:
-      return "OBJECT_CREATE";
-    case ObjectRemovedDelete:
-      return "OBJECT_DELETE";
-    case ObjectRemovedDeleteMarkerCreated:
-      return "DELETE_MARKER_CREATE";
-    case ObjectLifecycle:
-      return "OBJECT_LIFECYCLE";
-    case ObjectExpiration:
-    case ObjectExpirationCurrent:
-    case ObjectExpirationNoncurrent:
-    case ObjectExpirationDeleteMarker:
-    case ObjectExpirationAbortMPU:
-      return "OBJECT_EXPIRATION";
-    case ObjectTransition:
-    case ObjectTransitionCurrent:
-    case ObjectTransitionNoncurrent:
-      return "OBJECT_TRANSITION";
-    case ObjectSynced:
-    case ObjectSyncedCreate:
-    case ObjectSyncedDelete:
-    case ObjectSyncedDeletionMarkerCreated:
-      return "OBJECT_SYNCED";
-    case ObjectRemoved:
-    case UnknownEvent:
-      return "UNKNOWN_EVENT";
-    }
-    return "UNKNOWN_EVENT";
-  }
-
   std::string to_event_string(EventType t) {
     return to_string(t).substr(3);
   }
 
   EventType from_string(const std::string& s) {
-    if (s == "s3:ObjectCreated:*" || s == "OBJECT_CREATE")
+    if (s == "s3:ObjectCreated:*")
         return ObjectCreated;
     if (s == "s3:ObjectCreated:Put")
         return ObjectCreatedPut;
@@ -109,13 +73,13 @@ namespace rgw::notify {
         return ObjectCreatedCompleteMultipartUpload;
     if (s == "s3:ObjectRemoved:*")
         return ObjectRemoved;
-    if (s == "s3:ObjectRemoved:Delete" || s == "OBJECT_DELETE")
+    if (s == "s3:ObjectRemoved:Delete")
         return ObjectRemovedDelete;
-    if (s == "s3:ObjectRemoved:DeleteMarkerCreated" || s == "DELETE_MARKER_CREATE")
+    if (s == "s3:ObjectRemoved:DeleteMarkerCreated")
         return ObjectRemovedDeleteMarkerCreated;
     if (s == "s3:ObjectLifecycle:*")
         return ObjectLifecycle;
-    if (s == "s3:ObjectLifecycle:Expiration:*" || s == "OBJECT_EXPIRATION")
+    if (s == "s3:ObjectLifecycle:Expiration:*")
         return ObjectExpiration;
     if (s == "s3:ObjectLifecycle:Expiration:Current")
         return ObjectExpirationCurrent;
@@ -125,13 +89,13 @@ namespace rgw::notify {
         return ObjectExpirationDeleteMarker;
     if (s == "s3:ObjectLifecycle:Expiration:AbortMultipartUpload")
         return ObjectExpirationAbortMPU;
-    if (s == "s3:ObjectLifecycle:Transition:*" || s == "OBJECT_TRANSITION")
+    if (s == "s3:ObjectLifecycle:Transition:*")
         return ObjectTransition;
     if (s == "s3:ObjectLifecycle:Transition:Current")
         return ObjectTransitionCurrent;
     if (s == "s3:ObjectLifecycle:Transition:Noncurrent")
         return ObjectTransitionNoncurrent;
-    if (s == "s3:ObjectSynced:*" || s == "OBJECT_SYNCED")
+    if (s == "s3:ObjectSynced:*")
         return ObjectSynced;
     if (s == "s3:ObjectSynced:Create")
         return ObjectSyncedCreate;

diff --git a/src/rgw/rgw_notify_event_type.h b/src/rgw/rgw_notify_event_type.h
index d09432b1626dc302e358a1c6fe26ec39b9b0d516..4fe1b5c90c6245b622aeff59ed7f0cfd7dcfebb7 100644 (file)
--- a/src/rgw/rgw_notify_event_type.h
+++ b/src/rgw/rgw_notify_event_type.h
@@ -39,8 +39,6 @@ namespace rgw::notify {
 
   std::string to_string(EventType t);
 
-  std::string to_ceph_string(EventType t);
-
   std::string to_event_string(EventType t);
 
   EventType from_string(const std::string& s);

diff --git a/src/rgw/rgw_pubsub.cc b/src/rgw/rgw_pubsub.cc
index bf0e2d46b4c242d9f4b0ce0adda1ac5c1f237bd5..b9aa54bacd8c1f88cdfa60719f4b23824eed1860 100644 (file)
--- a/src/rgw/rgw_pubsub.cc
+++ b/src/rgw/rgw_pubsub.cc
@@ -338,7 +338,7 @@ void encode_json(const char *name, const rgw::notify::EventTypeList& l, Formatte
 {
   f->open_array_section(name);
   for (auto iter = l.cbegin(); iter != l.cend(); ++iter) {
-    f->dump_string("obj", rgw::notify::to_ceph_string(*iter));
+    f->dump_string("obj", rgw::notify::to_string(*iter));
   }
   f->close_section();
 }

diff --git a/src/rgw/rgw_pubsub.h b/src/rgw/rgw_pubsub.h
index c3b0b4d07750d5c4c3a7231c8bf35a7e99f12bec..c0e9e144bb2f01278279f704aebd998f4d8104bd 100644 (file)
--- a/src/rgw/rgw_pubsub.h
+++ b/src/rgw/rgw_pubsub.h
@@ -493,8 +493,7 @@ struct rgw_pubsub_topic_filter {
     encode(topic, bl);
     // events are stored as a vector of std::strings
     std::vector<std::string> tmp_events;
-    const auto converter = s3_id.empty() ? rgw::notify::to_ceph_string : rgw::notify::to_string;
-    std::transform(events.begin(), events.end(), std::back_inserter(tmp_events), converter);
+    std::transform(events.begin(), events.end(), std::back_inserter(tmp_events), rgw::notify::to_string);
     encode(tmp_events, bl);
     encode(s3_id, bl);
     encode(s3_filter, bl);