kumonos 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3180e4389f67a7973e06cc18560503ebe4606e3a
-  data.tar.gz: 5e104c41129d76a4628cd02dcb68df71c3c55e36
+  metadata.gz: 19e7d2d1b04109039fbe3a9a4c36aa0edd9db1fe
+  data.tar.gz: bf27d37faee97d37fb4b970398b7fcbefc04645e
 SHA512:
-  metadata.gz: 551f54b256647e1b04e9c25e26d774b9a85f2d295b28628999fdc18ace1db1bb299534649382823bda7a5d8bd341d57c62e215fa95d8c464d003112d53e7e6e4
-  data.tar.gz: cc933fb394e59ef965612a90f20ed3df3af1f9f12ffe590fed577f38db6c84783952003630d96f9e87491884d424ccd63f0dcd8fa0af4af77cc038d18e883916
+  metadata.gz: 10ff432d483a1f4150a56de4c25d7d8db4c6933390dd4d7a6a22631a20050fd9a46eb7276c940c8e1c25f774721bfca24c49f317231bb7bf529b0dd44a552725
+  data.tar.gz: 374930e4888f593d3d0137b53b973839e7705071447eeb56fd80038ea816275d28953c0058558be7f6be8ca61e8b0f5e6a78fef97c040f2f682b3c14be6771a7

data/.gitignore

@@ -13,3 +13,4 @@
 Gemfile.lock
 test/config.json
 test/srv
+envoy.json

data/DEVELOPMENT.md

@@ -0,0 +1,8 @@
+# Development
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake` to run the tests.
+You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+If you've installed [docker-compose](https://docs.docker.com/compose/), you can run the integration tests by `rake integration_test`. To run all the tests, `rake all`.
+
+To install this gem onto your local machine, run `bundle exec rake install`.
+To release a new version, use `bump`, and then run `rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org/).

data/README.md

@@ -2,19 +2,15 @@
 [![Build Status](https://travis-ci.org/taiki45/kumonos.svg?branch=master)](https://travis-ci.org/taiki45/kumonos)
 [![Gem Version](https://badge.fury.io/rb/kumonos.svg)](https://badge.fury.io/rb/kumonos)
 
-Manage and build a Service Mesh for Microservices.
+A management tool for building Microservices "service mesh".
 
 ## Installation
-
-    $ gem install kumonos
+```
+gem install kumonos
+```
 
 ## Usage
-TODO: Write usage instructions here
-
-## Development
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
-
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+TODO
 
 ## Contributing
 Bug reports and pull requests are welcome on GitHub at https://github.com/taiki45/kumonos.

data/example/envoy.json

@@ -1,12 +1,12 @@
 {
   "version": 1,
   "ds": {
-    "name": "nginx",
     "refresh_delay_ms": 30000,
     "cluster": {
-      "name": "nginx",
+      "name": "ds",
       "type": "strict_dns",
-      "connect_timeout_ms": 250,
+      "tls": false,
+      "connect_timeout_ms": 1000,
       "lb_type": "round_robin",
       "hosts": [
         {
@@ -17,8 +17,9 @@
   },
   "statsd": {
     "name": "statsd",
-    "connect_timeout_ms": 250,
+    "connect_timeout_ms": 1000,
     "type": "strict_dns",
+    "tls": false,
     "lb_type": "round_robin",
     "hosts": [
       {

data/exe/kumonos

@@ -21,6 +21,19 @@ class KumonosCli < Thor
     puts JSON.dump(Kumonos::Envoy.generate(definition))
   end
 
+  desc 'init_envoy', 'Generate envoy definition'
+  def init_envoy
+    path = 'envoy.json'
+    definition = JSON.parse(File.read(File.expand_path('../example/envoy.json', __dir__)))
+    definition.delete('statsd')
+    cluster = definition.fetch('ds').fetch('cluster')
+    cluster['hosts'] = [{ url: 'tcp://your-load-balancer-to-discovery-service:443' }]
+    cluster['tls'] = true
+    definition.fetch('ds')['cluster'] = cluster
+    File.write(path, JSON.pretty_generate(definition) + "\n")
+    puts path
+  end
+
   desc 'clusters SERVIVE_DEFINITION', 'Generate clusters configuration'
   method_option :output, aliases: '-o', desc: 'Output directory', required: true, type: :string
   def clusters(filepath)

data/lib/kumonos/envoy.rb

@@ -5,7 +5,7 @@ module Kumonos
       # @param [Kumonos::EnvoyDefinition] definition
       # @return [Hash] envoy configuration hash
       def generate(definition)
-        {
+        out = {
           listeners: [
             {
               address: definition.listener.fetch(:address),
@@ -17,7 +17,7 @@ module Kumonos
                   stat_prefix: 'ingress_http',
                   access_log: [{ path: definition.listener.fetch(:access_log_path) }],
                   rds: {
-                    cluster: definition.ds.fetch(:name),
+                    cluster: definition.ds.fetch(:cluster).fetch(:name),
                     route_config_name: DEFAULT_ROUTE_NAME,
                     refresh_delay_ms: definition.ds.fetch(:refresh_delay_ms)
                   },
@@ -30,15 +30,21 @@ module Kumonos
             access_log_path: definition.admin.fetch(:access_log_path),
             address: definition.admin.fetch(:address)
           },
-          statsd_tcp_cluster_name: definition.statsd.fetch(:name),
           cluster_manager: {
-            clusters: [definition.statsd],
+            clusters: [],
             cds: {
               cluster: definition.ds.fetch(:cluster),
               refresh_delay_ms: definition.ds.fetch(:refresh_delay_ms)
             }
           }
         }
+
+        unless definition.statsd.empty?
+          out[:statsd_tcp_cluster_name] = definition.statsd.fetch(:name)
+          out[:cluster_manager][:clusters] << definition.statsd
+        end
+
+        out
       end
     end
   end

data/lib/kumonos/envoy_definition.rb

@@ -2,10 +2,13 @@ module Kumonos
   EnvoyDefinition = Struct.new(:version, :ds, :statsd, :listener, :admin) do
     class << self
       def from_hash(h)
+        ds = symbolize_keys(h.fetch('ds'))
+        convert_tls_option!(ds.fetch(:cluster))
+
         new(
           h.fetch('version'),
-          symbolize_keys(h.fetch('ds')),
-          symbolize_keys(h.fetch('statsd')),
+          ds,
+          convert_tls_option!(symbolize_keys(h.fetch('statsd', {}))),
           symbolize_keys(h.fetch('listener')),
           symbolize_keys(h.fetch('admin'))
         )
@@ -13,6 +16,12 @@ module Kumonos
 
       private
 
+      def convert_tls_option!(cluster)
+        tls = cluster.delete(:tls)
+        cluster[:ssl_context] = {} if tls
+        cluster
+      end
+
       def symbolize_keys(hash)
         new = hash.map do |k, v|
           [

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/schemas/envoy.json

@@ -3,11 +3,10 @@
   "$schema": "http://json-schema.org/draft-04/schema#",
   "type": "object",
   "id": "kumonos-configuration",
-  "additionalProperties": false,
+  "additionalProperties": true,
   "required": [
     "version",
     "ds",
-    "statsd",
     "listener",
     "admin"
   ],
@@ -21,15 +20,10 @@
       "id": "/properties/ds",
       "additionalProperties": false,
       "required": [
-        "name",
         "refresh_delay_ms",
         "cluster"
       ],
       "properties": {
-        "name": {
-          "type": "string",
-          "id": "/properties/ds/properties/name"
-        },
         "refresh_delay_ms": {
           "type": "integer",
           "id": "/properties/ds/properties/refresh_delay_ms"
@@ -41,6 +35,7 @@
           "required": [
             "name",
             "type",
+            "tls",
             "connect_timeout_ms",
             "lb_type",
             "hosts"
@@ -54,6 +49,10 @@
               "type": "string",
               "id": "/properties/ds/properties/cluster/properties/type"
             },
+            "tls": {
+              "type": "boolean",
+              "id": "/properties/ds/properties/cluster/properties/tls"
+            },
             "connect_timeout_ms": {
               "type": "integer",
               "id": "/properties/ds/properties/cluster/properties/connect_timeout_ms"
@@ -92,6 +91,7 @@
         "name",
         "connect_timeout_ms",
         "type",
+        "tls",
         "lb_type",
         "hosts"
       ],
@@ -108,6 +108,10 @@
           "type": "string",
           "id": "/properties/statsd/properties/type"
         },
+        "tls": {
+          "type": "boolean",
+          "id": "/properties/statsd/properties/tls"
+        },
         "lb_type": {
           "type": "string",
           "id": "/properties/statsd/properties/lb_type"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Taiki Ono
@@ -134,6 +134,7 @@ files:
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
+- DEVELOPMENT.md
 - Gemfile
 - LICENSE.txt
 - README.md