Merge pull request #176 from basho/jd-cuttlefish-api

Changes for new cuttlefish api

priv/riak_control.schema

@@ -1,3 +1,4 @@
+%%-*- mode: erlang -*-
 %% riak_control config
 %% @doc Set to 'off' to disable the admin panel.
 {mapping, "riak_control", "riak_control.enabled", [
@@ -8,7 +9,7 @@
 {translation,
  "riak_control.enabled",
  fun(Conf) ->
-    Setting = cuttlefish_util:conf_get_value("riak_control", Conf), 
+    Setting = cuttlefish:conf_get("riak_control", Conf),
     case Setting of
       on -> true;
       off -> false;
@@ -26,7 +27,7 @@
 {translation,
 "riak_control.auth",
 fun(Conf) ->
-  case cuttlefish_util:conf_get_value("riak_control.auth", Conf) of
+  case cuttlefish:conf_get("riak_control.auth", Conf) of
     userlist -> userlist;
     off -> none;
     _ -> none
@@ -45,10 +46,15 @@ end}.
 "riak_control.userlist",
 fun(Conf) ->
   UserList = lists:filter(
-    fun({K, _V}) -> 
-      cuttlefish_util:fuzzy_variable_match(K, string:tokens("riak_control.user.$username.password", "."))
+    fun({K, _V}) ->
+       cuttlefish_variable:is_fuzzy_match(K, string:tokens("riak_control.user.$username.password", "."))
     end,
     Conf),
-  [ {Username, Password} || {[_, _, Username, _], Password} <- UserList ]
+  Users = [ {Username, Password} || {[_, _, Username, _], Password} <- UserList ],
+  case Users of
+      [] ->
+          throw(unset);
+      _ -> Users
+  end
 
 end}.

test/riak_control_schema_test.erl

@@ -4,11 +4,12 @@
 -compile(export_all).
 
 basic_schema_test() ->
+    lager:start(),
     Config = cuttlefish_unit:generate_config("../priv/riak_control.schema", []),
 
     cuttlefish_unit:assert_config(Config, "riak_control.enabled", false),
     cuttlefish_unit:assert_config(Config, "riak_control.auth", userlist),
-    cuttlefish_unit:assert_config(Config, "riak_control.userlist", [{"user","pass"}]),
+    cuttlefish_unit:assert_not_configured(Config, "riak_control.userlist"),
     ok.
 
 userlist_schema_test() ->