From: Preben Uhrskov Berg <poulpreben@users.noreply.github.com>
Date: Mon, 25 Oct 2021 20:18:03 +0000 (+0200)
Subject: rgw: Dump Object Lock Retain Date as ISO 8601
X-Git-Tag: v15.2.17~115^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=175707cd84549f201fa62a3eab44fcd7494f2551;p=ceph.git

rgw: Dump Object Lock Retain Date as ISO 8601

This matches the S3 API format, which uses 8601 for the
object lock retain until date.

Backport of: https://tracker.ceph.com/issues/51327
Fixes: https://tracker.ceph.com/issues/51774

Signed-off-by: Preben Berg <pb@cloudio.dk>
---

diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
index 52071cf09a5..cb026714de3 100644
--- a/src/rgw/rgw_rest_s3.cc
+++ b/src/rgw/rgw_rest_s3.cc
@@ -386,7 +386,8 @@ int RGWGetObj_ObjStore_S3::send_response_data(bufferlist& bl, off_t bl_ofs,
         try {
           decode(retention, iter->second);
           dump_header(s, "x-amz-object-lock-mode", retention.get_mode());
-          dump_time_header(s, "x-amz-object-lock-retain-until-date", retention.get_retain_until_date());
+          string date = ceph::to_iso_8601(retention.get_retain_until_date());
+          dump_header(s, "x-amz-object-lock-retain-until-date", date.c_str());
         } catch (buffer::error& err) {
           ldpp_dout(this, 0) << "ERROR: failed to decode RGWObjectRetention" << dendl;
         }