cfg: introduce enum type

Two existing enum types are ported to the new type descriptor. In
a next commit it will also be used for a new cfg option about
user management.

Needed for #435

NO_DOC=internal

Author: Gerold103

test/unit-luatest/config_test.lua

@@ -91,3 +91,33 @@ g.test_replica_listen = function()
     t.assert_equals(rep_1_a.uri, url1, 'uri value')
     t.assert_equals(rep_1_a.listen, {url1, url2}, 'listen value')
 end
+
+g.test_enum = function()
+    local config = {
+        sharding = {
+            storage_1_uuid = {
+                replicas = {}
+            },
+        },
+    }
+    t.assert(vcfg.check(config), 'normal config')
+
+    config.sharding.storage_1_uuid.master = 'auto'
+    t.assert(vcfg.check(config))
+
+    config.sharding.storage_1_uuid.master = 'bad'
+    t.assert_error_msg_content_equals(
+        "Master search mode must be enum {'auto', nil}",
+        vcfg.check, config)
+
+    config.sharding.storage_1_uuid.master = nil
+    for _, v in pairs({'on', 'off', 'once'}) do
+        config.discovery_mode = v
+        t.assert(vcfg.check(config))
+    end
+    config.discovery_mode = 'bad'
+    t.assert_error_msg_content_equals(
+        "Discovery mode must be enum {'on', 'off', 'once', nil}",
+        vcfg.check, config)
+    config.discovery_mode = nil
+end

test/unit/config.result

@@ -642,14 +642,14 @@ replicaset.master = 'non-auto'
 ...
 util.check_error(lcfg.check, cfg)
 ---
-- Only "auto" master is supported
+- Master search mode must be enum {'auto', nil}
 ...
 replicaset.master = 123
 ---
 ...
 util.check_error(lcfg.check, cfg)
 ---
-- Master search mode must be string
+- Master search mode must be enum {'auto', nil}
 ...
 replica.master = true
 ---

vshard/cfg.lua

@@ -38,12 +38,6 @@ local function check_replica_master(master, ctx)
     end
 end
 
-local function check_replicaset_master(master)
-    if master ~= 'auto' then
-        error('Only "auto" master is supported')
-    end
-end
-
 local function is_number(v)
     return type(v) == 'number' and v == v
 end
@@ -70,7 +64,7 @@ end
 
 local type_descriptors = {
     -- check(self, template, value)
-    -- tostring(self)
+    -- tostring(self, template)
 
     ['string'] = {
         check = function(self, _, v) return type(v) == 'string' end,
@@ -108,6 +102,27 @@ local type_descriptors = {
         check = function(self, _, v) return type(v) == 'table' end,
         tostring = type_tostring_trivial,
     },
+    ['enum'] = {
+        check = function(self, tv, v)
+            for _, vi in pairs(tv.enum) do
+                if vi == v then
+                    return true
+                end
+            end
+            return false
+        end,
+        tostring = function(self, tv)
+            local values = {}
+            for _, v in pairs(tv.enum) do
+                assert(type(v) == 'string')
+                table.insert(values, ("'%s'"):format(v))
+            end
+            if tv.is_optional then
+                table.insert(values, 'nil')
+            end
+            return ('enum {%s}'):format(table.concat(values, ', '))
+        end,
+    },
 }
 for name, td in pairs(type_descriptors) do
     td.name = name
@@ -138,7 +153,7 @@ local function validate_config(config, template, check_arg)
             if type(expected_type) == 'string' then
                 local td = type_descriptors[expected_type]
                 if not td:check(tv, value) then
-                    error(string.format('%s must be %s', name, td:tostring()))
+                    error(string.format('%s must be %s', name, td:tostring(tv)))
                 end
                 local max = tv.max
                 if max and value > max then
@@ -156,7 +171,7 @@ local function validate_config(config, template, check_arg)
                 if not is_valid_type_found then
                     local types = {}
                     for _, t in pairs(expected_type) do
-                        table.insert(types, type_descriptors[t]:tostring())
+                        table.insert(types, type_descriptors[t]:tostring(tv))
                     end
                     types = table.concat(types, ', ')
                     error(string.format('%s must be one of the following '..
@@ -205,8 +220,8 @@ local replicaset_template = {
     },
     lock = {type = 'boolean', name = 'Lock', is_optional = true},
     master = {
-        type = 'string', name = 'Master search mode', is_optional = true,
-        check = check_replicaset_master
+        type = 'enum', name = 'Master search mode', is_optional = true,
+        enum = {'auto'},
     },
 }
 
@@ -239,12 +254,6 @@ local function cfg_check_weights(weights)
     end
 end
 
-local function check_discovery_mode(value)
-    if value ~= 'on' and value ~= 'off' and value ~= 'once' then
-        error("Expected 'on', 'off', or 'once' for discovery_mode")
-    end
-end
-
 local function check_sharding(sharding)
     local uuids = {}
     local uris = {}
@@ -356,8 +365,8 @@ local cfg_template = {
         is_optional = true, default = consts.DEFAULT_FAILOVER_PING_TIMEOUT
     },
     discovery_mode = {
-        type = 'string', name = 'Discovery mode: on, off, once',
-        is_optional = true, default = 'on', check = check_discovery_mode
+        type = 'enum', name = 'Discovery mode',
+        is_optional = true, default = 'on', enum = {'on', 'off', 'once'},
     },
     sched_ref_quota = {
         name = 'Scheduler storage ref quota', type = 'non-negative number',