feature: new data model first steps (Routes & Services)

.ci/run_tests.sh

@@ -15,4 +15,10 @@ elif [ "$TEST_SUITE" == "integration" ]; then
     make test-integration
 elif [ "$TEST_SUITE" == "plugins" ]; then
     make test-plugins
+elif [ "$TEST_SUITE" == "old-unit" ]; then
+    make old-test
+elif [ "$TEST_SUITE" == "old-integration" ]; then
+    make old-test-integration
+elif [ "$TEST_SUITE" == "old-plugins" ]; then
+    make old-test-plugins
 fi

.luacheckrc

@@ -23,6 +23,7 @@ ignore = {
 
 exclude_files = {
     "spec/fixtures/invalid-module.lua",
+    "spec-old-api/fixtures/invalid-module.lua",
 }
 
 
@@ -38,3 +39,7 @@ files["kong/plugins/ldap-auth/*.lua"] = {
 files["spec/**/*.lua"] = {
     std = "ngx_lua+busted",
 }
+
+files["spec-old-api/**/*.lua"] = {
+    std = "ngx_lua+busted",
+}

.travis.yml

@@ -21,7 +21,7 @@ env:
   global:
     - LUAROCKS=2.4.3
     - OPENSSL=1.0.2n
-    - CASSANDRA=2.2.8
+    - CASSANDRA=3.9
     - OPENRESTY_BASE=1.11.2.5
     - OPENRESTY_LATEST=1.13.6.1
     - OPENRESTY=$OPENRESTY_BASE
@@ -30,16 +30,21 @@ env:
   matrix:
     - TEST_SUITE=lint
     - TEST_SUITE=unit
-    - TEST_SUITE=integration
-      OPENRESTY=$OPENRESTY_BASE
-    - TEST_SUITE=plugins
-      OPENRESTY=$OPENRESTY_BASE
     - TEST_SUITE=integration
       OPENRESTY=$OPENRESTY_LATEST
-      CASSANDRA=3.9
     - TEST_SUITE=plugins
       OPENRESTY=$OPENRESTY_LATEST
-      CASSANDRA=3.9
+    - TEST_SUITE=integration
+      OPENRESTY=$OPENRESTY_BASE
+      CASSANDRA=2.2
+    - TEST_SUITE=plugins
+      OPENRESTY=$OPENRESTY_BASE
+      CASSANDRA=2.2
+    - TEST_SUITE=old-unit
+    - TEST_SUITE=old-integration
+      OPENRESTY=$OPENRESTY_BASE
+    - TEST_SUITE=old-plugins
+      OPENRESTY=$OPENRESTY_BASE
 
 before_install:
   - source .ci/setup_env.sh

Makefile

@@ -39,3 +39,15 @@ test-plugins:
 
 test-all:
 	@$(TEST_CMD) spec/
+
+old-test:
+	@$(TEST_CMD) spec-old-api/01-unit
+
+old-test-integration:
+	@$(TEST_CMD) spec-old-api/02-integration
+
+old-test-plugins:
+	@$(TEST_CMD) spec-old-api/03-plugins
+
+old-test-all:
+	@$(TEST_CMD) spec-old-api/

kong-0.12.1-0.rockspec

@@ -74,11 +74,15 @@ build = {
 
     ["kong.api"] = "kong/api/init.lua",
     ["kong.api.api_helpers"] = "kong/api/api_helpers.lua",
+    ["kong.api.arguments"] = "kong/api/arguments.lua",
     ["kong.api.crud_helpers"] = "kong/api/crud_helpers.lua",
+    ["kong.api.endpoints"] = "kong/api/endpoints.lua",
     ["kong.api.routes.kong"] = "kong/api/routes/kong.lua",
     ["kong.api.routes.apis"] = "kong/api/routes/apis.lua",
     ["kong.api.routes.consumers"] = "kong/api/routes/consumers.lua",
     ["kong.api.routes.plugins"] = "kong/api/routes/plugins.lua",
+    ["kong.api.routes.routes"] = "kong/api/routes/routes.lua",
+    ["kong.api.routes.services"] = "kong/api/routes/services.lua",
     ["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",
@@ -96,6 +100,7 @@ build = {
     ["kong.core.handler"] = "kong/core/handler.lua",
     ["kong.core.certificate"] = "kong/core/certificate.lua",
     ["kong.core.router"] = "kong/core/router.lua",
+    ["kong.core.api_router"] = "kong/core/api_router.lua",
     ["kong.core.plugins_iterator"] = "kong/core/plugins_iterator.lua",
     ["kong.core.reports"] = "kong/core/reports.lua",
     ["kong.core.error_handlers"] = "kong/core/error_handlers.lua",
@@ -121,6 +126,24 @@ build = {
     ["kong.dao.migrations.cassandra"] = "kong/dao/migrations/cassandra.lua",
     ["kong.dao.migrations.postgres"] = "kong/dao/migrations/postgres.lua",
 
+    ["kong.db"] = "kong/db/init.lua",
+    ["kong.db.errors"] = "kong/db/errors.lua",
+    ["kong.db.dao"] = "kong/db/dao/init.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.entity"] = "kong/db/schema/entity.lua",
+    ["kong.db.schema.metaschema"] = "kong/db/schema/metaschema.lua",
+    ["kong.db.schema.typedefs"] = "kong/db/schema/typedefs.lua",
+    ["kong.db.strategies"] = "kong/db/strategies/init.lua",
+    ["kong.db.strategies.connector"] = "kong/db/strategies/connector.lua",
+    ["kong.db.strategies.cassandra"] = "kong/db/strategies/cassandra/init.lua",
+    ["kong.db.strategies.cassandra.connector"] = "kong/db/strategies/cassandra/connector.lua",
+    ["kong.db.strategies.cassandra.routes"] = "kong/db/strategies/cassandra/routes.lua",
+    ["kong.db.strategies.cassandra.services"] = "kong/db/strategies/cassandra/services.lua",
+    ["kong.db.strategies.postgres"] = "kong/db/strategies/postgres/init.lua",
+    ["kong.db.strategies.postgres.connector"] = "kong/db/strategies/postgres/connector.lua",
+
     ["kong.plugins.base_plugin"] = "kong/plugins/base_plugin.lua",
 
     ["kong.plugins.basic-auth.migrations.cassandra"] = "kong/plugins/basic-auth/migrations/cassandra.lua",

kong/api/api_helpers.lua

@@ -1,9 +1,11 @@
 local pl_string = require "pl.stringx"
 local utils = require "kong.tools.utils"
+local url = require "socket.url"
 
 local type = type
 local pairs = pairs
 local remove = table.remove
+local tonumber = tonumber
 
 local _M = {}
 
@@ -49,9 +51,15 @@ function _M.normalize_nested_params(obj)
     end
 
     -- normalize sub-keys with dot notation
-    local keys = pl_string.split(k, ".")
-    if #keys > 1 then -- we have a key containing a dot
-      attach_dotted_key(keys, new_obj, parse_value(v))
+    if type(k) == "string" then
+      local keys = pl_string.split(k, ".")
+      if #keys > 1 then -- we have a key containing a dot
+        attach_dotted_key(keys, new_obj, parse_value(v))
+
+      else
+        new_obj[k] = parse_value(v) -- nothing special with that key, simply attaching the value
+      end
+
     else
       new_obj[k] = parse_value(v) -- nothing special with that key, simply attaching the value
     end
@@ -60,4 +68,18 @@ function _M.normalize_nested_params(obj)
   return new_obj
 end
 
+
+function _M.resolve_url_params(self)
+  local sugar_url = self.args.post.url
+  if sugar_url then
+    local parsed_url        = url.parse(sugar_url)
+    self.args.post.protocol = parsed_url.scheme
+    self.args.post.host     = parsed_url.host
+    self.args.post.port     = tonumber(parsed_url.port) or parsed_url.port
+    self.args.post.path     = parsed_url.path
+    self.args.post.url      = nil
+  end
+end
+
+
 return _M