Merge pull request #21379 from pritha-srivastava/wip-rgw-user-policy

rgw: User Policy

diff --cc src/rgw/CMakeLists.txt
Simple merge

diff --cc src/rgw/rgw_common.cc
index 3cbcf411addec1b47c0f559211a3bc542967a7cc,2e17cac7bc0038d0e5705913d918a68c04f5f62d..963539403eb1b8cf4908339c40ed4328c222a47d
--- 1/src/rgw/rgw_common.cc
--- 2/src/rgw/rgw_common.cc
+++ b/src/rgw/rgw_common.cc
@@@ -95,8 -94,8 +95,9 @@@ rgw_http_errors rgw_http_s3_errors(
      { ERR_NO_SUCH_BUCKET_POLICY, {404, "NoSuchBucketPolicy"}},
      { ERR_NO_SUCH_USER, {404, "NoSuchUser"}},
      { ERR_NO_ROLE_FOUND, {404, "NoSuchEntity"}},
 +    { ERR_NO_CORS_FOUND, {404, "NoSuchCORSConfiguration"}},
      { ERR_NO_SUCH_SUBUSER, {404, "NoSuchSubUser"}},
+     { ERR_NO_SUCH_ENTITY, {404, "NoSuchEntity"}},
      { ERR_METHOD_NOT_ALLOWED, {405, "MethodNotAllowed" }},
      { ETIMEDOUT, {408, "RequestTimeout" }},
      { EEXIST, {409, "BucketAlreadyExists" }},

diff --cc src/rgw/rgw_common.h
index 7eee25636c47874f6d4c4334f0ccae39c3be8bdd,82fd597409d5cef8b146caee0cc2349a9d810e26..ab0b61db7989f9f46c18486cd6dea9e1e8e1d633
--- 1/src/rgw/rgw_common.h
--- 2/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@@ -217,11 -217,9 +217,11 @@@ using ceph::crypto::MD5
  #define ERR_MALFORMED_ACL_ERROR  2212
  #define ERR_ZONEGROUP_DEFAULT_PLACEMENT_MISCONFIGURATION 2213
  #define ERR_INVALID_ENCRYPTION_ALGORITHM                 2214
 +#define ERR_INVALID_CORS_RULES_ERROR                     2215
 +#define ERR_NO_CORS_FOUND        2216
  
  #define ERR_BUSY_RESHARDING      2300
- 
+ #define ERR_NO_SUCH_ENTITY       2301
  #ifndef UINT32_MAX
  #define UINT32_MAX (0xffffffffu)
  #endif

diff --cc src/rgw/rgw_op.cc
Simple merge

diff --cc src/rgw/rgw_rest_s3.cc
Simple merge

diff --cc src/test/rgw/test_rgw_iam_policy.cc
Simple merge