rgw: RGWRestConn allow keys to be initialized

This allows for other s3 clients to be created, we previously only set
the value of S3 system key from rados.

Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>

diff --git a/src/rgw/rgw_rest_conn.cc b/src/rgw/rgw_rest_conn.cc
index d087c5a323003b4bb6f1fa8182bea3a7b36cb4a7..a8871efdd47efebe1e381e603035d9a4d57fb9dc 100644 (file)
--- a/src/rgw/rgw_rest_conn.cc
+++ b/src/rgw/rgw_rest_conn.cc
@@ -8,9 +8,11 @@
 
 RGWRESTConn::RGWRESTConn(CephContext *_cct, RGWRados *store,
                          const string& _remote_id,
-                         const list<string>& remote_endpoints)
+                         const list<string>& remote_endpoints,
+                         RGWAccessKey _cred)
   : cct(_cct),
     endpoints(remote_endpoints.begin(), remote_endpoints.end()),
+    key(std::move(_cred)),
     remote_id(_remote_id)
 {
   if (store) {

diff --git a/src/rgw/rgw_rest_conn.h b/src/rgw/rgw_rest_conn.h
index e9941856f577132603a3fa08009fbec6ac31d505..32c7e673e86ce3f29fe0d0776f1b704348547f34 100644 (file)
--- a/src/rgw/rgw_rest_conn.h
+++ b/src/rgw/rgw_rest_conn.h
@@ -60,7 +60,8 @@ class RGWRESTConn
 
 public:
 
-  RGWRESTConn(CephContext *_cct, RGWRados *store, const string& _remote_id, const list<string>& endpoints);
+  RGWRESTConn(CephContext *_cct, const string& _remote_id, const list<string>& endpoints, RGWAccessKey _cred);
+
   // custom move needed for atomic
   RGWRESTConn(RGWRESTConn&& other);
   RGWRESTConn& operator=(RGWRESTConn&& other);