aggkit 0.4.5.12925 → 0.4.6.12955

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3950616bd877f083d95f58db6c1a5eb033ffe375be3b80d7b92c24bb309beb86
-  data.tar.gz: d6b2b40d76a67e9e6f630fafc8d6739a0ceac1374c364fce76b875b199aa60bc
+  metadata.gz: f7e48a17865dea2099b262c9a3934107b47d9274be7892580b534901cec2a80c
+  data.tar.gz: 4a96b03153abeb1cbeea5e71720435a7b78893643bed5b674983b8a4d00c4ff6
 SHA512:
-  metadata.gz: 9dd3a92b921e51cd9292caf4f02eb450fc992fb25d779a46d3942630d5f47b7a98f688374b117bae4f4fb440a493003db6ffe4d0f408ca83f758442e23b6abdf
-  data.tar.gz: 460930faa6ebf351b2001a5f58caed260f2ea505284580e148f8279e6d38ffb902094e5f4a765341691cda9165fd888e810db882e9b460142ebd66398d6f8f62
+  metadata.gz: 7cfbb8df979355eeaab4465281b0e99a51132fea3016d906562a5a7553ad0d9d760f78b4f375caadb9ec29553a4c160f9f514c4f1bffd0f0957611e37da58a1d
+  data.tar.gz: ec94c2f93f729393901884989729fe778c1f949698ca7d7cf9c5960b792bd4f7696652341ea86b194571d638b5249fed40ebd04a87c8461151dbdbe6dbfe84ba

data/Gemfile.lock

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

data/bin/aggconsul

@@ -4,17 +4,14 @@ require 'diplomat'
 require 'optparse'
 require 'English'
 require 'yaml'
+require 'aggkit'
 
 STDOUT.sync = true
 STDERR.sync = true
 
-if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
-  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
-end
+consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], host: ENV['CONSUL_HOST'], port: ENV['CONSUL_PORT'])
 
-@opts = {
-  consul: ENV['CONSUL_HTTP_ADDR']
-}
+@opts = {}
 
 UTIL = File.basename(__FILE__)
 
@@ -27,14 +24,16 @@ UTIL = File.basename(__FILE__)
 parser = OptionParser.new do |o|
   o.banner = "Usage: #{UTIL} [options] -- exec"
 
-  o.on('--consul url', 'Set up a custom Consul URL') do |consul|
-    ENV['CONSUL_HTTP_ADDR'] = if consul.to_s['http']
-      consul.to_s
-    else
-      "http://#{consul}:8500"
-    end
+  o.on("--consul=#{consul_addr}", 'Set a fully qualified Consul URL. Take precendance') do |addr|
+    @opts[:consul_addr] = Aggkit::Consul.consul_addr(addr.to_s.strip)
+  end
+
+  o.on("--consul-host=#{consul_addr.host}", 'Set consul host. Ignored when consul specified') do |host|
+    @opts[:consul_host] = host.to_s.strip
+  end
 
-    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
+  o.on("--consul-port=#{consul_addr.port}", 'Set consul port. Ignored when consul specified') do |port|
+    @opts[:consul_port] = port.to_s.strip
   end
 
   o.on('--token token', 'Connect into consul with custom access token (ACL)') do |token|
@@ -91,6 +90,19 @@ parser = OptionParser.new do |o|
 end
 parser.parse!
 
+consul_addr = if !@opts[:consul_addr].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: @opts[:consul_addr].to_s, host: nil, port: nil).to_s
+elsif !@opts[:consul_host].to_s.empty? || !@opts[:consul_port].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: nil, host: @opts[:consul_host], port: opts[:consul_port]).to_s
+else
+  consul_addr
+end
+
+@opts[:consul] = consul_addr.to_s
+ENV['CONSUL_HTTP_ADDR'] = consul_addr.to_s
+ENV['CONSUL_HOST'] = consul_addr.host.to_s
+ENV['CONSUL_PORT'] = consul_addr.port.to_s
+
 Diplomat.configure do |config|
   config.url = @opts[:consul]
 end
@@ -117,16 +129,16 @@ def dereferenced_value(value)
   end
 end
 
-if config = @opts[:config]
+if (config = @opts[:config])
   @opts[:config] = YAML.load(config == '-' ? STDIN.read : File.read(config))
 end
 
 if @opts[:init]
   raise OptionParser::MissingArgument.new('config') unless @opts[:config]
 
-  services = if service = @opts[:service]
+  services = if (srv = @opts[:service])
     {
-      service => @opts[:config][service]
+      srv => @opts[:config][srv]
     }
   else
     @opts[:config]
@@ -162,8 +174,8 @@ end
 if @opts[:show]
   config = {}
 
-  path = if service = @opts[:service]
-    "services/env/#{service}/"
+  path = if (srv = @opts[:service])
+    "services/env/#{srv}/"
   else
     'services/env/'
   end
@@ -187,7 +199,7 @@ if @opts[:show]
   exit 0
 end
 
-if put = @opts[:put]
+if (put = @opts[:put])
   path, *value = put.split(':').map(&:strip)
   value = value.join(':')
   value = File.read(value) if @opts[:upload] && value && File.exist?(value)
@@ -197,7 +209,7 @@ if put = @opts[:put]
   exit 0
 end
 
-if path = @opts[:get]
+if (path = @opts[:get])
   value = dereferenced_value(Diplomat::Kv.get(path))
 
   STDOUT.puts value.to_s.strip
@@ -205,7 +217,7 @@ if path = @opts[:get]
   exit 0
 end
 
-if prefix = @opts[:env]
+if (prefix = @opts[:env])
   keys = begin
     Diplomat::Kv.get(prefix, keys: true)
   rescue Diplomat::KeyNotFound => e
@@ -220,7 +232,7 @@ if prefix = @opts[:env]
     e.merge(key_to_env(key.gsub(prefix, '')) => value)
   end
 
-  if cmd = @opts[:exec]
+  if (cmd = @opts[:exec])
     env = ENV.to_h.merge(env) unless @opts[:pristine]
 
     exec(env, cmd, unsetenv_others: true)

data/bin/aggexec

@@ -4,12 +4,10 @@ require 'aggkit'
 
 UTIL = File.basename(__FILE__)
 
-if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
-  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
-end
+consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], host: ENV['CONSUL_HOST'], port: ENV['CONSUL_PORT'])
+
 
 @opts = {
-  consul:    ENV['CONSUL_HTTP_ADDR'],
   depends:   [],
   prefixes:  [],
   templates: []
@@ -25,9 +23,16 @@ end
 parser = Aggkit::OptionParser.new do |o|
   o.banner = "Usage: #{UTIL} [options] -- exec"
 
-  o.on("--consul=#{@opts[:consul]}", 'Set consul http address. CONSUL_HTTP_ADDR env can be used instead') do |consul|
-    ENV['CONSUL_HTTP_ADDR'] = Aggkit::Consul.consul_addr(consul)
-    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
+  o.on("--consul=#{consul_addr}", 'Set a fully qualified Consul URL. Take precendance') do |addr|
+    @opts[:consul_addr] = Aggkit::Consul.consul_addr(addr.to_s.strip)
+  end
+
+  o.on("--consul-host=#{consul_addr.host}", 'Set consul host. Ignored when consul specified') do |host|
+    @opts[:consul_host] = host.to_s.strip
+  end
+
+  o.on("--consul-port=#{consul_addr.port}", 'Set consul port. Ignored when consul specified') do |port|
+    @opts[:consul_port] = port.to_s.strip
   end
 
   o.on('--depends=mq,db,router...', 'Set list of services to wait for ready before start') do |list|
@@ -52,13 +57,24 @@ parser = Aggkit::OptionParser.new do |o|
 end
 parser.parse!
 
+consul_addr = if !@opts[:consul_addr].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: @opts[:consul_addr].to_s, host: nil, port: nil).to_s
+elsif !@opts[:consul_host].to_s.empty? || !@opts[:consul_port].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: nil, host: @opts[:consul_host], port: opts[:consul_port]).to_s
+else
+  consul_addr
+end
+
+@opts[:consul] = consul_addr.to_s
+ENV['CONSUL_HTTP_ADDR'] = consul_addr.to_s
+ENV['CONSUL_HOST'] = consul_addr.host.to_s
+ENV['CONSUL_PORT'] = consul_addr.port.to_s
+
 @opts[:depends] = @opts[:depends].reject(&:empty?)
 @opts[:prefixes] = @opts[:prefixes].reject(&:empty?)
 @opts[:templates] = @opts[:templates].reject(&:empty?)
 
-if @opts[:exec].empty? && !@opts[:noexec]
-  Aggkit::Exec.die 'exec script must be provided'
-end
+Aggkit::Exec.die 'exec script must be provided' if @opts[:exec].empty? && !@opts[:noexec]
 
 if @opts[:depends].any? || @opts[:prefixes].any?
   # Wait for consul

data/bin/agglock

@@ -3,8 +3,10 @@
 require 'optparse'
 require 'diplomat'
 
+consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], host: ENV['CONSUL_HOST'], port: ENV['CONSUL_PORT'])
+
+
 @opts = {
-  url:     'http://localhost:8500',
   timeout: 10,
   ttl:     30 * 60
 }
@@ -12,10 +14,16 @@ require 'diplomat'
 parser = OptionParser.new do |o|
   o.banner = 'Usage: agglock [options]'
 
-  o.on("--consul url=#{@opts[:url]}", 'Set up a custom Consul URL') do |url|
-    Diplomat.configure do |config|
-      config.url = url.strip
-    end
+  o.on("--consul=#{consul_addr}", 'Set a fully qualified Consul URL. Take precendance') do |addr|
+    @opts[:consul_addr] = Aggkit::Consul.consul_addr(addr.to_s.strip)
+  end
+
+  o.on("--consul-host=#{consul_addr.host}", 'Set consul host. Ignored when consul specified') do |host|
+    @opts[:consul_host] = host.to_s.strip
+  end
+
+  o.on("--consul-port=#{consul_addr.port}", 'Set consul port. Ignored when consul specified') do |port|
+    @opts[:consul_port] = port.to_s.strip
   end
 
   o.on('--lock resource', 'resource name to lock with Consul') do |resource|
@@ -36,6 +44,22 @@ parser = OptionParser.new do |o|
 end
 parser.parse!
 
+consul_addr = if !@opts[:consul_addr].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: @opts[:consul_addr].to_s, host: nil, port: nil).to_s
+elsif !@opts[:consul_host].to_s.empty? || !@opts[:consul_port].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: nil, host: @opts[:consul_host], port: opts[:consul_port]).to_s
+else
+  consul_addr
+end
+
+@opts[:consul] = consul_addr.to_s
+ENV['CONSUL_HTTP_ADDR'] = consul_addr.to_s
+ENV['CONSUL_HOST'] = consul_addr.host.to_s
+ENV['CONSUL_PORT'] = consul_addr.port.to_s
+
+Diplomat.configure do |config|
+  config.url = @opts[:consul]
+end
 
 def lock(session, locker, timeout)
   Timeout.timeout(timeout) do
@@ -46,7 +70,7 @@ rescue Timeout::Error => e
 end
 
 
-if resource = @opts[:lock]
+if (resource = @opts[:lock])
   locker = {
     Name:     "#{resource}_locker_#{rand(999_999)}",
     Behavior: 'delete',

data/bin/aggstart

@@ -6,13 +6,10 @@ UTIL = File.basename(__FILE__)
 
 include Aggkit::Runner
 
-if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
-  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
-end
+consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], host: ENV['CONSUL_HOST'], port: ENV['CONSUL_PORT'])
 
 @opts = {
   service:    ENV['AGGREDATOR_SERVICE'],
-  consul:     ENV['CONSUL_HTTP_ADDR'],
   consulconf: [],
   depends:    [],
   watch:      true
@@ -33,14 +30,16 @@ parser = Aggkit::OptionParser.new do |o|
     @opts[:service] = service.to_s
   end
 
-  o.on("--consul=#{@opts[:consul]}", 'Set consul http address. CONSUL_HTTP_ADDR env can be used instead') do |consul|
-    ENV['CONSUL_HTTP_ADDR'] = if consul.to_s['http']
-      consul.to_s
-    else
-      "http://#{consul}:8500"
-    end
+  o.on("--consul=#{consul_addr}", 'Set a fully qualified Consul URL. Take precendance') do |addr|
+    @opts[:consul_addr] = Aggkit::Consul.consul_addr(addr.to_s.strip)
+  end
 
-    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
+  o.on("--consul-host=#{consul_addr.host}", 'Set consul host. Ignored when consul specified') do |host|
+    @opts[:consul_host] = host.to_s.strip
+  end
+
+  o.on("--consul-port=#{consul_addr.port}", 'Set consul port. Ignored when consul specified') do |port|
+    @opts[:consul_port] = port.to_s.strip
   end
 
   o.on('--consulconf=consul,consul/smev3...', 'Set list of folders with consul configs. Special: none - disable local consul') do |list|
@@ -61,6 +60,18 @@ parser = Aggkit::OptionParser.new do |o|
 end
 parser.parse!
 
+consul_addr = if !@opts[:consul_addr].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: @opts[:consul_addr].to_s, host: nil, port: nil).to_s
+elsif !@opts[:consul_host].to_s.empty? || !@opts[:consul_port].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: nil, host: @opts[:consul_host], port: opts[:consul_port]).to_s
+else
+  consul_addr
+end
+
+@opts[:consul] = consul_addr.to_s
+ENV['CONSUL_HTTP_ADDR'] = consul_addr.to_s
+ENV['CONSUL_HOST'] = consul_addr.host.to_s
+ENV['CONSUL_PORT'] = consul_addr.port.to_s
 
 die 'service name must be provided' if @opts[:service].to_s.empty?
 

data/bin/aggwait

@@ -18,7 +18,7 @@ INTERVAL = 3
 UTIL = File.basename(__FILE__)
 
 if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
-  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
+  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:#{ENV['CONSUL_PORT'] || '8500'}"
 end
 
 @opts[:exec] = (begin
@@ -96,8 +96,12 @@ OptionParser.new do |o|
     @opts[:timeout] = timeout.to_i
   end
 
-  o.on('-i', '--interval secs=2', 'Interval between attempts') do |interval|
-    @opts[:interval] = interval.to_i
+  o.on('-e', '--timeout secs=15', 'Total timeout') do |timeout|
+    @opts[:timeout] = timeout.to_i
+  end
+
+  o.on('-i', '--error=msg', 'error message on failure') do |error|
+    @opts[:error] = error.to_s
   end
 
   o.on('-q', '--quiet', 'Do not output any status messages') do
@@ -152,7 +156,7 @@ def complete!(success)
     end
   end
 
-  STDERR.puts 'Operation timed out'
+  STDERR.puts "Operation timed out. #{@opts[:error]}".strip
   exit 1
 end
 

data/bin/aggwrap

@@ -62,14 +62,11 @@ DEFAULT_RELOAD_INTERVAL = 60 # seconds
 
 include Aggkit::Runner
 
-if ENV['CONSUL_HTTP_ADDR'].to_s.empty?
-  ENV['CONSUL_HTTP_ADDR'] = "http://#{ENV['CONSUL_HOST'] || 'localhost'}:8500"
-end
+consul_addr = Aggkit::Consul.build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], host: ENV['CONSUL_HOST'], port: ENV['CONSUL_PORT'])
 
 @opts = {
   service:         ENV['AGGREDATOR_SERVICE'],
   id:              "#{Time.now.utc.strftime('%FT%T%z')}_#{SecureRandom.hex(2)}",
-  consul:          ENV['CONSUL_HTTP_ADDR'],
   reload_interval: DEFAULT_RELOAD_INTERVAL
 }
 
@@ -91,14 +88,16 @@ parser = Aggkit::OptionParser.new do |o|
     @opts[:id] = id.to_s
   end
 
-  o.on("--consul=#{@opts[:consul]}", 'Set consul host. CONSUL_HOST env used when missed') do |consul|
-    ENV['CONSUL_HTTP_ADDR'] = if consul.to_s['http']
-      consul.to_s
-    else
-      "http://#{consul}:8500"
-    end
+  o.on("--consul=#{consul_addr}", 'Set a fully qualified Consul URL. Take precendance') do |addr|
+    @opts[:consul_addr] = Aggkit::Consul.consul_addr(addr.to_s.strip)
+  end
+
+  o.on("--consul-host=#{consul_addr.host}", 'Set consul host. Ignored when consul specified') do |host|
+    @opts[:consul_host] = host.to_s.strip
+  end
 
-    @opts[:consul] = ENV['CONSUL_HTTP_ADDR']
+  o.on("--consul-port=#{consul_addr.port}", 'Set consul port. Ignored when consul specified') do |port|
+    @opts[:consul_port] = port.to_s.strip
   end
 
   o.on('--http <PORT>', 'Create TTL consul check and pass http result to it') do |port|
@@ -124,6 +123,19 @@ parser = Aggkit::OptionParser.new do |o|
 end
 parser.parse!
 
+consul_addr = if !@opts[:consul_addr].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: @opts[:consul_addr].to_s, host: nil, port: nil).to_s
+elsif !@opts[:consul_host].to_s.empty? || !@opts[:consul_port].to_s.empty?
+  Aggkit::Consul.build_consul_addr(addr: nil, host: @opts[:consul_host], port: opts[:consul_port]).to_s
+else
+  consul_addr
+end
+
+@opts[:consul] = consul_addr.to_s
+ENV['CONSUL_HTTP_ADDR'] = consul_addr.to_s
+ENV['CONSUL_HOST'] = consul_addr.host.to_s
+ENV['CONSUL_PORT'] = consul_addr.port.to_s
+
 die 'service name must be provided' if @opts[:service].to_s.empty?
 
 die 'script must be provided' if @opts[:exec].empty?

data/lib/aggkit/ci.rb

@@ -213,7 +213,7 @@ module Aggkit
 
         unless config_file.empty?
           execute("docker exec -i #{consul} aggwait -t 20 --consul")
-          execute("docker exec -i #{consul} aggconsul --init --override --config - < #{config_file}")
+          execute("docker exec -i #{consul} aggconsul --init --config - < #{config_file}")
         end
 
         execute('docker-compose up -t 30 -d')
@@ -233,7 +233,7 @@ module Aggkit
 
         unless config_file.empty?
           execute("docker exec -i #{consul} aggwait -t 20 --consul")
-          execute("docker exec -i #{consul} aggconsul --init --override --config - < #{config_file}")
+          execute("docker exec -i #{consul} aggconsul --init --config - < #{config_file}")
         end
 
         # echo " * Consul ready"

data/lib/aggkit/consul.rb

@@ -14,7 +14,19 @@ module Aggkit
       envs
     end
 
-    def consul_addr addr_or_host
+    def build_consul_addr(addr: ENV['CONSUL_HTTP_ADDR'], host: ENV['CONSUL_HOST'], port: ENV['CONSUL_PORT'])
+      return URI('http://localhost:8500') if addr.to_s.empty? && host.to_s.empty? && port.to_s.empty?
+
+      return URI(addr) unless addr.to_s.empty?
+
+      uri = URI(host)
+      uri = URI("http://#{host}") if uri.scheme.to_s.empty?
+      uri.port = port.to_i unless port.to_s.empty?
+
+      uri
+    end
+
+    def consul_addr(addr_or_host)
       if addr_or_host['http']
         addr_or_host
       else
@@ -28,12 +40,12 @@ module Aggkit
       load_envs(envs)
     end
 
-    def wait_for_consul consul
+    def wait_for_consul(consul)
       consul_http = consul_addr(consul)
       Aggkit::Exec.execute!("aggwait -t 30 -i 5 --consul-addr=#{consul_http} --consul", 'Timeout for consul service')
     end
 
-    def wait_for_service consul, service
+    def wait_for_service(consul, service)
       consul_http = consul_addr(consul)
       Aggkit::Exec.execute!("aggwait -t 60 -i 5 --consul-addr=#{consul_http} --consul-service #{service}", "Timeout for #{service} service")
     end

data/lib/aggkit/version.rb

@@ -1,6 +1,6 @@
 module Aggkit
 
-  VERSION = '0.4.5'.freeze
+  VERSION = '0.4.6'.freeze
 
 end
 

metadata

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