Skip to content

Commit

Permalink
Merge pull request #8364 from romayalon/romy-health-tests-fix
Browse files Browse the repository at this point in the history 
NC | CLI | Small fixes in Health and Account Delete CLI command
  • Loading branch information
@romayalon
romayalon authored Sep 16, 2024
2 parents 4edc2a4 + 982e878 commit cb6beec
Show file tree
Hide file tree
Showing 4 changed files with 81 additions and 38 deletions.
5 changes: 1 addition & 4 deletions src/cmd/manage_nsfs.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -635,10 +635,7 @@ async function list_config_files(type, wide, show_secrets, filters = {}) {
* @param {object} user_input
*/
function get_access_keys(action, user_input) {
let access_keys = [{
access_key: undefined,
secret_key: undefined,
}];
let access_keys = [];
let new_access_key;
if (action === ACTIONS.ADD || action === ACTIONS.UPDATE || action === ACTIONS.DELETE) {
manage_nsfs_validations._validate_access_keys(user_input.access_key, user_input.secret_key);
Expand Down
12 changes: 6 additions & 6 deletions src/manage_nsfs/health.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,16 @@ class NSFSHealth {
};
}

let config_files;
let config_files_names;
if (type === TYPES.BUCKET) {
config_files = await this.config_fs.list_buckets();
config_files_names = await this.config_fs.list_buckets();
} else {
config_files = await this.config_fs.list_accounts();
config_files_names = await this.config_fs.list_accounts();
}
for (const config_file of config_files) {
for (const config_file_name of config_files_names) {
// config_file get data or push error
const { config_data = undefined, err_obj = undefined } =
await this.get_config_file_data_or_error_object(type, config_file);
await this.get_config_file_data_or_error_object(type, config_file_name);
if (!config_data && err_obj) {
invalid_storages.push(err_obj.invalid_storage);
continue;
Expand All @@ -361,7 +361,7 @@ class NSFSHealth {
config_data.nsfs_account_config.new_buckets_path;

if (type === TYPES.ACCOUNT) {
const config_file_path = this.config_fs.get_account_path_by_name(config_file.name);
const config_file_path = this.config_fs.get_account_path_by_name(config_file_name);
res = await is_new_buckets_path_valid(config_file_path, config_data, storage_path);
} else if (type === TYPES.BUCKET) {
res = await is_bucket_storage_path_exists(this.config_fs.fs_context, config_data, storage_path);
Expand Down
28 changes: 28 additions & 0 deletions src/test/system_tests/test_utils.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,7 @@ function get_new_buckets_path_by_test_env(new_buckets_full_path, new_buckets_dir
/**
* write_manual_config_file writes config file directly to the file system without using config FS
* used for creating backward compatibility tests, invalid config files etc
* @param {String} type
* @param {import('../../sdk/config_fs').ConfigFS} config_fs
* @param {Object} config_data
* @param {String} [invalid_str]
Expand Down Expand Up @@ -483,6 +484,32 @@ async function write_manual_old_account_config_file(config_fs, config_data) {
);
}

/**
* delete_manual_config_file deletes config file directly from the file system without using config FS
* used for deleting invalid config files etc
* @param {String} type
* @param {import('../../sdk/config_fs').ConfigFS} config_fs
* @param {Object} config_data
* @returns {Promise<Void>}
*/
async function delete_manual_config_file(type, config_fs, config_data) {
if (type === CONFIG_TYPES.ACCOUNT) {
const name_symlink_path = config_fs.get_account_or_user_path_by_name(config_data.name);
await nb_native().fs.unlink(config_fs.fs_context, name_symlink_path);
}

const config_path = type === CONFIG_TYPES.BUCKET ?
config_fs.get_bucket_path_by_name(config_data.name) :
config_fs.get_identity_path_by_id(config_data._id);

await nb_native().fs.unlink(config_fs.fs_context, config_path);

if (type === CONFIG_TYPES.ACCOUNT) {
const dir_path = config_fs.get_identity_dir_path_by_id(config_data._id);
await nb_native().fs.rmdir(config_fs.fs_context, dir_path);
}
}

exports.blocks_exist_on_cloud = blocks_exist_on_cloud;
exports.create_hosts_pool = create_hosts_pool;
exports.delete_hosts_pool = delete_hosts_pool;
Expand All @@ -504,4 +531,5 @@ exports.generate_nsfs_account = generate_nsfs_account;
exports.get_new_buckets_path_by_test_env = get_new_buckets_path_by_test_env;
exports.write_manual_config_file = write_manual_config_file;
exports.write_manual_old_account_config_file = write_manual_old_account_config_file;
exports.delete_manual_config_file = delete_manual_config_file;

74 changes: 46 additions & 28 deletions src/test/unit_tests/test_nc_nsfs_health.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,21 @@ const path = require('path');
const mocha = require('mocha');
const sinon = require('sinon');
const assert = require('assert');
const { ConfigFS } = require('../../sdk/config_fs');
const NSFSHealth = require('../../manage_nsfs/health').NSFSHealth;
const fs_utils = require('../../util/fs_utils');
const test_utils = require('../system_tests/test_utils');
const nb_native = require('../../util/nb_native');
const { TYPES, DIAGNOSE_ACTIONS, ACTIONS } = require('../../manage_nsfs/manage_nsfs_constants');
const { ConfigFS } = require('../../sdk/config_fs');
const mongo_utils = require('../../util/mongo_utils');
const test_utils = require('../system_tests/test_utils');
const NSFSHealth = require('../../manage_nsfs/health').NSFSHealth;
const { get_process_fs_context } = require('../../util/native_fs_utils');
const { TMP_PATH, create_fs_user_by_platform, delete_fs_user_by_platform, exec_manage_cli } = require('../system_tests/test_utils');
const { ManageCLIError } = require('../../manage_nsfs/manage_nsfs_cli_errors');
const { TYPES, DIAGNOSE_ACTIONS, ACTIONS } = require('../../manage_nsfs/manage_nsfs_constants');
const { TMP_PATH, create_fs_user_by_platform, delete_fs_user_by_platform, exec_manage_cli } = require('../system_tests/test_utils');

const tmp_fs_path = path.join(TMP_PATH, 'test_bucketspace_fs');
const tmp_fs_path = path.join(TMP_PATH, 'test_nc_health');
const DEFAULT_FS_CONFIG = get_process_fs_context();

const bucket_storage_path = path.join(tmp_fs_path, 'account_inaccessible');
const bucket_storage_path = path.join(tmp_fs_path, 'bucket_storage_path');

mocha.describe('nsfs nc health', function() {

Expand Down Expand Up @@ -92,7 +93,7 @@ mocha.describe('nsfs nc health', function() {
});
});

mocha.describe('health check', async function() {
mocha.describe('health check', function() {
const new_buckets_path = `${root_path}new_buckets_path_user1/`;
const account1_options = {
name: 'account1',
Expand All @@ -102,14 +103,15 @@ mocha.describe('nsfs nc health', function() {
};
const bucket1_options = {
name: 'bucket1',
path: new_buckets_path + '/bucket1'
path: new_buckets_path + '/bucket1',
owner: account1_options.name
};
const account_inaccessible_options = { name: 'account_inaccessible', uid: 999, gid: 999, new_buckets_path: bucket_storage_path };
const account_inaccessible_dn_options = { name: 'account_inaccessible_dn', user: 'inaccessible_dn', new_buckets_path: bucket_storage_path };
const invalid_account_dn_options = { name: 'invalid_account_dn', user: 'invalid_account_dn', new_buckets_path: bucket_storage_path };
const fs_users = {
other_user: {
distinguished_name: account_inaccessible_dn_options.nsfs_account_config.distinguished_name,
distinguished_name: account_inaccessible_dn_options.user,
uid: 1312,
gid: 1312
}
Expand Down Expand Up @@ -140,6 +142,10 @@ mocha.describe('nsfs nc health', function() {
}
});

mocha.afterEach(async () => {
await fs_utils.file_delete(config_fs.config_json_path);
});

mocha.it('Health all condition is success', async function() {
const get_service_state = sinon.stub(Health, "get_service_state");
get_service_state.onFirstCall().returns(Promise.resolve({ service_status: 'active', pid: 100 }))
Expand Down Expand Up @@ -186,8 +192,9 @@ mocha.describe('nsfs nc health', function() {
mocha.it('NSFS account with invalid storage path', async function() {
Health.get_service_state.restore();
Health.get_endpoint_response.restore();
const account_invalid_options = { name: 'account_invalid', new_buckets_path: new_buckets_path + '/invalid' };
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.ADD, {config_root, ...account_invalid_options});
// create it manually because we can not skip invalid storage path check on the CLI
const account_invalid_options = { _id: mongo_utils.mongoObjectId(), name: 'account_invalid', nsfs_account_config: { new_buckets_path: path.join(new_buckets_path, '/invalid') } };
await test_utils.write_manual_config_file(TYPES.ACCOUNT, config_fs, account_invalid_options);
const get_service_state = sinon.stub(Health, "get_service_state");
get_service_state.onFirstCall().returns(Promise.resolve({ service_status: 'active', pid: 1000 }))
.onSecondCall().returns(Promise.resolve({ service_status: 'active', pid: 2000 }));
Expand All @@ -197,14 +204,15 @@ mocha.describe('nsfs nc health', function() {
assert.strictEqual(health_status.status, 'OK');
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts.length, 1);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts[0].name, 'account_invalid');
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, {config_root, name: account_invalid_options.name});
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, { config_root, name: account_invalid_options.name});
});

mocha.it('NSFS bucket with invalid storage path', async function() {
Health.get_service_state.restore();
Health.get_endpoint_response.restore();
const bucket_invalid = { name: 'bucket_invalid', path: new_buckets_path + '/bucket1/invalid' };
await config_fs.create_bucket_config_file(bucket_invalid);
// create it manually because we can not skip invalid storage path check on the CLI
const bucket_invalid = { _id: mongo_utils.mongoObjectId(), name: 'bucket_invalid', path: new_buckets_path + '/bucket1/invalid', owner: account1_options.name };
await test_utils.write_manual_config_file(TYPES.BUCKET, config_fs, bucket_invalid);
const get_service_state = sinon.stub(Health, "get_service_state");
get_service_state.onFirstCall().returns(Promise.resolve({ service_status: 'active', pid: 1000 }))
.onSecondCall().returns(Promise.resolve({ service_status: 'active', pid: 2000 }));
Expand All @@ -213,15 +221,17 @@ mocha.describe('nsfs nc health', function() {
const health_status = await Health.nc_nsfs_health();
assert.strictEqual(health_status.status, 'OK');
assert.strictEqual(health_status.checks.buckets_status.invalid_buckets.length, 1);
assert.strictEqual(health_status.checks.buckets_status.invalid_buckets[0].name, 'bucket_invalid');
await exec_manage_cli(TYPES.BUCKET, ACTIONS.DELETE, { config_root, name: bucket_invalid.name });
assert.strictEqual(health_status.checks.buckets_status.invalid_buckets[0].name, bucket_invalid.name);
await exec_manage_cli(TYPES.BUCKET, ACTIONS.DELETE, { config_root, name: bucket_invalid.name});
});

mocha.it('NSFS invalid bucket schema json', async function() {
Health.get_service_state.restore();
Health.get_endpoint_response.restore();
const bucket_invalid_schema = { name: 'bucket_invalid_schema', path: new_buckets_path };
await config_fs.create_bucket_config_file(bucket_invalid_schema);
// create it manually because we can not skip json schema check on the CLI
const bucket_invalid_schema = { _id: mongo_utils.mongoObjectId(), name: 'bucket_invalid_schema', path: new_buckets_path };
await test_utils.write_manual_config_file(TYPES.BUCKET, config_fs, bucket_invalid_schema, 'invalid');

const get_service_state = sinon.stub(Health, "get_service_state");
get_service_state.onFirstCall().returns(Promise.resolve({ service_status: 'active', pid: 1000 }))
.onSecondCall().returns(Promise.resolve({ service_status: 'active', pid: 2000 }));
Expand All @@ -230,14 +240,16 @@ mocha.describe('nsfs nc health', function() {
const health_status = await Health.nc_nsfs_health();
assert.strictEqual(health_status.status, 'OK');
assert.strictEqual(health_status.checks.buckets_status.invalid_buckets.length, 1);
assert.strictEqual(health_status.checks.buckets_status.invalid_buckets[0].name, 'bucket_invalid_schema');
await exec_manage_cli(TYPES.BUCKET, ACTIONS.DELETE, { config_root, name: bucket_invalid_schema.name });
assert.strictEqual(health_status.checks.buckets_status.invalid_buckets[0].name, bucket_invalid_schema.name);
// delete it manually because we can not read non json files using the CLI
await test_utils.delete_manual_config_file(TYPES.BUCKET, config_fs, bucket_invalid_schema);
});

mocha.it('NSFS invalid account schema json', async function() {
Health.get_service_state.restore();
Health.get_endpoint_response.restore();
const account_invalid_schema = { _id: '9', name: 'account_invalid_schema', path: new_buckets_path, bla: 5 };
// create it manually because we can not skip json schema check on the CLI
const account_invalid_schema = { _id: mongo_utils.mongoObjectId(), name: 'account_invalid_schema', path: new_buckets_path, bla: 5 };
await test_utils.write_manual_config_file(TYPES.ACCOUNT, config_fs, account_invalid_schema, 'invalid');
const get_service_state = sinon.stub(Health, "get_service_state");
get_service_state.onFirstCall().returns(Promise.resolve({ service_status: 'active', pid: 1000 }))
Expand All @@ -248,7 +260,8 @@ mocha.describe('nsfs nc health', function() {
assert.strictEqual(health_status.status, 'OK');
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts.length, 1);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts[0].name, account_invalid_schema.name);
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, { config_root, name: account_invalid_schema.name });
// delete it manually because we can not read non json files using the CLI
await test_utils.delete_manual_config_file(TYPES.ACCOUNT, config_fs, account_invalid_schema);
});

mocha.it('Health all condition is success, all_account_details is false', async function() {
Expand Down Expand Up @@ -309,10 +322,10 @@ mocha.describe('nsfs nc health', function() {
//revert to config root
Health.config_root = config_root;
Health.config_fs = old_config_fs;

});

mocha.it('Account with inaccessible path - uid gid', async function() {
await config_fs.create_config_json_file(JSON.stringify({ NC_DISABLE_ACCESS_CHECK: true }));
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.ADD, { config_root, ...account_inaccessible_options});
Health.get_service_state.restore();
Health.get_endpoint_response.restore();
Expand All @@ -329,10 +342,11 @@ mocha.describe('nsfs nc health', function() {
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts.length, 1);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts[0].code, "ACCESS_DENIED");
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts[0].name, account_inaccessible_options.name);
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, {config_root, name: account_inaccessible_options.name});
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, { config_root, name: account_inaccessible_options.name});
});

mocha.it('Account with inaccessible path - dn', async function() {
await config_fs.create_config_json_file(JSON.stringify({ NC_DISABLE_ACCESS_CHECK: true }));
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.ADD, { config_root, ...account_inaccessible_dn_options });
Health.get_service_state.restore();
Health.get_endpoint_response.restore();
Expand All @@ -353,6 +367,7 @@ mocha.describe('nsfs nc health', function() {
});

mocha.it('Account with invalid dn', async function() {
await config_fs.create_config_json_file(JSON.stringify({ NC_DISABLE_ACCESS_CHECK: true }));
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.ADD, { config_root, ...invalid_account_dn_options });
Health.get_service_state.restore();
Health.get_endpoint_response.restore();
Expand All @@ -364,6 +379,7 @@ mocha.describe('nsfs nc health', function() {
const get_endpoint_response = sinon.stub(Health, "get_endpoint_response");
get_endpoint_response.onFirstCall().returns(Promise.resolve({response: {response_code: 'RUNNING', total_fork_count: 0}}));
const health_status = await Health.nc_nsfs_health();
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, { config_root, name: invalid_account_dn_options.name });
assert.strictEqual(health_status.checks.buckets_status.valid_buckets.length, 1);
assert.strictEqual(health_status.checks.accounts_status.valid_accounts.length, 1);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts.length, 1);
Expand All @@ -386,8 +402,10 @@ mocha.describe('nsfs nc health', function() {
const get_endpoint_response = sinon.stub(Health, "get_endpoint_response");
get_endpoint_response.onFirstCall().returns(Promise.resolve({response: {response_code: 'RUNNING', total_fork_count: 0}}));
const health_status = await Health.nc_nsfs_health();
assert.strictEqual(health_status.checks.accounts_status.valid_accounts.length, 2);
assert.strictEqual(health_status.checks.accounts_status.valid_accounts.length, 1);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts.length, 1);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts[0].name, account_valid.name);
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, { config_root, name: account_valid.name });
});

mocha.it('Account with new_buckets_path missing and allow_bucket_creation true, invalid account', async function() {
Expand All @@ -403,8 +421,8 @@ mocha.describe('nsfs nc health', function() {
const get_endpoint_response = sinon.stub(Health, "get_endpoint_response");
get_endpoint_response.onFirstCall().returns(Promise.resolve({response: {response_code: 'RUNNING', total_fork_count: 0}}));
const health_status = await Health.nc_nsfs_health();
assert.strictEqual(health_status.checks.accounts_status.valid_accounts.length, 2);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts.length, 2);
assert.strictEqual(health_status.checks.accounts_status.valid_accounts.length, 1);
assert.strictEqual(health_status.checks.accounts_status.invalid_accounts.length, 1);
await exec_manage_cli(TYPES.ACCOUNT, ACTIONS.DELETE, { config_root, name: account_invalid.name });
});
});
Expand Down

0 comments on commit cb6beec

Please sign in to comment.