kumonos 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9d8e70b585fb2808b2d3f92d44595ad1662230c4c15f7f3d653b0385ceb98e1
-  data.tar.gz: 97df76a08e71b7f9297a89a0354d96beaefc21471bdd4e4a612fb45980f8b638
+  metadata.gz: 5ad34c03f753a4743846d5133b14ce0ac2d932a4ff1c2cf1a7cceb7933763ab9
+  data.tar.gz: 1b2bf98aab7f7adbc5fcaee56a875b6c54d8bd394c68ee162d62edeaaf8438e6
 SHA512:
-  metadata.gz: 82ebb28e772af08d06f014223711bd81f6e43fed8259c9f41834ced770cbe2882e2dcb2ecbf5ec5bf3602b3de30440e54d0a806c9e8b9b8e24abb05f43cd88b4
-  data.tar.gz: ceebdbab976f00c99b3717168451a52c6ebba6d70c841d8a319c71a548b908d2ec9022d233d3da61c567e31a749eddcb2d5242b788d01243afc025ffd07a8bfd
+  metadata.gz: e1eb30a96aada1267584b1582d844df9adea466d04efca71f9c29fb85026232a53c8b98df73e7cb8352088db753f70f82adfdf2b95eb031aa9d563749f49d90c
+  data.tar.gz: f46169d86632de1a48b24960739d659da3fc4f16d9f85b895f8539379c63524b287a2385d80da1dc20142725b00b7d535e159bc585759a04fdb2518401b13029

data/example/book.jsonnet

@@ -21,7 +21,19 @@ local routes = import 'routes.libsonnet';
             tls: false,
             connect_timeout_ms: 250,
             circuit_breaker: circuit_breaker,
-            routes: [routes.root],
+            routes: [
+                routes.root,
+                {
+                    path: '/grpc.health.v1.Health/Check',
+                    method: 'POST',
+                    timeout_ms: 3000,
+                    retry_policy: {
+                        retry_on: '5xx,connect-failure,refused-stream,cancelled,deadline-exceeded,resource-exhausted',
+                        num_retries: 3,
+                        per_try_timeout_ms: 700,
+                    },
+                },
+            ],
         },
     ],
 }

data/lib/kumonos/routes.rb

@@ -23,15 +23,23 @@ module Kumonos
 
       def to_h
         h = super
-        h[:routes] = routes.flat_map { |r| [r.to_h_with_retry, r.to_h] }
+        h[:routes] = routes.flat_map do |r|
+          # i.e. retry with gRPC request (HTTP POST)
+          if r.method
+            [r.to_h_with_retry]
+          else
+            [r.to_h_with_retry, r.to_h]
+          end
+        end
         h
       end
     end
 
-    Route = Struct.new(:prefix, :cluster, :timeout_ms, :retry_policy, :host_header) do
+    Route = Struct.new(:prefix, :path, :method, :cluster, :timeout_ms, :retry_policy, :host_header) do
       class << self
         def build(h, cluster, host_header)
-          new(h.fetch('prefix'), cluster, h.fetch('timeout_ms'), RetryPolicy.build(h.fetch('retry_policy')), host_header)
+          new(h['prefix'], h['path'], h['method'], cluster, h.fetch('timeout_ms'),
+              RetryPolicy.build(h.fetch('retry_policy')), host_header)
         end
       end
 
@@ -39,6 +47,18 @@ module Kumonos
         h = super
         h.delete(:retry_policy)
         h.delete(:host_header)
+        h.delete(:method)
+
+        if prefix
+          h.delete(:path)
+          h[:prefix] = prefix
+        elsif path
+          h.delete(:prefix)
+          h[:path] = path
+        else
+          raise '`path` or `prefix` is required'
+        end
+
         if host_header
           h[:host_rewrite] = host_header
         else
@@ -47,10 +67,22 @@ module Kumonos
         h
       end
 
+      ALLOWED_METHODS = %w[GET HEAD POST PUT DELETE].freeze
       def to_h_with_retry
         h = to_h
         h[:retry_policy] = retry_policy.to_h
-        h[:headers] = [{ name: ':method', value: '(GET|HEAD)', regex: true }]
+
+        if method
+          m = method.upcase
+          unless ALLOWED_METHODS.include?(m)
+            raise "method must be one of #{ALLOWED_METHODS.join(',')}: given `#{m}`"
+          end
+
+          h[:headers] = [{ name: ':method', value: m, regex: false }]
+        else
+          h[:headers] = [{ name: ':method', value: '(GET|HEAD)', regex: true }]
+        end
+
         h
       end
     end

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.18.0'.freeze
+  VERSION = '0.19.0'.freeze
 end

data/lib/schemas/service_definition.json

@@ -93,9 +93,8 @@
             "items": {
               "type": "object",
               "id": "/properties/dependencies/items/properties/routes/items",
-              "additionalProperties": false,
+              "additionalProperties": true,
               "required": [
-                "prefix",
                 "timeout_ms",
                 "retry_policy"
               ],
@@ -105,6 +104,16 @@
                   "id": "/properties/dependencies/items/properties/routes/items/properties/prefix",
                   "default": "/"
                 },
+                "path": {
+                  "type": "string",
+                  "id": "/properties/dependencies/items/properties/routes/items/properties/path",
+                  "default": "/"
+                },
+                "method": {
+                  "type": "string",
+                  "id": "/properties/dependencies/items/properties/routes/items/properties/method",
+                  "default": "/"
+                },
                 "timeout_ms": {
                   "type": "integer",
                   "id": "/properties/dependencies/items/properties/routes/items/properties/timeout_ms",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-11 00:00:00.000000000 Z
+date: 2018-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema