aggkit 0.4.6.13043 → 0.4.6.13051

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e1dc715b958bd63ed5d98b7f26e8c36eacba09c4122ed2389b18b340f3a878d7
-  data.tar.gz: add638845ed60d447f2ca152c43a45c8a95c503d801c4156ed8ead0920649be2
+  metadata.gz: f0e8a711fd2ef8cc6b09a3968a080469320c3c144431be31dbe5a21bdef15b22
+  data.tar.gz: 5b351bdad4973bcb0fa306d906142e1ea9de6afe15e77ef52243ab882c6b9e7f
 SHA512:
-  metadata.gz: 76421604f394967145c6b3ab08ff0af23d3e65758e5729a1016d8636724bd99e85821ec152b8218d6f43827fa76fce33ebf62ebc70619892687b7980626151e4
-  data.tar.gz: bc68320dad71145bf1a9c2f4a1fe593c68a9c98b8675284c02951f611cab14b1ff59517945770b99a362ef49ccf56b92e01df3fc02116fde680d96660f24c847
+  metadata.gz: d2ec7983da31fa9cc1c7c8fa87351e482c466724e0e9a05329303abbefd821ea4fff85fa825a5062f9091c538f207044284dcfb8e28e3da0a3207b5ac8deb0c5
+  data.tar.gz: 9514795cd8b42f07dc362efcb31603cd4f1670ce303113081311ace8ddddc77da983df5fdb532673f4d5eb86a9e90cbcf42ed76e09a9ee389a35be3d55e99617

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aggkit (0.4.6.13043)
+    aggkit (0.4.6.13051)
       diplomat
       dotenv
       json

data/bin/aggexec

@@ -8,10 +8,10 @@ consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], ho
 
 
 @opts = {
-  depends:    [],
-  prefixes:   [],
-  templates:  [],
-  dereference:true
+  depends:     [],
+  prefixes:    [],
+  templates:   [],
+  dereference: true
 }
 
 @opts[:exec] = (begin

data/bin/aggwrap

@@ -67,9 +67,14 @@ consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], ho
 @opts = {
   service:         ENV['AGGREDATOR_SERVICE'],
   id:              "#{Time.now.utc.strftime('%FT%T%z')}_#{SecureRandom.hex(2)}",
-  reload_interval: DEFAULT_RELOAD_INTERVAL
+  reload_interval: DEFAULT_RELOAD_INTERVAL,
+  tags:            []
 }
 
+unless ENV['AGGREDATOR_SERVICE_TAGS'].to_s.empty?
+  @opts[:tags] += ENV['AGGREDATOR_SERVICE_TAGS'].to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
+end
+
 @opts[:exec] = (begin
                   idx = ARGV.index {|a| a.strip == '--' } + 1
                   ARGV[idx..-1]
@@ -84,6 +89,10 @@ parser = Aggkit::OptionParser.new do |o|
     @opts[:service] = service.to_s
   end
 
+  o.on('--tags=tag1,tag2...', 'Set list of tags for service') do |list|
+    @opts[:tags] += list.to_s.split(/[ ;,|]/).map(&:to_s).reject(&:empty?)
+  end
+
   o.on('--id <identifier>', 'Set service identifier to concat with name. Random when default') do |id|
     @opts[:id] = id.to_s
   end
@@ -140,6 +149,7 @@ die 'service name must be provided' if @opts[:service].to_s.empty?
 
 die 'script must be provided' if @opts[:exec].empty?
 
+@opts[:tags] << "service-#{@opts[:service]}"
 
 Diplomat.configure do |config|
   config.url = @opts[:consul]
@@ -150,7 +160,8 @@ SERVICE_ID = "#{@opts[:service]}_#{@opts[:id]}".freeze
 @service = {
   Name:   @opts[:service],
   ID:     SERVICE_ID,
-  Checks: []
+  Checks: [],
+  Tags:   @opts[:tags]
 }
 
 @checks = {}
@@ -305,6 +316,7 @@ Thread.new(@opts[:reload_interval], @opts[:service]) do |sleep_interval, service
 
     service_data = data.dig(*kv_prefix)
     next if service_data.nil?
+
     new_hash = Digest::MD5.new.update(service_data.to_json).hexdigest
     if !config_hash.nil? && config_hash != new_hash
       die('Change kv configuration for consul service.')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aggkit
 version: !ruby/object:Gem::Version
-  version: 0.4.6.13043
+  version: 0.4.6.13051
 platform: ruby
 authors:
 - Godko Ivan