kumonos 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 163e9dfcdba83165a65628e04ecad8e020f493b0deb6d26b14dc6c85d1e2a6e4
-  data.tar.gz: 64b49206fe0a1dd889c2da1cc04765bd2876cf0290ba30085b684e71273ae607
+  metadata.gz: e8866f7cfcbde01b26ef5c101d1ddfb4fd99abbbc09268456e024b84a317acbf
+  data.tar.gz: ec4bdea0da8f1218218f016c00de3a7ed07c4badb10afc4218e3f976979f2392
 SHA512:
-  metadata.gz: 3837861679919253bfab280b0684c1b622a6c1d3defa0b3a8b322bc0e4e6019664f8516fd36dba903155493e26a964c41a33c939758411783f2298340cf24257
-  data.tar.gz: 3851392c16f44a9890001b7d309d6806c9ef504a6dee210cddea737ec79b875d41a78a9db263101faf659ccb30c1e9bec9b3d9504c429e24ab64c84ab912b6d9
+  metadata.gz: 717264d12963101864f6cecdd9a77a62567ea1ed31acc4236cb77ef94a311b056a02d912833dc2233d932bc50fbdde44bf9a3ee307c6d32be291ef6559e601a5
+  data.tar.gz: 0e7b504106524768b2114afab799730b90cb0d901b5c7f067f670e33fe82bc0047e981db1838dc464ec36055c23328732ce990007b8a9ffe17e546717618388b

data/example/example-fault-injection.yml

@@ -0,0 +1,29 @@
+version: 1
+listener:
+  address: tcp://0.0.0.0:9211
+  access_log_path: /dev/stdout
+  additional_http_filters:
+  - name: envoy.fault
+    config:
+      abort:
+        percent: 0
+        http_status: 503
+admin:
+  address: tcp://0.0.0.0:9901
+  access_log_path: /dev/stdout
+discovery_service:
+  lb: nginx:80
+  tls: false
+  refresh_delay_ms: 10000
+  connect_timeout_ms: 100
+sds:
+  lb: sds:8080
+  tls: false
+  refresh_delay_ms: 1000
+  connect_timeout_ms: 1500
+statsd:
+  address: statsd-exporter:9125
+runtime:
+  symlink_root: /srv/runtime/current
+  subdirectory: envoy
+  override_subdirectory: envoy_override

data/exe/kumonos

@@ -98,12 +98,14 @@ class KumonosCli < Thor
   def validate_envoy_definition!(h, path)
     result = Kumonos::Schemas.validate_envoy_definition(h)
     return if result.empty?
+
     warn_and_exit(result, path, Kumonos::Schemas::ENVOY_SCHEMA_PATH)
   end
 
   def validate_service_definition!(h, path)
     result = Kumonos::Schemas.validate_service_definition(h)
     return if result.empty?
+
     warn_and_exit(result, path, Kumonos::Schemas::SERVIVE_DEFINITION_PATH)
   end
 

data/lib/kumonos/envoy.rb

@@ -3,13 +3,15 @@
 module Kumonos
   # Generate envoy configuration.
   module Envoy
+    DEFAULT_HTTP_FILTERS = [{ name: 'envoy.router' }].freeze
+
     class << self
       def generate(definition, cluster:, node:)
         EnvoyConfig.build(definition, cluster: cluster, node: node).to_h
       end
     end
 
-    EnvoyConfig = Struct.new(:version, :discovery_service, :statsd, :listener, :admin, :cluster, :node, :sds) do
+    EnvoyConfig = Struct.new(:version, :discovery_service, :statsd, :listener, :admin, :cluster, :node, :sds, :runtime) do
       class << self
         def build(h, cluster:, node:)
           discovery_service = DiscoverService.build(h.fetch('discovery_service'))
@@ -22,7 +24,8 @@ module Kumonos
             Admin.build(h.fetch('admin')),
             cluster,
             node,
-            sds
+            sds,
+            h['runtime']
           )
         end
 
@@ -49,7 +52,9 @@ module Kumonos
         h.delete(:listener)
         h.delete(:cluster)
         h.delete(:node)
+        h.delete(:runtime)
         h[:admin] = admin.to_h
+        h[:runtime] = runtime.to_h if runtime
         h[:static_resources] = {
           listeners: [listener.to_h],
           clusters: [discovery_service.cluster.to_h, sds.cluster.to_h]
@@ -104,11 +109,11 @@ module Kumonos
       end
     end
 
-    Listener = Struct.new(:address, :access_log_path, :discovery_service) do
+    Listener = Struct.new(:address, :access_log_path, :discovery_service, :additional_http_filters) do
       class << self
         def build(h, discovery_service)
           address = AddressParser.call(h.fetch('address'))
-          new(address, h.fetch('access_log_path'), discovery_service)
+          new(address, h.fetch('access_log_path'), discovery_service, h['additional_http_filters'])
         end
       end
 
@@ -116,6 +121,10 @@ module Kumonos
         h = super
         h.delete(:discovery_service)
         h.delete(:access_log_path)
+        h.delete(:additional_http_filters)
+
+        http_filters = (additional_http_filters || []) + DEFAULT_HTTP_FILTERS
+
         h[:name] = 'egress'
         h[:filter_chains] = [
           {
@@ -144,7 +153,7 @@ module Kumonos
                     },
                     route_config_name: DEFAULT_ROUTE_NAME
                   },
-                  http_filters: [{ name: 'envoy.router' }]
+                  http_filters: http_filters
                 }
               }
             ]

data/lib/kumonos/version.rb

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

data/lib/schemas/envoy.json

@@ -32,6 +32,19 @@
         "access_log_path": {
           "type": "string",
           "id": "/properties/listener/properties/access_log_path"
+        },
+        "additional_http_filters": {
+          "type": "array",
+          "id": "/properties/listener/properties/additional_http_filters",
+          "additionalProperties": true,
+          "items": {
+            "type": "object",
+            "additionalProperties": true,
+            "required": [
+              "name",
+              "config"
+            ]
+          }
         }
       }
     },
@@ -125,6 +138,11 @@
           "id": "/properties/statsd/properties/address"
         }
       }
+    },
+    "runtime": {
+      "type": "object",
+      "id": "/properties/runtime",
+      "additionalProperties": true
     }
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-02 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -182,12 +182,13 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/bump
 - bin/console
 - bin/setup
-- bump
 - example/book.jsonnet
 - example/circuit_breaker.libsonnet
 - example/envoy_config.yml
+- example/example-fault-injection.yml
 - example/example-with-tls.yml
 - example/routes.libsonnet
 - exe/kumonos