Skip to content

Commit

Permalink
Merge pull request #36264 from theanalyst/rgw/bucket-not-impl
Browse files Browse the repository at this point in the history
rgw: s3: mark bucket encryption as not implemented

Reviewed-by: Yuval Lifshitz <ylifshit@redhat.com>
Reviewed-by: Casey Bodley <cbodley@redhat.com>
  • Loading branch information
ivancich committed Aug 10, 2020
2 parents 143df93 + cf4cf2c commit c85e49e
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/rgw/rgw_rest_s3.cc
Expand Up @@ -4380,6 +4380,9 @@ RGWOp *RGWHandler_REST_Bucket_S3::get_obj_op(bool get_data) const

RGWOp *RGWHandler_REST_Bucket_S3::op_get()
{
if (s->info.args.sub_resource_exists("encryption"))
return nullptr;

if (s->info.args.sub_resource_exists("logging"))
return new RGWGetBucketLogging_ObjStore_S3;

Expand Down Expand Up @@ -4440,8 +4443,9 @@ RGWOp *RGWHandler_REST_Bucket_S3::op_head()

RGWOp *RGWHandler_REST_Bucket_S3::op_put()
{
if (s->info.args.sub_resource_exists("logging"))
return NULL;
if (s->info.args.sub_resource_exists("logging") ||
s->info.args.sub_resource_exists("encryption"))
return nullptr;
if (s->info.args.sub_resource_exists("versioning"))
return new RGWSetBucketVersioning_ObjStore_S3;
if (s->info.args.sub_resource_exists("website")) {
Expand Down Expand Up @@ -4482,6 +4486,10 @@ RGWOp *RGWHandler_REST_Bucket_S3::op_put()

RGWOp *RGWHandler_REST_Bucket_S3::op_delete()
{
if (s->info.args.sub_resource_exists("logging") ||
s->info.args.sub_resource_exists("encryption"))
return nullptr;

if (is_tagging_op()) {
return new RGWDeleteBucketTags_ObjStore_S3;
} else if (is_cors_op()) {
Expand Down

0 comments on commit c85e49e

Please sign in to comment.