From e23ab127c07c0914bbe4f794a28aabf3fee4664f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Wed, 27 Oct 2021 15:29:52 +0200
Subject: [PATCH] rgw/admin: promote add/remove caps to stable
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Promoting the API.AddUserCap and API.RemoveUserCap calls to stable so
they can be release in 0.13.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 docs/api-status.json | 25 ++++++++++---------------
 docs/api-status.md   |  4 ----
 rgw/admin/caps.go    |  5 -----
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/docs/api-status.json b/docs/api-status.json
index cef44e1..a5baa7b 100644
--- a/docs/api-status.json
+++ b/docs/api-status.json
@@ -1646,20 +1646,7 @@
     ]
   },
   "rgw/admin": {
-    "preview_api": [
-      {
-        "name": "API.AddUserCap",
-        "comment": "AddUserCap adds the capabilities for a user.\nOn Success, it returns the updated list of UserCaps for the user.\nPREVIEW\n",
-        "added_in_version": "v0.12.0",
-        "expected_stable_version": "v0.13.0"
-      },
-      {
-        "name": "API.RemoveUserCap",
-        "comment": "RemoveUserCap removes the capabilities from a user.\nOn Success, it returns the updated list of UserCaps for the user.\nPREVIEW\n",
-        "added_in_version": "v0.12.0",
-        "expected_stable_version": "v0.13.0"
-      }
-    ],
+    "preview_api": [],
     "stable_api": [
       {
         "name": "API.ListBuckets",
@@ -1727,7 +1714,15 @@
       {
         "name": "API.ModifyUser",
         "comment": "ModifyUser - http://docs.ceph.com/docs/latest/radosgw/adminops/#modify-user\n"
+      },
+      {
+        "name": "API.AddUserCap",
+        "comment": "AddUserCap adds the capabilities for a user.\nOn Success, it returns the updated list of UserCaps for the user.\n"
+      },
+      {
+        "name": "API.RemoveUserCap",
+        "comment": "RemoveUserCap removes the capabilities from a user.\nOn Success, it returns the updated list of UserCaps for the user.\n"
       }
     ]
   }
-}
\ No newline at end of file
+}
diff --git a/docs/api-status.md b/docs/api-status.md
index 53c586c..d203044 100644
--- a/docs/api-status.md
+++ b/docs/api-status.md
@@ -38,8 +38,4 @@ TaskAdmin.Cancel | v0.12.0 | v0.13.0 |
 
 ### Preview APIs
 
-Name | Added in Version | Expected Stable Version | 
----- | ---------------- | ----------------------- | 
-API.AddUserCap | v0.12.0 | v0.13.0 | 
-API.RemoveUserCap | v0.12.0 | v0.13.0 | 
 
diff --git a/rgw/admin/caps.go b/rgw/admin/caps.go
index 5149712..847ebb4 100644
--- a/rgw/admin/caps.go
+++ b/rgw/admin/caps.go
@@ -1,6 +1,3 @@
-//go:build ceph_preview
-// +build ceph_preview
-
 package admin
 
 import (
@@ -11,7 +8,6 @@ import (
 )
 
 // AddUserCap adds the capabilities for a user.
-//  PREVIEW
 //
 // On Success, it returns the updated list of UserCaps for the user.
 func (api *API) AddUserCap(ctx context.Context, uid, userCap string) ([]UserCapSpec, error) {
@@ -38,7 +34,6 @@ func (api *API) AddUserCap(ctx context.Context, uid, userCap string) ([]UserCapS
 }
 
 // RemoveUserCap removes the capabilities from a user.
-//  PREVIEW
 //
 // On Success, it returns the updated list of UserCaps for the user.
 func (api *API) RemoveUserCap(ctx context.Context, uid, userCap string) ([]UserCapSpec, error) {