From: Marcel Lauhoff <marcel.lauhoff@clyso.com>
Date: Fri, 8 Aug 2025 09:48:14 +0000 (+0200)
Subject: rgw: Replace deprecated Barbican payload endpoint with alternative
X-Git-Tag: v21.0.0~50^2~89^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e60d0317af80910d8639bcbf6fdee1dd47f6ef08;p=ceph.git

rgw: Replace deprecated Barbican payload endpoint with alternative

`GET /v1/secrets/{uuid}` with Header `Accept:
application/octet-stream` has been deprecated in favor of `GET
/v1/secrets/{uuid}/payload` in OpenStack Barbican.

The old API is still functional, but generates a warning level log
message on Barbican for every access.

Deprecation commit from 2015:
https://github.com/openstack/barbican/commit/b4b64be6f259acf4d8677eadbc35d37fab3a6df0

Signed-off-by: Marcel Lauhoff <marcel.lauhoff@clyso.com>
On-behalf-of: SAP marcel.lauhoff@sap.com
---

diff --git a/src/rgw/rgw_kms.cc b/src/rgw/rgw_kms.cc
index d9b7e8848a26..2fea8802b9e7 100644
--- a/src/rgw/rgw_kms.cc
+++ b/src/rgw/rgw_kms.cc
@@ -929,6 +929,7 @@ static int request_key_from_barbican(const DoutPrefixProvider *dpp,
   }
   concat_url(secret_url, "/v1/secrets/");
   concat_url(secret_url, std::string(key_id));
+  concat_url(secret_url, "/payload");
 
   bufferlist secret_bl;
   RGWHTTPTransceiver secret_req(cct, "GET", secret_url, &secret_bl);