Merge pull request ceph#62415 from rhcs-dashboard/tenanted-bucket-lifecycle-fix

mgr/dashboard: tenanted bucket lifecycle management fix

Author: nizamial09

src/pybind/mgr/dashboard/controllers/rgw.py

@@ -726,13 +726,18 @@ def get_encryption_config(self, daemon_name=None, owner=None):
     @RESTController.Collection(method='PUT', path='/lifecycle')
     @allow_empty_body
     def set_lifecycle_policy(self, bucket_name: str = '', lifecycle: str = '', daemon_name=None,
-                             owner=None):
+                             owner=None, tenant=None):
+        owner = self._get_owner(owner)
+        bucket_name = RgwBucket.get_s3_bucket_name(bucket_name, tenant)
         if lifecycle == '{}':
             return self._delete_lifecycle(bucket_name, daemon_name, owner)
         return self._set_lifecycle(bucket_name, lifecycle, daemon_name, owner)
 
     @RESTController.Collection(method='GET', path='/lifecycle')
-    def get_lifecycle_policy(self, bucket_name: str = '', daemon_name=None, owner=None):
+    def get_lifecycle_policy(self, bucket_name: str = '', daemon_name=None, owner=None,
+                             tenant=None):
+        owner = self._get_owner(owner)
+        bucket_name = RgwBucket.get_s3_bucket_name(bucket_name, tenant)
         return self._get_lifecycle(bucket_name, daemon_name, owner)
 
     @Endpoint(method='GET', path='/ratelimit')

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-lifecycle-list/rgw-bucket-lifecycle-list.component.ts

@@ -95,7 +95,7 @@ export class RgwBucketLifecycleListComponent implements OnInit {
 
   loadLifecyclePolicies(context: CdTableFetchDataContext) {
     const allLifecycleRules$ = this.rgwBucketService
-      .getLifecycle(this.bucket.bucket, this.bucket.owner)
+      .getLifecycle(this.bucket.bucket, this.bucket.owner, this.bucket.tenant)
       .pipe(
         tap((lifecycle: Lifecycle) => {
           this.lifecycleRuleList = lifecycle;
@@ -145,7 +145,12 @@ export class RgwBucketLifecycleListComponent implements OnInit {
 
   submitLifecycleConfig(rules: any) {
     this.rgwBucketService
-      .setLifecycle(this.bucket.bucket, JSON.stringify(rules), this.bucket.owner)
+      .setLifecycle(
+        this.bucket.bucket,
+        JSON.stringify(rules),
+        this.bucket.owner,
+        this.bucket.tenant
+      )
       .subscribe({
         next: () => {
           this.notificationService.show(

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-tiering-form/rgw-bucket-tiering-form.component.spec.ts

@@ -62,6 +62,7 @@ describe('RgwBucketTieringFormComponent', () => {
 
   it('should call setLifecyclePolicy function', () => {
     component.ngOnInit();
+    component.bucket.tenant = '';
     component.tieringForm.setValue({
       name: 'test',
       storageClass: 'CLOUD',
@@ -80,7 +81,8 @@ describe('RgwBucketTieringFormComponent', () => {
     expect(setLifecycleSpy).toHaveBeenCalledWith(
       'bucket1',
       JSON.stringify(component.configuredLifecycle.LifecycleConfiguration),
-      'dashboard'
+      'dashboard',
+      component.bucket.tenant
     );
   });
 });

src/pybind/mgr/dashboard/frontend/src/app/ceph/rgw/rgw-bucket-tiering-form/rgw-bucket-tiering-form.component.ts

@@ -56,7 +56,7 @@ export class RgwBucketTieringFormComponent extends CdForm implements OnInit {
 
   ngOnInit() {
     this.rgwBucketService
-      .getLifecycle(this.bucket.bucket, this.bucket.owner)
+      .getLifecycle(this.bucket.bucket, this.bucket.owner, this.bucket.tenant)
       .subscribe((lifecycle: Lifecycle) => {
         if (lifecycle === null) {
           lifecycle = { LifecycleConfiguration: { Rule: [] } };
@@ -235,7 +235,8 @@ export class RgwBucketTieringFormComponent extends CdForm implements OnInit {
         .setLifecycle(
           this.bucket.bucket,
           JSON.stringify(this.configuredLifecycle.LifecycleConfiguration),
-          this.bucket.owner
+          this.bucket.owner,
+          this.bucket.tenant
         )
         .subscribe({
           next: () => {
@@ -262,7 +263,8 @@ export class RgwBucketTieringFormComponent extends CdForm implements OnInit {
         .setLifecycle(
           this.bucket.bucket,
           JSON.stringify(this.configuredLifecycle.LifecycleConfiguration),
-          this.bucket.owner
+          this.bucket.owner,
+          this.bucket.tenant
         )
         .subscribe({
           next: () => {

src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts

@@ -250,22 +250,24 @@ export class RgwBucketService extends ApiClient {
     });
   }
 
-  setLifecycle(bucket_name: string, lifecycle: string, owner: string) {
+  setLifecycle(bucket_name: string, lifecycle: string, owner: string, tenant: string) {
     return this.rgwDaemonService.request((params: HttpParams) => {
       params = params.appendAll({
         bucket_name: bucket_name,
         lifecycle: lifecycle,
-        owner: owner
+        owner: owner,
+        tenant: tenant
       });
       return this.http.put(`${this.url}/lifecycle`, null, { params: params });
     });
   }
 
-  getLifecycle(bucket_name: string, owner: string) {
+  getLifecycle(bucket_name: string, owner: string, tenant: string) {
     return this.rgwDaemonService.request((params: HttpParams) => {
       params = params.appendAll({
         bucket_name: bucket_name,
-        owner: owner
+        owner: owner,
+        tenant: tenant
       });
       return this.http.get(`${this.url}/lifecycle`, { params: params });
     });

src/pybind/mgr/dashboard/openapi.yaml

@@ -11607,6 +11607,11 @@ paths:
         name: owner
         schema:
           type: string
+      - allowEmptyValue: true
+        in: query
+        name: tenant
+        schema:
+          type: string
       responses:
         '200':
           content:
@@ -11643,6 +11648,8 @@ paths:
                   type: string
                 owner:
                   type: string
+                tenant:
+                  type: string
               type: object
       responses:
         '200':