@@ -39,6 +39,8 @@ const { throw_cli_error, get_bucket_owner_account_by_name,
3939const manage_nsfs_validations = require ( '../manage_nsfs/manage_nsfs_validations' ) ;
4040const nc_mkm = require ( '../manage_nsfs/nc_master_key_manager' ) . get_instance ( ) ;
4141const notifications_util = require ( '../util/notifications_util' ) ;
42+ const BucketSpaceFS = require ( '../sdk/bucketspace_fs' ) ;
43+ const NoobaaEvent = require ( '../manage_nsfs/manage_nsfs_events_utils' ) . NoobaaEvent ;
4244
4345///////////////
4446//// GENERAL //
@@ -135,7 +137,6 @@ async function fetch_bucket_data(action, user_input) {
135137 force_md5_etag : user_input . force_md5_etag === undefined || user_input . force_md5_etag === '' ? user_input . force_md5_etag : get_boolean_or_string_value ( user_input . force_md5_etag ) ,
136138 notifications : user_input . notifications
137139 } ;
138-
139140 if ( user_input . bucket_policy !== undefined ) {
140141 if ( typeof user_input . bucket_policy === 'string' ) {
141142 // bucket_policy deletion specified with empty string ''
@@ -154,6 +155,27 @@ async function fetch_bucket_data(action, user_input) {
154155 data = await merge_new_and_existing_config_data ( data ) ;
155156 }
156157
158+ if ( ( action === ACTIONS . UPDATE && user_input . tag ) || ( action === ACTIONS . ADD ) ) {
159+ const tags = JSON . parse ( user_input . tag || '[]' ) ;
160+ data . tag = BucketSpaceFS . _merge_reserved_tags (
161+ data . tag || BucketSpaceFS . _default_bucket_tags ( ) ,
162+ tags ,
163+ action === ACTIONS . ADD ? true : await _is_bucket_empty ( data ) ,
164+ ) ;
165+ }
166+
167+ if ( ( action === ACTIONS . UPDATE && user_input . merge_tag ) || ( action === ACTIONS . ADD ) ) {
168+ const merge_tags = JSON . parse ( user_input . merge_tag || '[]' ) ;
169+ data . tag = _ . merge (
170+ data . tag ,
171+ BucketSpaceFS . _merge_reserved_tags (
172+ data . tag || BucketSpaceFS . _default_bucket_tags ( ) ,
173+ merge_tags ,
174+ action === ACTIONS . ADD ? true : await _is_bucket_empty ( data ) ,
175+ )
176+ ) ;
177+ }
178+
157179 //if we're updating the owner, needs to override owner in file with the owner from user input.
158180 //if we're adding a bucket, need to set its owner id field
159181 if ( ( action === ACTIONS . UPDATE && user_input . owner ) || ( action === ACTIONS . ADD ) ) {
@@ -200,7 +222,14 @@ async function add_bucket(data) {
200222 data . _id = mongo_utils . mongoObjectId ( ) ;
201223 const parsed_bucket_data = await config_fs . create_bucket_config_file ( data ) ;
202224 await set_bucker_owner ( parsed_bucket_data ) ;
203- return { code : ManageCLIResponse . BucketCreated , detail : parsed_bucket_data , event_arg : { bucket : data . name } } ;
225+
226+ const [ reserved_tag_event_args ] = BucketSpaceFS . _generate_reserved_tag_event_args ( { } , data . tag ) ;
227+
228+ return {
229+ code : ManageCLIResponse . BucketCreated ,
230+ detail : parsed_bucket_data ,
231+ event_arg : { ...( reserved_tag_event_args || { } ) , bucket : data . name , account : parsed_bucket_data . bucket_owner } ,
232+ } ;
204233}
205234
206235/**
@@ -256,25 +285,14 @@ async function update_bucket(data) {
256285 */
257286async function delete_bucket ( data , force ) {
258287 try {
259- const temp_dir_name = native_fs_utils . get_bucket_tmpdir_name ( data . _id ) ;
288+ const bucket_empty = await _is_bucket_empty ( data ) ;
289+ if ( ! bucket_empty && ! force ) {
290+ throw_cli_error ( ManageCLIError . BucketDeleteForbiddenHasObjects , data . name ) ;
291+ }
292+
260293 const bucket_temp_dir_path = native_fs_utils . get_bucket_tmpdir_full_path ( data . path , data . _id ) ;
261- // fs_contexts for bucket temp dir (storage path)
262294 const fs_context_fs_backend = native_fs_utils . get_process_fs_context ( data . fs_backend ) ;
263- let entries ;
264- try {
265- entries = await nb_native ( ) . fs . readdir ( fs_context_fs_backend , data . path ) ;
266- } catch ( err ) {
267- dbg . warn ( `delete_bucket: bucket name ${ data . name } +
268- `got an error on readdir with path: ${ data . path } , err ) ;
269- // if the bucket's path was deleted first (encounter ENOENT error) - continue deletion
270- if ( err . code !== 'ENOENT' ) throw err ;
271- }
272- if ( entries ) {
273- const object_entries = entries . filter ( element => ! element . name . endsWith ( temp_dir_name ) ) ;
274- if ( object_entries . length > 0 && ! force ) {
275- throw_cli_error ( ManageCLIError . BucketDeleteForbiddenHasObjects , data . name ) ;
276- }
277- }
295+
278296 await native_fs_utils . folder_delete ( bucket_temp_dir_path , fs_context_fs_backend , true ) ;
279297 await config_fs . delete_bucket_config_file ( data . name ) ;
280298 return { code : ManageCLIResponse . BucketDeleted , detail : { name : data . name } , event_arg : { bucket : data . name } } ;
@@ -340,6 +358,33 @@ async function list_bucket_config_files(wide, filters = {}) {
340358 return config_files_list ;
341359}
342360
361+ /**
362+ * _is_bucket_empty returns true if the given bucket is empty
363+ *
364+ * @param {* } data
365+ * @returns {Promise<boolean> }
366+ */
367+ async function _is_bucket_empty ( data ) {
368+ const temp_dir_name = native_fs_utils . get_bucket_tmpdir_name ( data . _id ) ;
369+ // fs_contexts for bucket temp dir (storage path)
370+ const fs_context_fs_backend = native_fs_utils . get_process_fs_context ( data . fs_backend ) ;
371+ let entries ;
372+ try {
373+ entries = await nb_native ( ) . fs . readdir ( fs_context_fs_backend , data . path ) ;
374+ } catch ( err ) {
375+ dbg . warn ( `_is_bucket_empty: bucket name ${ data . name } +
376+ `got an error on readdir with path: ${ data . path } , err ) ;
377+ // if the bucket's path was deleted first (encounter ENOENT error) - continue deletion
378+ if ( err . code !== 'ENOENT' ) throw err ;
379+ }
380+ if ( entries ) {
381+ const object_entries = entries . filter ( element => ! element . name . endsWith ( temp_dir_name ) ) ;
382+ return object_entries . length === 0 ;
383+ }
384+
385+ return true ;
386+ }
387+
343388/**
344389 * bucket_management does the following -
345390 * 1. fetches the bucket data if this is not a list operation
@@ -361,7 +406,24 @@ async function bucket_management(action, user_input) {
361406 } else if ( action === ACTIONS . STATUS ) {
362407 response = await get_bucket_status ( data ) ;
363408 } else if ( action === ACTIONS . UPDATE ) {
364- response = await update_bucket ( data ) ;
409+ const bucket_path = config_fs . get_bucket_path_by_name ( user_input . name ) ;
410+ const bucket_lock_file = `${ bucket_path } ;
411+ await native_fs_utils . lock_and_run ( config_fs . fs_context , bucket_lock_file , async ( ) => {
412+ const prev_bucket_info = await fetch_bucket_data ( action , _ . omit ( user_input , [ 'tag' , 'merge_tag' ] ) ) ;
413+ const bucket_info = await fetch_bucket_data ( action , user_input ) ;
414+
415+ const tagging_object = BucketSpaceFS . _objectify_tagging_arr ( prev_bucket_info . tag ) ;
416+ const [
417+ reserved_tag_event_args ,
418+ reserved_tag_modified ,
419+ ] = BucketSpaceFS . _generate_reserved_tag_event_args ( tagging_object , bucket_info . tag ) ;
420+
421+ response = await update_bucket ( bucket_info ) ;
422+ if ( reserved_tag_modified ) {
423+ new NoobaaEvent ( NoobaaEvent . BUCKET_RESERVED_TAG_MODIFIED )
424+ . create_event ( undefined , { ...reserved_tag_event_args , bucket_name : user_input . name } ) ;
425+ }
426+ } ) ;
365427 } else if ( action === ACTIONS . DELETE ) {
366428 const force = get_boolean_or_string_value ( user_input . force ) ;
367429 response = await delete_bucket ( data , force ) ;
0 commit comments