Skip to content

Commit 989233c

Browse files
committed
rename GLOBAL_CONFIG_OPTIONS to GENERAL_OPTIONS
Signed-off-by: shirady <[email protected]>
1 parent f183afd commit 989233c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

src/manage_nsfs/manage_nsfs_constants.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,16 @@ const CONFIG_SUBDIRS = {
3737
};
3838

3939
const CONFIG_ROOT_FLAG = 'config_root';
40-
const GLOBAL_CONFIG_OPTIONS = new Set([CONFIG_ROOT_FLAG, 'config_root_backend', 'debug']);
40+
const GENERAL_OPTIONS = new Set([CONFIG_ROOT_FLAG, 'config_root_backend', 'debug']);
4141
const FROM_FILE = 'from_file';
4242
const ANONYMOUS = 'anonymous';
4343

4444
const VALID_OPTIONS_ACCOUNT = {
45-
'add': new Set(['name', 'uid', 'gid', 'new_buckets_path', 'user', 'access_key', 'secret_key', 'fs_backend', 'allow_bucket_creation', 'force_md5_etag', 'iam_operate_on_root_account', FROM_FILE, ...GLOBAL_CONFIG_OPTIONS]),
46-
'update': new Set(['name', 'uid', 'gid', 'new_buckets_path', 'user', 'access_key', 'secret_key', 'fs_backend', 'allow_bucket_creation', 'force_md5_etag', 'iam_operate_on_root_account', 'new_name', 'regenerate', ...GLOBAL_CONFIG_OPTIONS]),
47-
'delete': new Set(['name', ...GLOBAL_CONFIG_OPTIONS]),
48-
'list': new Set(['wide', 'show_secrets', 'gid', 'uid', 'user', 'name', 'access_key', ...GLOBAL_CONFIG_OPTIONS]),
49-
'status': new Set(['name', 'access_key', 'show_secrets', ...GLOBAL_CONFIG_OPTIONS]),
45+
'add': new Set(['name', 'uid', 'gid', 'new_buckets_path', 'user', 'access_key', 'secret_key', 'fs_backend', 'allow_bucket_creation', 'force_md5_etag', 'iam_operate_on_root_account', FROM_FILE, ...GENERAL_OPTIONS]),
46+
'update': new Set(['name', 'uid', 'gid', 'new_buckets_path', 'user', 'access_key', 'secret_key', 'fs_backend', 'allow_bucket_creation', 'force_md5_etag', 'iam_operate_on_root_account', 'new_name', 'regenerate', ...GENERAL_OPTIONS]),
47+
'delete': new Set(['name', ...GENERAL_OPTIONS]),
48+
'list': new Set(['wide', 'show_secrets', 'gid', 'uid', 'user', 'name', 'access_key', ...GENERAL_OPTIONS]),
49+
'status': new Set(['name', 'access_key', 'show_secrets', ...GENERAL_OPTIONS]),
5050
};
5151

5252
const VALID_OPTIONS_ANONYMOUS_ACCOUNT = {
@@ -57,11 +57,11 @@ const VALID_OPTIONS_ANONYMOUS_ACCOUNT = {
5757
};
5858

5959
const VALID_OPTIONS_BUCKET = {
60-
'add': new Set(['name', 'owner', 'path', 'bucket_policy', 'fs_backend', 'force_md5_etag', FROM_FILE, ...GLOBAL_CONFIG_OPTIONS]),
61-
'update': new Set(['name', 'owner', 'path', 'bucket_policy', 'fs_backend', 'new_name', 'force_md5_etag', ...GLOBAL_CONFIG_OPTIONS]),
62-
'delete': new Set(['name', 'force', ...GLOBAL_CONFIG_OPTIONS]),
63-
'list': new Set(['wide', 'name', ...GLOBAL_CONFIG_OPTIONS]),
64-
'status': new Set(['name', ...GLOBAL_CONFIG_OPTIONS]),
60+
'add': new Set(['name', 'owner', 'path', 'bucket_policy', 'fs_backend', 'force_md5_etag', FROM_FILE, ...GENERAL_OPTIONS]),
61+
'update': new Set(['name', 'owner', 'path', 'bucket_policy', 'fs_backend', 'new_name', 'force_md5_etag', ...GENERAL_OPTIONS]),
62+
'delete': new Set(['name', 'force', ...GENERAL_OPTIONS]),
63+
'list': new Set(['wide', 'name', ...GENERAL_OPTIONS]),
64+
'status': new Set(['name', ...GENERAL_OPTIONS]),
6565
};
6666

6767
const VALID_OPTIONS_GLACIER = {
@@ -71,15 +71,15 @@ const VALID_OPTIONS_GLACIER = {
7171
};
7272

7373
const VALID_OPTIONS_DIAGNOSE = {
74-
'health': new Set([ 'https_port', 'deployment_type', 'all_account_details', 'all_bucket_details', ...GLOBAL_CONFIG_OPTIONS]),
74+
'health': new Set([ 'https_port', 'deployment_type', 'all_account_details', 'all_bucket_details', ...GENERAL_OPTIONS]),
7575
'gather-logs': new Set([ CONFIG_ROOT_FLAG]),
7676
'metrics': new Set([CONFIG_ROOT_FLAG])
7777
};
7878

7979

80-
const VALID_OPTIONS_WHITELIST = new Set(['ips', ...GLOBAL_CONFIG_OPTIONS]);
80+
const VALID_OPTIONS_WHITELIST = new Set(['ips', ...GENERAL_OPTIONS]);
8181

82-
const VALID_OPTIONS_FROM_FILE = new Set(['from_file', ...GLOBAL_CONFIG_OPTIONS]);
82+
const VALID_OPTIONS_FROM_FILE = new Set(['from_file', ...GENERAL_OPTIONS]);
8383

8484
const VALID_OPTIONS = {
8585
account_options: VALID_OPTIONS_ACCOUNT,

0 commit comments

Comments
 (0)