chore/uuid

.travis.yml

@@ -2,7 +2,7 @@ language: erlang
 
 env:
   global:
-    - CASSANDRA_VERSION=2.1.10
+    - CASSANDRA_VERSION=2.1.11
   matrix:
     - LUA=lua5.1
 

CHANGELOG.md

@@ -1,5 +1,20 @@
 ## [Unreleased][unreleased]
 
+### Added
+
+- Added a `total` field in API responses, that counts the total number of entities in the table. [#635](https://github.com/Mashape/kong/pull/635)
+- You can now specify a custom DNS resolver address that Kong will use when resolving hostnames. [#625](https://github.com/Mashape/kong/pull/635)
+
+### Changed
+
+- Removed the `dnsmasq_port` property, and introduced `dns_resolver` that also allows to specify a custom DNS server. [#625](https://github.com/Mashape/kong/pull/635)
+- The `/status` endpoint now includes `database` statistics, while the previous stats have been moved to a `server` field. [#635](https://github.com/Mashape/kong/pull/635)
+- Disabled access logs for `/status` endpoint
+
+### Fixed
+
+- In the API, the `next` link is not being displayed anymore if there are no more entities to return. [#635](https://github.com/Mashape/kong/pull/635)
+
 ## [0.5.2] - 2015/10/21
 
 A few fixes requested by the community!

kong-0.5.2-1.rockspec

@@ -14,10 +14,10 @@ dependencies = {
   "lua ~> 5.1",
   "luasec ~> 0.5-2",
 
-  "uuid ~> 0.2-1",
+  "lua_uuid ~> 0.1-2",
   "luatz ~> 0.3-1",
-  "yaml ~> 1.1.1-1",
-  "lapis ~> 1.1.0-1",
+  "yaml ~> 1.1.2-1",
+  "lapis ~> 1.3.0-1",
   "stringy ~> 0.4-1",
   "lua-cassandra ~> 0.3.6-0",
   "multipart ~> 0.2-1",
@@ -27,8 +27,8 @@ dependencies = {
   "lbase64 ~> 20120820-1",
   "lua-resty-iputils ~> 0.2.0-1",
 
-  "luasocket ~> 2.0.2-5",
-  "lrexlib-pcre ~> 2.7.2-1",
+  "luasocket ~> 2.0.2-6",
+  "lrexlib-pcre ~> 2.8.0-1",
   "lua-llthreads2 ~> 0.1.3-1",
   "luacrypto >= 0.3.2-1"
 }
@@ -70,6 +70,9 @@ build = {
     ["kong.tools.migrations"] = "kong/tools/migrations.lua",
     ["kong.tools.http_client"] = "kong/tools/http_client.lua",
     ["kong.tools.database_cache"] = "kong/tools/database_cache.lua",
+    ["kong.tools.config_defaults"] = "kong/tools/config_defaults.lua",
+    ["kong.tools.config_loader"] = "kong/tools/config_loader.lua",
+    ["kong.tools.dao_loader"] = "kong/tools/dao_loader.lua",
 
     ["kong.resolver.handler"] = "kong/resolver/handler.lua",
     ["kong.resolver.access"] = "kong/resolver/access.lua",

kong.yml

@@ -1,70 +1,144 @@
-## Available plugins on this server
-plugins_available:
-  - ssl
-  - jwt
-  - acl
-  - cors
-  - oauth2
-  - tcp-log
-  - udp-log
-  - file-log
-  - http-log
-  - key-auth
-  - hmac-auth
-  - basic-auth
-  - ip-restriction
-  - mashape-analytics
-  - request-transformer
-  - response-transformer
-  - request-size-limiting
-  - rate-limiting
-  - response-ratelimiting
-
-## The Kong working directory
-## (Make sure you have read and write permissions)
-nginx_working_dir: /usr/local/kong/
-
-## Port configuration
-proxy_port: 8000
-proxy_ssl_port: 8443
-admin_api_port: 8001
-
-## Secondary port configuration
-dnsmasq_port: 8053
-
-## Specify the DAO to use
-database: cassandra
-
-## Databases configuration
-databases_available:
-  cassandra:
-    properties:
-      contact_points:
-        - "localhost:9042"
-      timeout: 1000
-      keyspace: kong
-      keepalive: 60000 # in milliseconds
-      # ssl: false
-      # ssl_verify: false
-      # ssl_certificate: "/path/to/cluster-ca-certificate.pem"
-      # user: cassandra
-      # password: cassandra
-
-## Cassandra cache configuration
-database_cache_expiration: 5 # in seconds
-
-## SSL Settings
-## (Uncomment the two properties below to set your own certificate)
+######
+## Kong configuration file. All commented values are default values.
+## Uncomment and update a value to configure Kong to your needs.
+##
+## Lines starting with `##` are comments.
+## Lines starting with `#` are properties that can be updated.
+## Beware of YAML formatting for nested properties.
+
+######
+## Plugins that this node needs to execute.
+## By default, Kong will try to execute all installed plugins on every request.
+## If you are sure to only use a few plugins, uncomment and update this property to contain
+## only those.
+## Custom plugins also need to be added to this list.
+# plugins_available:
+#   - ssl
+#   - jwt
+#   - ...
+
+######
+## The Kong working directory. Equivalent to nginx's prefix path.
+## This is where this running nginx instance will keep server files including logs.
+## Make sure it has the appropriate permissions.
+# nginx_working_dir: /usr/local/kong/
+
+######
+## Port which Kong proxies HTTP requests through, consumers will make requests against this port
+## so make sure it is publicly available.
+# proxy_port: 8000
+
+######
+## Same as proxy_port, but for HTTPS requests.
+# proxy_ssl_port: 8443
+
+######
+## Specify how Kong performs DNS resolution (in the `dns_resolvers_available` property) you want to use.
+## Options are: "dnsmasq" (You will need dnsmasq to be installed) or "server".
+# dns_resolver: dnsmasq
+
+######
+## DNS resolvers configuration. Specify a DNS server or the port on which you want
+## dnsmasq to run.
+# dns_resolvers_available:
+  # server:
+    # address: "8.8.8.8:53"
+  # dnsmasq:
+    # port: 8053
+
+######
+## Port on which the admin API will listen to. The admin API is a private API which lets you
+## manage your Kong infrastructure. It needs to be secured appropriatly.
+# admin_api_port: 8001
+
+######
+## Specify which database to use from the databases_available property.
+# database: cassandra
+
+######
+## Databases configuration.
+# databases_available:
+  # cassandra:
+    ######
+    ## Contact points to your Cassandra cluster.
+    # contact_points:
+    #   - "localhost:9042"
+
+    # timeout: 1000
+
+    # keyspace: kong
+
+    ######
+    ## Time (in milliseconds) for which sockets will be keep alive.
+    ## for being eventually re-used before being closed.
+    # keepalive: 60000
+
+    ######
+    ## Keyspace options. Set those before running Kong or any migration.
+    ## Those settings will be used to create a keyspace with the desired options
+    ## when first running the migrations.
+    ## See http://docs.datastax.com/en/cql/3.1/cql/cql_reference/create_keyspace_r.html
+
+    ######
+    ## The name of the replica placement strategy class for the new keyspace.
+    ## Can be "SimpleStrategy" or "NetworkTopologyStrategy".
+    # replication_strategy: SimpleStrategy
+
+    ######
+    ## For SimpleStrategy only.
+    ## The number of replicas of data on multiple nodes.
+    # replication_factor: 1
+
+    ######
+    ## For NetworkTopologyStrategy only.
+    ## The number of replicas of data on multiple nodes in each data center.
+    # data_centers:
+    #   dc1: 2
+    #   dc2: 3
+
+    ######
+    ## If true, will enable client-to-node encryption.
+    # ssl: false
+
+    ######
+    ## If true, will verify the SSL certificate in use.
+    ## `ssl_certificate` must be provided.
+    # ssl_verify: false
+
+    ######
+    ## **Absolute path** to the certificate authority file for your cluster.
+    # ssl_certificate: "/path/to/cluster-ca-certificate.pem"
+
+    ######
+    ## If the cluster as authentication enabled, provide a user and a password here.
+    # user: cassandra
+    # password: cassandra
+
+######
+## Time (in seconds) for which entities from the database (APIs, plugins configurations...)
+## are cached by Kong. Increase this value if you want to lower the number of requests made
+## to your database.
+# database_cache_expiration: 5
+
+######
+## SSL certificates to use.
 # ssl_cert_path: /path/to/certificate.pem
 # ssl_key_path: /path/to/certificate.key
 
-## Sends anonymous error reports
-send_anonymous_reports: true
+######
+## Sending anonymous error reports helps Kong developers to understand how it performs.
+# send_anonymous_reports: true
 
-## In-memory cache size (MB)
-memory_cache_size: 128
+######
+## Size (in MB) of the Lua cache. This value may not be smaller than 32MB.
+# memory_cache_size: 128
 
-## Nginx configuration
+######
+## The nginx configuration file which allows Kong to run.
+## The placeholders will be computed and this property will be written as a file
+## by Kong at `<nginx_working_dir>/nginx.conf` during startup.
+## This file can tweaked to some extent, but many directives are necessary for Kong to work.
+## /!\ BE CAREFUL
 nginx: |
   worker_processes auto;
   error_log logs/error.log error;
@@ -207,6 +281,7 @@ nginx: |
 
       location /nginx_status {
         internal;
+        access_log off;
         stub_status;
       }
 

kong/api/crud_helpers.lua

@@ -51,22 +51,36 @@ function _M.paginated_set(self, dao_collection)
     return app_helpers.yield_error(err)
   end
 
+  local total, err = dao_collection:count_by_keys(self.params)
+  if err then
+    return app_helpers.yield_error(err)
+  end
+
   local next_url
   if data.next_page then
-    next_url = self:build_url(self.req.parsed_url.path, {
-      port = self.req.parsed_url.port,
-      query = ngx.encode_args({
-                offset = ngx.encode_base64(data.next_page),
-                size = size
-              })
-    })
+    -- Parse next URL, if there are no elements then don't append it
+    local next_total, err = dao_collection:count_by_keys(self.params, data.next_page)
+    if err then
+      return app_helpers.yield_error(err)
+    end
+
+    if next_total > 0 then
+      next_url = self:build_url(self.req.parsed_url.path, {
+        port = self.req.parsed_url.port,
+        query = ngx.encode_args({
+                  offset = ngx.encode_base64(data.next_page),
+                  size = size
+                })
+      })
+    end
+
     data.next_page = nil
   end
 
   -- This check is required otherwise the response is going to be a
   -- JSON Object and not a JSON array. The reason is because an empty Lua array `{}`
   -- will not be translated as an empty array by cjson, but as an empty object.
-  local result = #data == 0 and "{\"data\":[]}" or {data=data, ["next"]=next_url}
+  local result = #data == 0 and "{\"data\":[],\"total\":0}" or {data=data, ["next"]=next_url, total=total}  
 
   return responses.send_HTTP_OK(result, type(result) ~= "table")
 end

kong/api/routes/kong.lua

@@ -25,7 +25,21 @@ return {
     GET = function(self, dao, helpers)
       local res = ngx.location.capture("/nginx_status")
       if res.status == 200 then
-        return helpers.responses.send_HTTP_OK(route_helpers.parse_status(res.body))
+
+        local status_response = {
+          server = route_helpers.parse_status(res.body),
+          database = {}
+        }
+
+        for k, v in pairs(dao.daos) do
+          local count, err = v:count_by_keys()
+          if err then
+            return helpers.responses.send_HTTP_INTERNAL_SERVER_ERROR(err)
+          end
+          status_response.database[k] = count
+        end
+
+        return helpers.responses.send_HTTP_OK(status_response)
       else
         return helpers.responses.send_HTTP_INTERNAL_SERVER_ERROR(res.body)
       end