diff options
Diffstat (limited to 'src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts')
-rw-r--r-- | src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts | 51 |
1 files changed, 33 insertions, 18 deletions
diff --git a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts index 7207d0b5c..ddeeadf5e 100644 --- a/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts +++ b/src/pybind/mgr/dashboard/frontend/src/app/shared/api/rgw-bucket.service.ts @@ -59,25 +59,34 @@ export class RgwBucketService extends ApiClient { lock_retention_period_days: string, encryption_state: boolean, encryption_type: string, - key_id: string + key_id: string, + tags: string, + bucketPolicy: string, + cannedAcl: string ) { return this.rgwDaemonService.request((params: HttpParams) => { + const paramsObject = { + bucket, + uid, + zonegroup, + lock_enabled: String(lockEnabled), + lock_mode, + lock_retention_period_days, + encryption_state: String(encryption_state), + encryption_type, + key_id, + tags: tags, + bucket_policy: bucketPolicy, + canned_acl: cannedAcl, + daemon_name: params.get('daemon_name') + }; + + if (placementTarget) { + paramsObject['placement_target'] = placementTarget; + } + return this.http.post(this.url, null, { - params: new HttpParams({ - fromObject: { - bucket, - uid, - zonegroup, - placement_target: placementTarget, - lock_enabled: String(lockEnabled), - lock_mode, - lock_retention_period_days, - encryption_state: String(encryption_state), - encryption_type, - key_id, - daemon_name: params.get('daemon_name') - } - }) + params: new HttpParams({ fromObject: paramsObject }) }); }); } @@ -94,7 +103,10 @@ export class RgwBucketService extends ApiClient { mfaTokenSerial: string, mfaTokenPin: string, lockMode: 'GOVERNANCE' | 'COMPLIANCE', - lockRetentionPeriodDays: string + lockRetentionPeriodDays: string, + tags: string, + bucketPolicy: string, + cannedAcl: string ) { return this.rgwDaemonService.request((params: HttpParams) => { params = params.appendAll({ @@ -108,7 +120,10 @@ export class RgwBucketService extends ApiClient { mfa_token_serial: mfaTokenSerial, mfa_token_pin: mfaTokenPin, lock_mode: lockMode, - lock_retention_period_days: lockRetentionPeriodDays + lock_retention_period_days: lockRetentionPeriodDays, + tags: tags, + bucket_policy: bucketPolicy, + canned_acl: cannedAcl }); return this.http.put(`${this.url}/${bucket}`, null, { params: params }); }); |