feat(db) move ssl_cert schema to new db

Kong · Apr 5, 2018 · 25c7205 · 25c7205
1 parent 9cfdaca
commit 25c7205
Show file tree

Hide file tree

Showing 30 changed files with 1,176 additions and 2,615 deletions.
diff --git a/kong-0.13.0-0.rockspec b/kong-0.13.0-0.rockspec
@@ -86,7 +86,6 @@ build = {
     ["kong.api.routes.cache"] = "kong/api/routes/cache.lua",
     ["kong.api.routes.upstreams"] = "kong/api/routes/upstreams.lua",
     ["kong.api.routes.certificates"] = "kong/api/routes/certificates.lua",
-    ["kong.api.routes.snis"] = "kong/api/routes/snis.lua",
 
     ["kong.tools.ip"] = "kong/tools/ip.lua",
     ["kong.tools.ciphers"] = "kong/tools/ciphers.lua",
@@ -114,8 +113,6 @@ build = {
     ["kong.dao.schemas.plugins"] = "kong/dao/schemas/plugins.lua",
     ["kong.dao.schemas.upstreams"] = "kong/dao/schemas/upstreams.lua",
     ["kong.dao.schemas.targets"] = "kong/dao/schemas/targets.lua",
-    ["kong.dao.schemas.ssl_certificates"] = "kong/dao/schemas/ssl_certificates.lua",
-    ["kong.dao.schemas.ssl_servers_names"] = "kong/dao/schemas/ssl_servers_names.lua",
     ["kong.dao.db"] = "kong/dao/db/init.lua",
     ["kong.dao.db.cassandra"] = "kong/dao/db/cassandra.lua",
     ["kong.dao.db.postgres"] = "kong/dao/db/postgres.lua",
@@ -129,9 +126,13 @@ build = {
     ["kong.db"] = "kong/db/init.lua",
     ["kong.db.errors"] = "kong/db/errors.lua",
     ["kong.db.dao"] = "kong/db/dao/init.lua",
+    ["kong.db.dao.certificates"] = "kong/db/dao/certificates.lua",
+    ["kong.db.dao.server_names"] = "kong/db/dao/server_names.lua",
     ["kong.db.schema"] = "kong/db/schema/init.lua",
     ["kong.db.schema.entities.routes"] = "kong/db/schema/entities/routes.lua",
     ["kong.db.schema.entities.services"] = "kong/db/schema/entities/services.lua",
+    ["kong.db.schema.entities.certificates"] = "kong/db/schema/entities/certificates.lua",
+    ["kong.db.schema.entities.server_names"] = "kong/db/schema/entities/server_names.lua",
     ["kong.db.schema.entity"] = "kong/db/schema/entity.lua",
     ["kong.db.schema.metaschema"] = "kong/db/schema/metaschema.lua",
     ["kong.db.schema.typedefs"] = "kong/db/schema/typedefs.lua",

diff --git a/kong/api/endpoints.lua b/kong/api/endpoints.lua
@@ -20,6 +20,8 @@ local ERRORS_HTTP_CODES = {
   [Errors.codes.NOT_FOUND]             = 404,
   [Errors.codes.INVALID_OFFSET]        = 400,
   [Errors.codes.DATABASE_ERROR]        = 500,
+  [Errors.codes.CONFLICTING_INPUT]     = 409,
+  [Errors.codes.INVALID_INPUT]         = 400,
 }
 
 

diff --git a/kong/api/init.lua b/kong/api/init.lua
@@ -212,8 +212,7 @@ ngx.log(ngx.DEBUG, "Loading Admin API endpoints")
 
 
 -- Load core routes
-for _, v in ipairs({"kong", "apis", "consumers", "plugins", "cache",
-                    "certificates", "snis", "upstreams"}) do
+for _, v in ipairs({"kong", "apis", "consumers", "plugins", "cache", "upstreams"}) do
   local routes = require("kong.api.routes." .. v)
   attach_routes(routes)
 end