kumonos 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2581091b45b53fbcacb1b26293b715c524d886c9775b5a5af48b00f953e83f68
-  data.tar.gz: 68ebcc125e95f89a85fb3c912d9b8bd0fbb6cf744cca347eb49b347be6848006
+  metadata.gz: 9e7070e4162b72c093348a198456d59682ad8019d7ab77edb4448e30fd1aee84
+  data.tar.gz: b6b3f5464006a2555fb71d3fe1d227455894eb6e7efe71bc14ce5b1f663eb419
 SHA512:
-  metadata.gz: a328fbd273b35cd4751c1e1c5854c145b425fb136f94eb7ed65be6f5b2ab2045f424ba71f03fb75c909f1fe684ce6ae0cafe0d34c4f8eda9df254ae6f5f96d58
-  data.tar.gz: 061a882a9f16ae03b0b6d7510fc5ec07960a0287e04e33bdd5ad0a343aecde06024007f3d5e763560e791a21722899e509b5871ad1def46cb42f329b22ad0074
+  metadata.gz: f640d12d6cbd6a96f5bb244eedbbaead132a512523ee5f062999be4ab8b2a59ef23523b8d0fea781a4c296c6be25a2835b14bf19099c136e8fc5dd25262edbc2
+  data.tar.gz: 632ffbb8c34d46f08747f21c2ca5122f163ddc567b302dbda47e5e4d475640485cf7c49df6cb878d2d6787b458bbf77918668625d79c7193e02e1413cef8247c

data/.rubocop.yml

@@ -20,3 +20,7 @@ Metrics/AbcSize:
   Enabled: false
 Naming/UncommunicativeMethodParamName:
   Enabled: false
+Style/EmptyElse:
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Enabled: false

data/example/book.jsonnet

@@ -2,41 +2,46 @@ local circuit_breaker = import 'circuit_breaker.libsonnet';
 local routes = import 'routes.libsonnet';
 
 {
-    version: 1,
-    dependencies: [
+  version: 1,
+  dependencies: [
+    {
+      name: 'user',
+      cluster_name: 'user-development',
+      lb: 'user-app:8080',
+      host_header: 'user-service',
+      tls: false,
+      connect_timeout_ms: 250,
+      routes: [
         {
-            name: "user",
-            cluster_name: "user-development",
-            lb: "user-app:8080",
-            host_header: "user-service",
-            tls: false,
-            connect_timeout_ms: 250,
-            circuit_breaker: circuit_breaker,
-            routes: [routes.root],
+          path: '/ping',
+          timeout_ms: 100,
         },
+        routes.root,
+      ],
+    },
+    {
+      name: 'ab-testing',
+      cluster_name: 'ab-testing-development',
+      sds: true,
+      tls: false,
+      connect_timeout_ms: 250,
+      circuit_breaker: circuit_breaker,
+      outlier_detection: {
+        consecutive_5xx: 3,
+      },
+      routes: [
+        routes.root,
         {
-            name: "ab-testing",
-            cluster_name: "ab-testing-development",
-            sds: true,
-            tls: false,
-            connect_timeout_ms: 250,
-            circuit_breaker: circuit_breaker,
-            outlier_detection: {
-              consecutive_5xx: 3,
-            },
-            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,
-                    },
-                },
-            ],
+          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/clusters.rb

@@ -16,16 +16,21 @@ module Kumonos
         def build(h)
           use_sds = h.fetch('sds', false)
           lb = use_sds ? nil : h.fetch('lb')
-          if lb && lb.split(':').size != 2
-            raise "Invalid format in `lb` value. Must be \"${host}:${port}\" format: #{lb}"
-          end
+          raise "Invalid format in `lb` value. Must be \"${host}:${port}\" format: #{lb}" if lb && lb.split(':').size != 2
+
+          circuit_breaker =
+            if h.key?('circuit_breaker')
+              CircuitBreaker.build(h.fetch('circuit_breaker'))
+            else
+              nil
+            end
 
           new(
             h.fetch('cluster_name'),
             h.fetch('connect_timeout_ms'),
             lb,
             h.fetch('tls'),
-            CircuitBreaker.build(h.fetch('circuit_breaker')),
+            circuit_breaker,
             OutlierDetection.build(h['outlier_detection']), # optional
             use_sds
           )
@@ -54,7 +59,7 @@ module Kumonos
         end
 
         h.delete(:circuit_breaker)
-        h[:circuit_breakers] = { default: circuit_breaker.to_h }
+        h[:circuit_breakers] = { default: circuit_breaker.to_h } if circuit_breaker
 
         if outlier_detection
           h[:outlier_detection] = outlier_detection.to_h

data/lib/kumonos/routes.rb

@@ -26,8 +26,10 @@ module Kumonos
       def to_h
         h = super
         h[:routes] = routes.flat_map do |r|
+          if r.retry_policy.nil?
+            [r.to_h]
           # i.e. retry with gRPC request (HTTP POST)
-          if r.method
+          elsif r.method
             [r.to_h_with_retry]
           else
             [r.to_h_with_retry, r.to_h]
@@ -40,8 +42,15 @@ module Kumonos
     Route = Struct.new(:prefix, :path, :method, :cluster, :timeout_ms, :retry_policy, :host_header) do
       class << self
         def build(h, cluster, host_header)
+          retry_policy =
+            if h.key?('retry_policy')
+              RetryPolicy.build(h.fetch('retry_policy'))
+            else
+              nil
+            end
+
           new(h['prefix'], h['path'], h['method'], cluster, h.fetch('timeout_ms'),
-              RetryPolicy.build(h.fetch('retry_policy')), host_header)
+              retry_policy, host_header)
         end
       end
 
@@ -72,13 +81,11 @@ module Kumonos
       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[:retry_policy] = retry_policy.to_h if retry_policy
 
         if method
           m = method.upcase
-          unless ALLOWED_METHODS.include?(m)
-            raise "method must be one of #{ALLOWED_METHODS.join(',')}: given `#{m}`"
-          end
+          raise "method must be one of #{ALLOWED_METHODS.join(',')}: given `#{m}`" unless ALLOWED_METHODS.include?(m)
 
           h[:headers] = [{ name: ':method', value: m, regex: false }]
         else

data/lib/kumonos/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kumonos
-  VERSION = '0.23.0'
+  VERSION = '0.24.0'
 end

data/lib/schemas/service_definition.json

@@ -26,7 +26,6 @@
           "cluster_name",
           "tls",
           "connect_timeout_ms",
-          "circuit_breaker",
           "routes"
         ],
         "properties": {
@@ -100,8 +99,7 @@
               "id": "/properties/dependencies/items/properties/routes/items",
               "additionalProperties": true,
               "required": [
-                "timeout_ms",
-                "retry_policy"
+                "timeout_ms"
               ],
               "properties": {
                 "prefix": {

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-24 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema