From 1c7ee33c710146d54ee244f632f22f1a1a7599d2 Mon Sep 17 00:00:00 2001
From: Kalpesh Pandya <kapandya@redhat.com>
Date: Tue, 9 Apr 2024 23:54:32 +0530
Subject: [PATCH] src/rgw: Fixing event name

Received as "Noncurrent" instead of "NonCurrent"
This PR fixes the issue: https://tracker.ceph.com/issues/59488

Signed-off-by: Kalpesh Pandya <kapandya@redhat.com>
(cherry picked from commit f5a36f203f6871448753f3d9c3fe4e44927a0fdb)
---
 src/rgw/rgw_lc.cc                |  6 +++---
 src/rgw/rgw_notify_event_type.cc | 12 ++++++++----
 src/rgw/rgw_notify_event_type.h  |  2 ++
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/rgw/rgw_lc.cc b/src/rgw/rgw_lc.cc
index 747c75d6862..cfc9ce63548 100644
--- a/src/rgw/rgw_lc.cc
+++ b/src/rgw/rgw_lc.cc
@@ -1255,7 +1255,7 @@ public:
   int process(lc_op_ctx& oc) override {
     auto& o = oc.o;
     int r = remove_expired_obj(oc.dpp, oc, true,
-                               {rgw::notify::ObjectExpirationNoncurrent});
+                               {rgw::notify::ObjectExpirationNonCurrent});
     if (r < 0) {
       ldpp_dout(oc.dpp, 0) << "ERROR: remove_expired_obj (non-current expiration) " 
 			   << oc.bucket << ":" << o.key
@@ -1398,7 +1398,7 @@ public:
                               << "flags: " << oc.o.flags << dendl;
       } else {
         ret = remove_expired_obj(oc.dpp, oc, true,
-                                 {rgw::notify::ObjectTransitionNoncurrent});
+                                 {rgw::notify::ObjectTransitionNonCurrent});
         ldpp_dout(oc.dpp, 20)
             << "delete_tier_obj Object(key:" << oc.o.key << ") not current "
             << "versioned_epoch:  " << oc.o.versioned_epoch
@@ -1436,7 +1436,7 @@ public:
                          {rgw::notify::ObjectTransitionCurrent,
                           rgw::notify::LifecycleTransition});
     } else {
-      event_types.push_back(rgw::notify::ObjectTransitionNoncurrent);
+      event_types.push_back(rgw::notify::ObjectTransitionNonCurrent);
     }
 
     std::unique_ptr<rgw::sal::Notification> notify =
diff --git a/src/rgw/rgw_notify_event_type.cc b/src/rgw/rgw_notify_event_type.cc
index 9baa5df798b..577b368d65f 100644
--- a/src/rgw/rgw_notify_event_type.cc
+++ b/src/rgw/rgw_notify_event_type.cc
@@ -31,7 +31,7 @@ namespace rgw::notify {
     case ObjectExpirationCurrent:
       return "s3:ObjectLifecycle:Expiration:Current";
     case ObjectExpirationNoncurrent:
-      return "s3:ObjectLifecycle:Expiration:Noncurrent";
+      return "s3:ObjectLifecycle:Expiration:NonCurrent";
     case ObjectExpirationDeleteMarker:
       return "s3:ObjectLifecycle:Expiration:DeleteMarker";
     case ObjectExpirationAbortMPU:
@@ -41,7 +41,7 @@ namespace rgw::notify {
     case ObjectTransitionCurrent:
       return "s3:ObjectLifecycle:Transition:Current";
     case ObjectTransitionNoncurrent:
-      return "s3:ObjectLifecycle:Transition:Noncurrent";
+      return "s3:ObjectLifecycle:Transition:NonCurrent";
     case ObjectSynced:
       return "s3:ObjectSynced:*";
     case ObjectSyncedCreate:
@@ -99,8 +99,10 @@ namespace rgw::notify {
         return ObjectExpiration;
     if (s == "s3:ObjectLifecycle:Expiration:Current")
         return ObjectExpirationCurrent;
+    if (s == "s3:ObjectLifecycle:Expiration:NonCurrent")
+        return ObjectExpirationNonCurrent;
     if (s == "s3:ObjectLifecycle:Expiration:Noncurrent")
-        return ObjectExpirationNoncurrent;
+        return ObjectExpirationNonCurrent;
     if (s == "s3:ObjectLifecycle:Expiration:DeleteMarker")
         return ObjectExpirationDeleteMarker;
     if (s == "s3:ObjectLifecycle:Expiration:AbortMultipartUpload")
@@ -109,8 +111,10 @@ namespace rgw::notify {
         return ObjectTransition;
     if (s == "s3:ObjectLifecycle:Transition:Current")
         return ObjectTransitionCurrent;
+    if (s == "s3:ObjectLifecycle:Transition:NonCurrent")
+        return ObjectTransitionNonCurrent;
     if (s == "s3:ObjectLifecycle:Transition:Noncurrent")
-        return ObjectTransitionNoncurrent;
+        return ObjectTransitionNonCurrent;
     if (s == "s3:ObjectSynced:*")
         return ObjectSynced;
     if (s == "s3:ObjectSynced:Create")
diff --git a/src/rgw/rgw_notify_event_type.h b/src/rgw/rgw_notify_event_type.h
index 34a73d22997..4850572a937 100644
--- a/src/rgw/rgw_notify_event_type.h
+++ b/src/rgw/rgw_notify_event_type.h
@@ -20,11 +20,13 @@ namespace rgw::notify {
     ObjectExpiration                     = 0xF00,
     ObjectExpirationCurrent              = 0x100,
     ObjectExpirationNoncurrent           = 0x200,
+    ObjectExpirationNonCurrent           = 0x200,
     ObjectExpirationDeleteMarker         = 0x400,
     ObjectExpirationAbortMPU             = 0x800,
     ObjectTransition                     = 0xF000,
     ObjectTransitionCurrent              = 0x1000,
     ObjectTransitionNoncurrent           = 0x2000,
+    ObjectTransitionNonCurrent           = 0x2000,
     ObjectSynced                         = 0xF0000,
     ObjectSyncedCreate                   = 0x10000,
     ObjectSyncedDelete                   = 0x20000,
-- 
2.39.5