CR fixes

Signed-off-by: Romy <[email protected]>

Author: romayalon

src/cmd/manage_nsfs.js

@@ -96,6 +96,7 @@ async function fetch_bucket_data(action, user_input) {
         // added undefined values to keep the order the properties when printing the data object
         _id: undefined,
         name: user_input.name === undefined ? undefined : String(user_input.name),
+        owner_account: undefined,
         tag: undefined, // if we would add the option to tag a bucket using CLI, this should be changed
         versioning: action === ACTIONS.ADD ? 'DISABLED' : undefined,
         creation_date: action === ACTIONS.ADD ? new Date().toISOString() : undefined,

src/manage_nsfs/manage_nsfs_cli_utils.js

@@ -37,7 +37,7 @@ function write_stdout_response(response_code, detail, event_arg) {
  * get_bucket_owner_account will return the account of the bucket_owner
  * otherwise it would throw an error
  * @param {import('../sdk/config_fs').ConfigFS} config_fs
- * @param {string} bucket_owner
+ * @param {string} [bucket_owner]
  * @param {string} [owner_account_id]
  */
 async function get_bucket_owner_account(config_fs, bucket_owner, owner_account_id) {

src/sdk/bucketspace_fs.js

@@ -15,9 +15,8 @@ const util = require('util');
 const bucket_policy_utils = require('../endpoint/s3/s3_bucket_policy_utils');
 const nsfs_schema_utils = require('../manage_nsfs/nsfs_schema_utils');
 const nc_mkm = require('../manage_nsfs/nc_master_key_manager').get_instance();
-const { ConfigFS, JSON_SUFFIX } = require('./config_fs');
+const { ConfigFS, JSON_SUFFIX, CONFIG_TYPES } = require('./config_fs');
 const mongo_utils = require('../util/mongo_utils');
-const { TYPES } = require('../manage_nsfs/manage_nsfs_constants');
 
 const KeysSemaphore = require('../util/keys_semaphore');
 const { get_umasked_mode, validate_bucket_creation, get_bucket_tmpdir_full_path, folder_delete,
@@ -125,7 +124,7 @@ class BucketSpaceFS extends BucketSpaceSimpleFS {
             // Backward compatibility will take longer without bucket owner name
             const account_config = await this.config_fs.get_identity_by_id(
                 bucket.owner_account,
-                TYPES.ACCOUNT,
+                CONFIG_TYPES.ACCOUNT,
                 { silent_if_missing: true }
             );
 

src/test/unit_tests/jest_tests/test_config_fs.test.js

@@ -21,7 +21,7 @@ describe('adjust_bucket_with_schema_updates', () => {
         expect(bucket).toBeUndefined();
     });
 
-    it('should return bucket without deprecated properties (system_owner)', () => {
+    it('should return bucket without deprecated properties', () => {
         const bucket = {name: 'bucket1', system_owner: 'account1-system-owner', bucket_owner: 'account1-bucket_owner'};
         config_fs.adjust_bucket_with_schema_updates(bucket);
         expect(bucket).toBeDefined();

src/test/unit_tests/test_bucketspace.js

@@ -373,8 +373,8 @@ mocha.describe('bucket operations - namespace_fs', function() {
         const s3_bucket = bucket_name + '-s3';
         const res = await s3_correct_uid_default_nsr.getBucketAcl({ Bucket: s3_bucket });
         const bucket_info = await rpc_client.bucket.read_bucket({ name: s3_bucket });
-        assert.equal(res.Owner.ID, bucket_info.owner_account.id);
         assert.equal(res.Owner.DisplayName, bucket_info.owner_account.email);
+        assert.equal(res.Owner.ID, bucket_info.owner_account.id);
     });
     mocha.it('create s3 bucket with correct distinguished name', async function() {
         const account_s3_correct_dn = await rpc_client.account.create_account({