Skip to content

Commit

Permalink
revert to no change
Browse files Browse the repository at this point in the history 
Signed-off-by: Navendu Pottekkat <[email protected]>
  • Loading branch information
@pottekkat
pottekkat committed Nov 15, 2023
1 parent f22bc39 commit bf8bdb8
Showing 1 changed file with 87 additions and 178 deletions.
265 changes: 87 additions & 178 deletions apisix/cli/schema.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ local pairs = pairs
local pcall = pcall
local require = require

-- test comment

local _M = {}
local etcd_schema = {
Expand Down Expand Up @@ -66,81 +67,11 @@ local etcd_schema = {
required = {"prefix", "host"}
}

local admin_schema = {
type = "object",
properties = {
admin_key = {
type = "array",
properties = {
items = {
properties = {
name = {type = "string"},
key = {type = "string"},
role = {type = "string"},
}
}
}
},
admin_listen = {
properties = {
listen = { type = "string" },
port = { type = "integer" },
},
default = {
listen = "0.0.0.0",
port = 9180,
}
},
https_admin = {
type = "boolean",
},
admin_key_required = {
type = "boolean",
},
}
}

local config_schema = {
type = "object",
properties = {
apisix = {
properties = {
node_listen = {
anyOf = {
{
type = "integer",
minimum = 1,
maximum = 65535
},
{
type = "array",
items = {
type = "integer",
minimum = 1,
maximum = 65535
}
},
{
type = "array",
items = {
type = "object",
properties = {
port = {
type = "integer",
minimum = 1,
maximum = 65535
},
ip = {
type = "string",
},
enable_http2 = {
type = "boolean",
},
}
},
}
},
},
lua_module_hook = {
pattern = "^[a-zA-Z._-]+$",
},
Expand Down Expand Up @@ -387,115 +318,93 @@ local config_schema = {
role = {
enum = {"traditional", "control_plane", "data_plane", "standalone"},
default = "traditional"
},
}
},
dependencies = {
role = {
oneOf = {
{
properties = {
role = { const = "traditional" },
etcd = etcd_schema,
admin = admin_schema,
role_traditional = {
type = "object",
properties = {
config_provider = {
enum = { "etcd" }
},
},
required = { "config_provider" }
},
},
required = { "role_traditional" },
},
{
properties = {
role = { const = "control_plane" },
etcd = etcd_schema,
admin = admin_schema,
role_control_plane = {
type = "object",
properties = {
config_provider = {
enum = { "etcd" }
},
},
required = { "config_provider" }
},
},
required = { "role_control_plane" },
},
{
properties = {
role = { const = "data_plane" },
etcd = etcd_schema,
role_data_plane = {
type = "object",
properties = {
config_provider = {
enum = { "etcd", "yaml", "xds" }
},
},
required = { "config_provider" }
},
},
required = { "role_data_plane" },
},
},
},
required = {"apisix", "deployment"},
}

local admin_schema = {
type = "object",
properties = {
admin_key = {
type = "array",
properties = {
items = {
properties = {
name = {type = "string"},
key = {type = "string"},
role = {type = "string"},
}
}
}
},
},
required = {"apisix", "deployment"},
admin_listen = {
properties = {
listen = { type = "string" },
port = { type = "integer" },
},
default = {
listen = "0.0.0.0",
port = 9180,
}
},
https_admin = {
type = "boolean",
},
admin_key_required = {
type = "boolean",
},
}
}

-- local deployment_schema = {
-- traditional = {
-- properties = {
-- etcd = etcd_schema,
-- admin = admin_schema,
-- role_traditional = {
-- properties = {
-- config_provider = {
-- enum = {"etcd"}
-- },
-- },
-- required = {"config_provider"}
-- }
-- },
-- required = {"etcd"}
-- },
-- control_plane = {
-- properties = {
-- etcd = etcd_schema,
-- admin = admin_schema,
-- role_control_plane = {
-- properties = {
-- config_provider = {
-- enum = {"etcd"}
-- },
-- },
-- required = {"config_provider"}
-- },
-- },
-- required = {"etcd", "role_control_plane"}
-- },
-- data_plane = {
-- properties = {
-- etcd = etcd_schema,
-- role_data_plane = {
-- properties = {
-- config_provider = {
-- enum = {"etcd", "yaml", "xds"}
-- },
-- },
-- required = {"config_provider"}
-- },
-- },
-- required = {"role_data_plane"}
-- }
-- }
local deployment_schema = {
traditional = {
properties = {
etcd = etcd_schema,
admin = admin_schema,
role_traditional = {
properties = {
config_provider = {
enum = {"etcd"}
},
},
required = {"config_provider"}
}
},
required = {"etcd"}
},
control_plane = {
properties = {
etcd = etcd_schema,
admin = admin_schema,
role_control_plane = {
properties = {
config_provider = {
enum = {"etcd"}
},
},
required = {"config_provider"}
},
},
required = {"etcd", "role_control_plane"}
},
data_plane = {
properties = {
etcd = etcd_schema,
role_data_plane = {
properties = {
config_provider = {
enum = {"etcd", "yaml", "xds"}
},
},
required = {"config_provider"}
},
},
required = {"role_data_plane"}
}
}


function _M.validate(yaml_conf)
Expand All @@ -518,12 +427,12 @@ function _M.validate(yaml_conf)
end
end

-- local role = yaml_conf.deployment.role
-- local validator = jsonschema.generate_validator(deployment_schema[role])
-- local ok, err = validator(yaml_conf.deployment)
-- if not ok then
-- return false, "invalid deployment " .. role .. " configuration: " .. err
-- end
local role = yaml_conf.deployment.role
local validator = jsonschema.generate_validator(deployment_schema[role])
local ok, err = validator(yaml_conf.deployment)
if not ok then
return false, "invalid deployment " .. role .. " configuration: " .. err
end

return true
end
Expand Down

0 comments on commit bf8bdb8

Please sign in to comment.