kumonos 0.16.0 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7552a947b18df88ba3119cc25787a74b7b11b9f9b0dc8595ab0ede425d37af5b
-  data.tar.gz: b259c3ab474176183c27fd8bb21e8b1588f482a85ebd045b68c738f9c7f9e503
+  metadata.gz: 529353de6d713d922bfa8a74af3e04166ecbb949755c945014c51fd5bcd0ed24
+  data.tar.gz: c73615662f4f8f87dcf82c0505d2581ddccf2a9b27c318b84dcd2590ba070cea
 SHA512:
-  metadata.gz: 31d92d52e20390bca01ff44c9384732b6e7322160ea4d2cea09adb172fefe178dc5af4ba2036965ba9dd37abc382635baf8cd4475aeacf34809a8132e22bfdef
-  data.tar.gz: 3861238172661df1e09af4bf8d79618ad307c814b5bc0f0174ff3c863c7cd97cce02c2bb0d53e65d0091a0e46cda997094a301560c4a8ca6a9a65d22f1a2fa84
+  metadata.gz: 1c19e7a8a6d07d450f7b930f7bddf2eb5961d09e177ac42817bc8cf540159354f12af12786f304a0a04ac5821ea6ea61cc973dedea3f7030f91abad9ce8f2d3c
+  data.tar.gz: 727084fb53fb46d101e090903bf26ef52f098fb2aad16b90db0cc3405a2bbc77fbf34de7d89ecf8cf477e1a936d7876d4e23a35d07c87c41fef06b6cb0f1b09c

data/example/book.jsonnet

@@ -0,0 +1,27 @@
+local circuit_breaker = import 'circuit_breaker.libsonnet';
+local routes = import 'routes.libsonnet';
+
+{
+    version: 1,
+    dependencies: [
+        {
+            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],
+        },
+        {
+            name: "ab-testing",
+            cluster_name: "ab-testing-development",
+            sds: true,
+            tls: false,
+            connect_timeout_ms: 250,
+            circuit_breaker: circuit_breaker,
+            routes: [routes.root],
+        },
+    ],
+}

data/example/circuit_breaker.libsonnet

@@ -0,0 +1,5 @@
+{
+    max_connections: 64,
+    max_pending_requests: 128,
+    max_retries: 3,
+}

data/example/routes.libsonnet

@@ -0,0 +1,11 @@
+{
+    root: {
+        prefix: "/",
+        timeout_ms: 3000,
+        retry_policy: {
+            retry_on: "5xx,connect-failure,refused-stream",
+            num_retries: 3,
+            per_try_timeout_ms: 1000,
+        },
+    },
+}

data/exe/kumonos

@@ -5,6 +5,9 @@ $LOAD_PATH.unshift(File.expand_path('../lib', __dir__))
 require 'kumonos'
 require 'thor'
 
+require 'json'
+require 'jsonnet'
+
 # KumonosCli
 class KumonosCli < Thor
   def self.exit_on_failure?
@@ -17,7 +20,7 @@ class KumonosCli < Thor
   method_option :'service-node', desc: 'Service node', required: true, type: :string
   def envoy(path)
     validate_path!(path)
-    definition = YAML.load_file(path)
+    definition = load_definition(path)
     validate_envoy_definition!(definition, path)
 
     config = Kumonos::Envoy.generate(
@@ -35,7 +38,7 @@ class KumonosCli < Thor
     validate_path!(filepath)
     validate_path!(output_dir)
 
-    definition = YAML.load_file(filepath)
+    definition = load_definition(filepath)
     validate_service_definition!(definition, filepath)
     json = JSON.dump(Kumonos::Clusters.generate(definition))
 
@@ -50,7 +53,7 @@ class KumonosCli < Thor
     validate_path!(filepath)
     validate_path!(output_dir)
 
-    definition = YAML.load_file(filepath)
+    definition = load_definition(filepath)
     validate_service_definition!(definition, filepath)
     json = JSON.dump(Kumonos::Routes.generate(definition))
 
@@ -60,15 +63,15 @@ class KumonosCli < Thor
 
   desc 'init NAME', 'Generate a service definition'
   def init(name)
-    definition = YAML.load_file(File.expand_path('../example/book.yml', __dir__))
+    definition = load_definition(File.expand_path('../example/book.jsonnet', __dir__))
     definition['dependencies'] = definition.fetch('dependencies')[0..0]
     dep = definition['dependencies'][0]
     dep['name'] = 'target-service-name'
     dep['cluster_name'] = 'target-service-name-staging'
     dep['lb'] = 'hostname-for-load-balancer:port'
     dep.delete('sds')
-    path = "#{name}.yml"
-    File.open(path, 'w') { |f| YAML.dump(definition, f) }
+    path = "#{name}.jsonnet"
+    File.write(path, JSON.pretty_generate(definition))
     puts path
   end
 
@@ -99,6 +102,16 @@ class KumonosCli < Thor
     warn("The schema file is #{schema_path}")
     exit 1
   end
+
+  def load_definition(path)
+    if path.end_with?('.jsonnet')
+      Jsonnet.load(path)
+    elsif path.end_with?('.yml', '.yaml')
+      YAML.load_file(path)
+    else
+      raise "Unknown extension given, expected '.jsonnet', '.yml' or 'yaml': #{path}"
+    end
+  end
 end
 
 KumonosCli.start(ARGV)

data/kumonos.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'json-schema'
+  spec.add_dependency 'jsonnet'
   spec.add_dependency 'thor'
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'grpc'

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.16.0'.freeze
+  VERSION = '0.17.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.17.0
 platform: ruby
 authors:
 - Taiki Ono
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-27 00:00:00.000000000 Z
+date: 2018-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json-schema
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jsonnet
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -171,9 +185,11 @@ files:
 - bin/console
 - bin/setup
 - bump
-- example/book.yml
+- example/book.jsonnet
+- example/circuit_breaker.libsonnet
 - example/envoy_config.yml
 - example/example-with-tls.yml
+- example/routes.libsonnet
 - exe/kumonos
 - kumonos.gemspec
 - lib/kumonos.rb
@@ -205,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: A "control plane" for Microservices "service mesh".

data/example/book.yml

@@ -1,37 +0,0 @@
-# A example definition for book service.
-# The book service uses user service and ab-testing service.
-version: 1
-dependencies:
-  - name: 'user'
-    cluster_name: 'user-development'
-    lb: 'user-app:8080'
-    host_header: 'user-service'
-    tls: false
-    connect_timeout_ms: 250
-    circuit_breaker:
-      max_connections: 64
-      max_pending_requests: 128
-      max_retries: 3
-    routes:
-      - prefix: '/'
-        timeout_ms: 3000
-        retry_policy:
-          retry_on: '5xx,connect-failure,refused-stream'
-          num_retries: 3
-          per_try_timeout_ms: 1000
-  - name: 'ab-testing'
-    cluster_name: 'ab-testing-development'
-    sds: true
-    tls: false
-    connect_timeout_ms: 250
-    circuit_breaker:
-      max_connections: 64
-      max_pending_requests: 128
-      max_retries: 3
-    routes:
-      - prefix: '/'
-        timeout_ms: 3000
-        retry_policy:
-          retry_on: '5xx,connect-failure,refused-stream'
-          num_retries: 3
-          per_try_timeout_ms: 1000