Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(router) rename atc to expression #9263

Merged
merged 8 commits into from
Aug 24, 2022
Merged

chore(router) rename atc to expression #9263

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b7fee1f
rename atc to expression
chronolaw Aug 18, 2022
20c2d5d
rename DSL to expression
chronolaw Aug 18, 2022
3411663
change error message
chronolaw Aug 18, 2022
4d134f6
schema rename atc to expressions
chronolaw Aug 23, 2022
709ffc1
migrations rename atc to expressions
chronolaw Aug 23, 2022
b39ba83
rename expression in db
chronolaw Aug 23, 2022
dc3abed
use route.expression
chronolaw Aug 23, 2022
6e197ad
route_flavor uses expressions
chronolaw Aug 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion kong/conf_loader/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ local CONF_INFERENCES = {
}
},
router_flavor = {
enum = { "traditional", "traditional_compatible", "atc" },
enum = { "traditional", "traditional_compatible", "expression" },
chronolaw marked this conversation as resolved.
Show resolved Hide resolved
},
worker_state_update_frequency = { typ = "number" },

Expand Down
4 changes: 2 additions & 2 deletions kong/db/schema/entities/routes.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ local atc = require("kong.router.atc")
local router = require("resty.router.router")


if kong and kong.configuration and kong.configuration.router_flavor == "atc" then
if kong and kong.configuration and kong.configuration.router_flavor == "expression" then
return {
name = "routes",
primary_key = { "id" },
Expand Down Expand Up @@ -50,7 +50,7 @@ if kong and kong.configuration and kong.configuration.router_flavor == "atc" the

local res, err = r:add_matcher(0, entity.id, entity.atc)
if not res then
return nil, "DSL failed validation: " .. err
return nil, "expression failed validation: " .. err
chronolaw marked this conversation as resolved.
Show resolved Hide resolved
end

return true
Expand Down
2 changes: 1 addition & 1 deletion kong/db/schema/entities/routes_subschemas.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ local grpc_subschema = {
}


if kong and kong.configuration and kong.configuration.router_flavor == "atc" then
if kong and kong.configuration and kong.configuration.router_flavor == "expression" then
return {}

else
Expand Down