diff options
| author | Pritha Srivastava <prsrivas@redhat.com> | 2018-02-05 10:50:10 +0100 |
|---|---|---|
| committer | Pritha Srivastava <prsrivas@redhat.com> | 2018-02-05 10:50:10 +0100 |
| commit | d60766103d24c9c8a5ce7ad21064847f2f8ab215 (patch) | |
| tree | 4a41df8282a45ea37cc765493c5dba55b573d30b /src/rgw/rgw_common.cc | |
| parent | Merge pull request #20270 from ivancich/wip-fix-bad-dmclock-sim-change (diff) | |
| download | ceph-d60766103d24c9c8a5ce7ad21064847f2f8ab215.tar.xz ceph-d60766103d24c9c8a5ce7ad21064847f2f8ab215.zip | |
rgw: Reinstating error codes mapping for Roles.
Signed-off-by: Pritha Srivastava <prsrivas@redhat.com>
Diffstat (limited to 'src/rgw/rgw_common.cc')
| -rw-r--r-- | src/rgw/rgw_common.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/rgw/rgw_common.cc b/src/rgw/rgw_common.cc index f724e3f34db..955e9bac499 100644 --- a/src/rgw/rgw_common.cc +++ b/src/rgw/rgw_common.cc @@ -72,6 +72,7 @@ rgw_http_errors rgw_http_s3_errors({ { ERR_TOO_MANY_BUCKETS, {400, "TooManyBuckets" }}, { ERR_MALFORMED_XML, {400, "MalformedXML" }}, { ERR_AMZ_CONTENT_SHA256_MISMATCH, {400, "XAmzContentSHA256Mismatch" }}, + { ERR_MALFORMED_DOC, {400, "MalformedPolicyDocument"}}, { ERR_INVALID_TAG, {400, "InvalidTag"}}, { ERR_MALFORMED_ACL_ERROR, {400, "MalformedACLError" }}, { ERR_INVALID_ENCRYPTION_ALGORITHM, {400, "InvalidEncryptionAlgorithmError" }}, @@ -91,6 +92,7 @@ rgw_http_errors rgw_http_s3_errors({ { ERR_NO_SUCH_LC, {404, "NoSuchLifecycleConfiguration"}}, { ERR_NO_SUCH_BUCKET_POLICY, {404, "NoSuchBucketPolicy"}}, { ERR_NO_SUCH_USER, {404, "NoSuchUser"}}, + { ERR_NO_ROLE_FOUND, {404, "NoSuchEntity"}}, { ERR_NO_SUCH_SUBUSER, {404, "NoSuchSubUser"}}, { ERR_METHOD_NOT_ALLOWED, {405, "MethodNotAllowed" }}, { ETIMEDOUT, {408, "RequestTimeout" }}, @@ -99,6 +101,8 @@ rgw_http_errors rgw_http_s3_errors({ { ERR_EMAIL_EXIST, {409, "EmailExists" }}, { ERR_KEY_EXIST, {409, "KeyExists"}}, { ERR_TAG_CONFLICT, {409, "OperationAborted"}}, + { ERR_ROLE_EXISTS, {409, "EntityAlreadyExists"}}, + { ERR_DELETE_CONFLICT, {409, "DeleteConflict"}}, { ERR_INVALID_SECRET_KEY, {400, "InvalidSecretKey"}}, { ERR_INVALID_KEY_TYPE, {400, "InvalidKeyType"}}, { ERR_INVALID_CAP, {400, "InvalidCapability"}}, |