Merge pull request ceph#61384 from sj14/sj/delete-policy-204

ivancich · web-flow · commit 2d416465c24a · 2025-01-17T09:31:31.000-05:00
rgw: S3 Delete Bucket Policy should return 204 on success

Reviewed-by: Casey Bodley &lt;cbodley@redhat.com&gt;
diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
@@ -8582,6 +8582,10 @@ void RGWGetBucketPolicy::execute(optional_yield y)
 
 void RGWDeleteBucketPolicy::send_response()
 {
+  if (!op_ret) {
+    /* A successful Delete Bucket Policy should return a 204 on success */
+    op_ret = STATUS_NO_CONTENT;
+  }
   if (op_ret) {
     set_req_state_err(s, op_ret);
   }
@@ -9257,4 +9261,3 @@ void rgw_slo_entry::decode_json(JSONObj *obj)
   JSONDecoder::decode_json("etag", etag, obj);
   JSONDecoder::decode_json("size_bytes", size_bytes, obj);
 };
-

Original file line number	Diff line number	Diff line change
`@@ -8582,6 +8582,10 @@ void RGWGetBucketPolicy::execute(optional_yield y)`
`8582`	`8582`
`8583`	`8583`	`void RGWDeleteBucketPolicy::send_response()`
`8584`	`8584`	`{`
	`8585`	`+ if (!op_ret) {`
	`8586`	`+ /* A successful Delete Bucket Policy should return a 204 on success */`
	`8587`	`+ op_ret = STATUS_NO_CONTENT;`
	`8588`	`+ }`
`8585`	`8589`	`if (op_ret) {`
`8586`	`8590`	`set_req_state_err(s, op_ret);`
`8587`	`8591`	`}`
`@@ -9257,4 +9261,3 @@ void rgw_slo_entry::decode_json(JSONObj *obj)`
`9257`	`9261`	`JSONDecoder::decode_json("etag", etag, obj);`
`9258`	`9262`	`JSONDecoder::decode_json("size_bytes", size_bytes, obj);`
`9259`	`9263`	`};`
`9260`		`-`