MB-47561 do not call ns_config:get in ns_bucket:json_map_from_config

Change-Id: I7101911299e328b911b83ad8e4e31c0af32a4a8f
Reviewed-on: http://review.couchbase.org/c/ns_server/+/158023
Tested-by: Build Bot <[email protected]>
Reviewed-by: Aliaksey Artamonau <[email protected]>
Well-Formed: Restriction Checker

Author: vzasade

src/bucket_info_cache.erl

@@ -197,8 +197,9 @@ compute_bucket_info_with_config(Bucket, Config, BucketConfig) ->
             {_, memcached} ->
                 Caps;
             _ ->
-                {struct, VBMap} = ns_bucket:json_map_with_full_config(?LOCALHOST_MARKER_STRING,
-                                                                      BucketConfig, Config),
+                {struct, VBMap} = ns_bucket:json_map_from_config(
+                                    ?LOCALHOST_MARKER_STRING,
+                                    BucketConfig, Config),
                 VBMapInfo = [{vBucketServerMap, {VBMap}} | Caps],
                 case ns_bucket:storage_mode(BucketConfig) of
                     couchstore ->

src/menelaus_web_buckets.erl

@@ -349,8 +349,9 @@ build_bucket_info(Id, BucketConfig, InfoLevel, LocalAddr, MayExposeAuth,
                   membase ->
                       case SkipMap of
                           false ->
-                              [{vBucketServerMap, ns_bucket:json_map_from_config(
-                                                    LocalAddr, BucketConfig)} |
+                              [{vBucketServerMap,
+                                ns_bucket:json_map_from_config(
+                                  LocalAddr, BucketConfig, Config)} |
                                Suffix];
                           _ ->
                               Suffix
@@ -472,7 +473,8 @@ handle_sasl_buckets_streaming(_PoolId, Req) ->
                                         membase ->
                                             [{vBucketServerMap,
                                               ns_bucket:json_map_from_config(
-                                                LocalAddr, BucketInfo)}];
+                                                LocalAddr, BucketInfo, Config)}
+                                            ];
                                         memcached ->
                                             []
                                     end,

src/ns_bucket.erl

@@ -45,8 +45,7 @@
          is_persistent/1,
          is_ephemeral_bucket/1,
          is_valid_bucket_name/1,
-         json_map_from_config/2,
-         json_map_with_full_config/3,
+         json_map_from_config/3,
          live_bucket_nodes/1,
          live_bucket_nodes_from_config/1,
          map_to_replicas/1,
@@ -397,10 +396,6 @@ moxi_port(Bucket) ->
 get_servers(BucketConfig) ->
     proplists:get_value(servers, BucketConfig).
 
-json_map_from_config(LocalAddr, BucketConfig) ->
-    Config = ns_config:get(),
-    json_map_with_full_config(LocalAddr, BucketConfig, Config).
-
 equal_len_chains([]) ->
     [];
 equal_len_chains(Map) ->
@@ -410,7 +405,7 @@ equal_len_chains(Map) ->
     [Chain ++ lists:duplicate(MaxChainLen - length(Chain), undefined)
      || Chain <- Map].
 
-json_map_with_full_config(LocalAddr, BucketConfig, Config) ->
+json_map_from_config(LocalAddr, BucketConfig, Config) ->
     NumReplicas = num_replicas(BucketConfig),
     EMap = equal_len_chains(proplists:get_value(map, BucketConfig, [])),
     BucketNodes = get_servers(BucketConfig),