Skip to content

Commit eec94af

Browse files
committed
Revert "MB-47768: Make clusterEncryptionLevel available on pools/default"
This reverts commit 681c72f. Reverting because we shouldn't expose clusterEncryptionLevel without requiring sufficient permisssions. Change-Id: I9c5621210b5e88439ca7cadf1f022bd29114381a Reviewed-on: http://review.couchbase.org/c/ns_server/+/159426 Well-Formed: Build Bot <[email protected]> Tested-by: Build Bot <[email protected]> Reviewed-by: Steve Watanabe <[email protected]>
1 parent e776055 commit eec94af

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

src/menelaus_web_pools.erl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ do_build_pool_info(Id, InfoLevel, Stability, LocalAddr) ->
233233
<<"/pools/default/serverGroups?v=",
234234
(list_to_binary(integer_to_list(GroupsV)))/binary>>},
235235
{clusterName, list_to_binary(get_cluster_name())},
236-
{clusterEncryptionLevel, misc:get_cluster_encryption_level(Config)},
237236
{balanced, ns_cluster_membership:is_balanced()},
238237
build_check_permissions_uri(InfoLevel, Id, Snapshot),
239238
menelaus_web_node:build_memory_quota_info(Config),

src/misc.erl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1521,17 +1521,13 @@ is_cluster_encryption_fully_disabled() ->
15211521

15221522
-spec get_cluster_encryption_level() -> none | control | all | strict.
15231523
get_cluster_encryption_level() ->
1524-
get_cluster_encryption_level(ns_config:latest()).
1525-
1526-
-spec get_cluster_encryption_level(term()) -> none | control | all | strict.
1527-
get_cluster_encryption_level(Config) ->
15281524
Default = case is_cluster_encryption_fully_enabled() of
15291525
true ->
15301526
control;
15311527
false ->
15321528
none
15331529
end,
1534-
ns_config:search(Config, cluster_encryption_level, Default).
1530+
ns_config:search(ns_config:latest(), cluster_encryption_level, Default).
15351531

15361532
-spec should_cluster_data_be_encrypted() -> true | false.
15371533
should_cluster_data_be_encrypted() ->

0 commit comments

Comments
 (0)