change functions order

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

Author: romayalon

src/sdk/config_fs.js

@@ -106,6 +106,40 @@ class ConfigFS {
         await native_fs_utils.update_config_file(this.root_fs_context, this.config_root, this.config_json_path, data);
     }
 
+    /**
+     * get_config_data reads a config file and returns its content 
+     * while omitting secrets if show_secrets flag was not provided
+     * and decrypts the account's secret_key if decrypt_secret_key is true
+     * @param {string} config_file_path
+     * @param {boolean} [show_secrets]
+     * @param {boolean} [decrypt_secret_key]
+     */
+    async get_config_data(config_file_path, show_secrets = false, decrypt_secret_key = false) {
+        const { data } = await nb_native().fs.readFile(this.root_fs_context, config_file_path);
+        const config_data = _.omit(JSON.parse(data.toString()), show_secrets ? [] : ['access_keys']);
+        if (decrypt_secret_key) config_data.access_keys = await nc_mkm.decrypt_access_keys(config_data);
+        return config_data;
+    }
+
+    /**
+     * get_config_data_if_exists will read a config file and return its content 
+     * while omitting secrets if show_secrets flag was not provided
+     * and decrypts the account's secret_key if decrypt_secret_key is true
+     * if the config file was deleted (encounter ENOENT error) - continue (returns undefined)
+     * @param {string} config_file_path
+     * @param {boolean} [show_secrets]
+     * @param {boolean} [decrypt_secret_key]
+     */
+    async get_config_data_if_exists(config_file_path, show_secrets = false, decrypt_secret_key = false) {
+        try {
+            const config_data = await this.get_config_data(config_file_path, show_secrets, decrypt_secret_key);
+            return config_data;
+        } catch (err) {
+            dbg.warn('get_config_data_if_exists: with config_file_path', config_file_path, 'got an error', err);
+            if (err.code !== 'ENOENT') throw err;
+        }
+    }
+
     ///////////////////////////////////////
     ////// ACCOUNT CONFIG DIR FUNCS  //////
     ///////////////////////////////////////
@@ -133,64 +167,25 @@ class ConfigFS {
         return path.join(this.accounts_dir_path, this.json(account_name));
     }
 
-
-    /**
-     * read_root_accounts returns the root accounts array exists under the config dir
-     * @returns {Promise<Dirent[]>} 
-     */
-    async read_root_accounts() {
-        return nb_native().fs.readdir(this.root_fs_context, this.accounts_dir_path);
-    }
-
     /**
      * get_iam_account_path_by_name returns the full account path by name
      * @param {string} account_name
      * @returns {string} 
-     */
+    */
     get_iam_account_path_by_name(account_name, owner_root_account_name) {
-        // TODO -  change to this.symlink(account_name) on identities/ PR;
-        // update IAM user location identities/root_id_number/iam_account_name.symlink
-        return path.join(this.accounts_dir_path, this.json(account_name));
+       // TODO -  change to this.symlink(account_name) on identities/ PR;
+       // update IAM user location identities/root_id_number/iam_account_name.symlink
+       return path.join(this.accounts_dir_path, this.json(account_name));
     }
 
     /**
      * get_account_relative_path_by_name returns the full account path by name
      * @param {string} account_name
      * @returns {string} 
-     */
+    */
     get_account_relative_path_by_name(account_name) {
-        // TODO -  change to this.symlink(account_name) on identities/ PR;
-        return path.join('../', CONFIG_SUBDIRS.ACCOUNTS, this.json(account_name));
-    }
-
-    /**
-     * is_account_exists returns true if account config path exists in config dir
-     * it can be determined by any account identifier - name, access_key and in the future id
-     * @param {{ name?: string, access_key?: string }} identifier_object
-     * @returns {Promise<boolean>} 
-     */
-    async is_account_exists(identifier_object) {
-        let path_to_check;
-        let use_lstat = false;
-        if (identifier_object.name) {
-            // TODO - when users/ move to be symlink we need to use_lstat by name, id is not using lstat
-            path_to_check = this.get_account_path_by_name(identifier_object.name);
-        } else if (identifier_object.access_key) {
-            path_to_check = this.get_account_path_by_access_key(identifier_object.access_key);
-            use_lstat = true;
-        }
-        // TODO - add is_account_exists by id when idenetities/ added
-        // else if (identifier_object.id) {}
-        return native_fs_utils.is_path_exists(this.root_fs_context, path_to_check, use_lstat);
-    }
-
-    /**
-     * get_old_account_path_by_name returns the full account path by name based on old config dir structure
-     * @param {string} account_name
-     * @returns {string} 
-     */
-    get_old_account_path_by_name(account_name) {
-        return path.join(this.accounts_dir_path, this.json(account_name));
+       // TODO -  change to this.symlink(account_name) on identities/ PR;
+       return path.join('../', CONFIG_SUBDIRS.ACCOUNTS, this.json(account_name));
     }
 
     /**
@@ -203,37 +198,33 @@ class ConfigFS {
     }
 
     /**
-     * get_config_data reads a config file and returns its content 
-     * while omitting secrets if show_secrets flag was not provided
-     * and decrypts the account's secret_key if decrypt_secret_key is true
-     * @param {string} config_file_path
-     * @param {boolean} [show_secrets]
-     * @param {boolean} [decrypt_secret_key]
-     */
-    async get_config_data(config_file_path, show_secrets = false, decrypt_secret_key = false) {
-        const { data } = await nb_native().fs.readFile(this.root_fs_context, config_file_path);
-        const config_data = _.omit(JSON.parse(data.toString()), show_secrets ? [] : ['access_keys']);
-        if (decrypt_secret_key) config_data.access_keys = await nc_mkm.decrypt_access_keys(config_data);
-        return config_data;
+     * get_old_account_path_by_name returns the full account path by name based on old config dir structure
+     * @param {string} account_name
+     * @returns {string} 
+    */
+    get_old_account_path_by_name(account_name) {
+        return path.join(this.accounts_dir_path, this.json(account_name));
     }
 
     /**
-     * get_config_data_if_exists will read a config file and return its content 
-     * while omitting secrets if show_secrets flag was not provided
-     * and decrypts the account's secret_key if decrypt_secret_key is true
-     * if the config file was deleted (encounter ENOENT error) - continue (returns undefined)
-     * @param {string} config_file_path
-     * @param {boolean} [show_secrets]
-     * @param {boolean} [decrypt_secret_key]
-     */
-    async get_config_data_if_exists(config_file_path, show_secrets = false, decrypt_secret_key = false) {
-        try {
-            const config_data = await this.get_config_data(config_file_path, show_secrets, decrypt_secret_key);
-            return config_data;
-        } catch (err) {
-            dbg.warn('get_config_data_if_exists: with config_file_path', config_file_path, 'got an error', err);
-            if (err.code !== 'ENOENT') throw err;
+     * is_account_exists returns true if account config path exists in config dir
+     * it can be determined by any account identifier - name, access_key and in the future id
+     * @param {{ name?: string, access_key?: string }} identifier_object
+     * @returns {Promise<boolean>} 
+    */
+   async is_account_exists(identifier_object) {
+       let path_to_check;
+       let use_lstat = false;
+       if (identifier_object.name) {
+           // TODO - when users/ move to be symlink we need to use_lstat by name, id is not using lstat
+           path_to_check = this.get_account_path_by_name(identifier_object.name);
+        } else if (identifier_object.access_key) {
+            path_to_check = this.get_account_path_by_access_key(identifier_object.access_key);
+            use_lstat = true;
         }
+        // TODO - add is_account_exists by id when idenetities/ added
+        // else if (identifier_object.id) {}
+        return native_fs_utils.is_path_exists(this.root_fs_context, path_to_check, use_lstat);
     }
 
     /**
@@ -262,6 +253,14 @@ class ConfigFS {
         return account;
     }
 
+    /**
+     * read_root_accounts returns the root accounts array exists under the config dir
+     * @returns {Promise<Dirent[]>} 
+     */
+    async read_root_accounts() {
+        return nb_native().fs.readdir(this.root_fs_context, this.accounts_dir_path);
+    }
+
     /**
      * create_account_config_file creates account config file
      * if account_data.access_keys is an array that contains at least 1 item -
@@ -292,34 +291,6 @@ class ConfigFS {
         }
     }
 
-    /**
-     * delete_account_config_file deletes account config file
-     * if access_keys_to_delete is an array that contains at least 1 item -
-     * unlink all item in access_keys_to_delete
-     * @param {string} account_name
-     * @param {Object[]} access_keys_to_delete
-     * @returns {Promise<void>} 
-     */
-    async delete_account_config_file(account_name, access_keys_to_delete = []) {
-        const account_config_path = this.get_account_path_by_name(account_name);
-        await native_fs_utils.delete_config_file(this.root_fs_context, this.accounts_dir_path, account_config_path);
-        for (const access_keys of access_keys_to_delete) {
-            const access_key_config_path = this.get_account_path_by_access_key(access_keys.access_key);
-            await nb_native().fs.unlink(this.root_fs_context, access_key_config_path);
-        }
-    }
-
-    /**
-     * delete_access_key_config_file unlinks the access key from the file system
-     * @param {string} access_key
-     * @returns {Promise<void>} 
-     */
-    async delete_access_key_config_file(access_key) {
-        const acces_key_path = this.get_account_path_by_access_key(access_key);
-        await nb_native().fs.unlink(this.root_fs_context, acces_key_path);
-    }
-
-
     /**
      * update_account_config_file updates account config file
      * if old_access_keys is an array that contains at least 1 item -
@@ -351,6 +322,33 @@ class ConfigFS {
         }
     }
 
+    /**
+     * delete_account_config_file deletes account config file
+     * if access_keys_to_delete is an array that contains at least 1 item -
+     * unlink all item in access_keys_to_delete
+     * @param {string} account_name
+     * @param {Object[]} access_keys_to_delete
+     * @returns {Promise<void>} 
+     */
+    async delete_account_config_file(account_name, access_keys_to_delete = []) {
+        const account_config_path = this.get_account_path_by_name(account_name);
+        await native_fs_utils.delete_config_file(this.root_fs_context, this.accounts_dir_path, account_config_path);
+        for (const access_keys of access_keys_to_delete) {
+            const access_key_config_path = this.get_account_path_by_access_key(access_keys.access_key);
+            await nb_native().fs.unlink(this.root_fs_context, access_key_config_path);
+        }
+    }
+
+    /**
+     * delete_access_key_config_file unlinks the access key from the file system
+     * @param {string} access_key
+     * @returns {Promise<void>} 
+     */
+    async delete_access_key_config_file(access_key) {
+        const acces_key_path = this.get_account_path_by_access_key(access_key);
+        await nb_native().fs.unlink(this.root_fs_context, acces_key_path);
+    }
+
     //////////////////////////////////////
     ////// BUCKET CONFIG DIR FUNCS  //////
     //////////////////////////////////////
@@ -374,6 +372,16 @@ class ConfigFS {
         // TODO
     }
 
+    /**
+     * is_bucket_exists returns true if bucket config path exists in config dir
+     * @param {string} bucket_name
+     * @returns {Promise<boolean>} 
+     */
+    async is_bucket_exists(bucket_name) {
+        const path_to_check = this.get_bucket_path_by_name(bucket_name);
+        return native_fs_utils.is_path_exists(this.root_fs_context, path_to_check);
+    }
+
     /**
      * get_bucket_by_name returns the full bucket info by name
      * @param {string} bucket_name
@@ -385,6 +393,25 @@ class ConfigFS {
         return bucket;
     }
 
+    /**
+     * get_bucket_by_name returns the full bucket info by name
+     * @param {string} bucket_name
+     * @returns {Promise<any>} 
+     */
+    async get_bucket_if_exists(bucket_name) {
+        const bucket_path = this.get_bucket_path_by_name(bucket_name);
+        const bucket = await this.get_config_data_if_exists(bucket_path);
+        return bucket;
+    }
+
+    /**
+     * read_buckets returns the buckets array exists under the config dir
+     * @returns {Promise<Dirent[]>} 
+     */
+    async read_buckets() {
+        return nb_native().fs.readdir(this.root_fs_context, this.buckets_dir_path);
+    }
+
     /**
      * create_bucket_config_file creates bucket config file
      * @param {string} bucket_name
@@ -416,36 +443,6 @@ class ConfigFS {
         const bucket_config_path = this.get_bucket_path_by_name(bucket_name);
         await native_fs_utils.delete_config_file(this.root_fs_context, this.buckets_dir_path, bucket_config_path);
     }
-
-    /**
-     * read_buckets returns the buckets array exists under the config dir
-     * @returns {Promise<Dirent[]>} 
-     */
-    async read_buckets() {
-        return nb_native().fs.readdir(this.root_fs_context, this.buckets_dir_path);
-    }
-
-    /**
-     * get_bucket_by_name returns the full bucket info by name
-     * @param {string} bucket_name
-     * @returns {Promise<any>} 
-     */
-
-    async get_bucket_if_exists(bucket_name) {
-        const bucket_path = this.get_bucket_path_by_name(bucket_name);
-        const bucket = await this.get_config_data_if_exists(bucket_path);
-        return bucket;
-    }
-
-    /**
-     * is_bucket_exists returns true if bucket config path exists in config dir
-     * @param {string} bucket_name
-     * @returns {Promise<boolean>} 
-     */
-    async is_bucket_exists(bucket_name) {
-        const path_to_check = this.get_bucket_path_by_name(bucket_name);
-        return native_fs_utils.is_path_exists(this.root_fs_context, path_to_check);
-    }
 }
 
 // EXPORTS