kumonos 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 952ff01c0ea52b0ec8b24acf94fc2e58da06ae47d467e349f120c9b7eaff2102
-  data.tar.gz: 6ca2a61ce2a1022a7a7cc7bfda0129c15a2a7d145b8afb8f4ed14e7d31db8aa8
+  metadata.gz: 0e541de47fdbb3199ce372f8d4d84576dece878af5643a1be54b01b0b124abd0
+  data.tar.gz: 74395b51db4762635a35a6ddb77c3e0c0d68447d9bd21369c1a07a9bf2d5fb0a
 SHA512:
-  metadata.gz: 2036f5f8649540ef1e43f4292dfe0b497320046fda0937459778d7b163c5e9073c0102796e854b68da2adff98ae1bd51bc391d07df1fb7d65a22777b7747592c
-  data.tar.gz: d65444682fde1eb1b8b7c881a777670c49e4ce68d52e86c1deef573b3da7e59e76dc1351a765c879185a59edae77f444c661c29d192ffb6cee3cb356f7eeed34
+  metadata.gz: 0fe323de02094b71fe6e086de4eca3086935a9fb05883650eb3c50cce48af3d64d11e93835da9c8464d61515dfc174960e1034871eb25d96b5135ac6359ca45f
+  data.tar.gz: 85ea42234d3521bfc1f1dbbcb6396579bfb4cd432e9c799349c9a847ee5c265ac619c482f6e426b9b39768c55ba76d7ef6361b81bda7fdef4249bb248614ce59

data/exe/kumonos

@@ -13,12 +13,19 @@ class KumonosCli < Thor
 
   desc 'envoy ENVOY_DEFINITION', 'Generate envoy configuration'
   method_option :output, aliases: '-o', desc: 'Output path', required: true, type: :string
+  method_option :'service-cluster', desc: 'Service cluster', required: true, type: :string
+  method_option :'service-node', desc: 'Service node', required: true, type: :string
   def envoy(path)
     validate_path!(path)
     definition = YAML.load_file(path)
     validate_envoy_definition!(definition, path)
 
-    File.write(options.fetch(:output), JSON.dump(Kumonos::Envoy.generate(definition)))
+    config = Kumonos::Envoy.generate(
+      definition,
+      cluster: options.fetch(:'service-cluster'),
+      node: options.fetch(:'service-node')
+    )
+    File.write(options.fetch(:output), JSON.dump(config))
   end
 
   desc 'clusters SERVIVE_DEFINITION', 'Generate clusters configuration'

data/lib/kumonos/envoy.rb

@@ -2,21 +2,23 @@ module Kumonos
   # Generate envoy configuration.
   module Envoy
     class << self
-      def generate(definition)
-        EnvoyConfig.build(definition).to_h
+      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) do
+    EnvoyConfig = Struct.new(:version, :discovery_service, :statsd, :listener, :admin, :cluster, :node) do
       class << self
-        def build(h)
+        def build(h, cluster:, node:)
           discovery_service = DiscoverService.build(h.fetch('discovery_service'))
           new(
             h.fetch('version'),
             discovery_service,
             h['statsd'] ? h['statsd'].fetch('address') : nil,
             Listener.build(h.fetch('listener'), discovery_service),
-            Admin.build(h.fetch('admin'))
+            Admin.build(h.fetch('admin')),
+            cluster,
+            node
           )
         end
 
@@ -40,6 +42,8 @@ module Kumonos
         h.delete(:discovery_service)
         h.delete(:statsd)
         h.delete(:listener)
+        h.delete(:cluster)
+        h.delete(:node)
         h[:admin] = admin.to_h
         h[:static_resources] = {
           listeners: [listener.to_h],
@@ -74,7 +78,10 @@ module Kumonos
           ]
           h[:stats_config] = {
             use_all_default_tags: true,
-            stats_tags: []
+            stats_tags: [
+              { tag_name: 'service-cluster', fixed_value: cluster },
+              { tag_name: 'service-node', fixed_value: node }
+            ]
           }
         end
 

data/lib/kumonos/version.rb

@@ -1,3 +1,3 @@
 module Kumonos
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumonos
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Taiki Ono