diplomat 2.1.3 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c437150fe2670860ab730944e2ff4fd3327e09a4a9632ef97b7f535d4b23966a
-  data.tar.gz: e52f850967bf6dd29e4e11a48e893e06f9f4552f3045ad8e2892592a38e26307
+  metadata.gz: aeda162dfc23369b377785a2cc09baa0544dfbfb234ee60b3c8d722916393479
+  data.tar.gz: 57fe7b8364bcbea2ba93b39c4c10da4bb735e80e8719ebff4017687a1efc9cd4
 SHA512:
-  metadata.gz: 9fd3a079a14e539c70260f602ff29b2a9004ca306ae0e158b0316ef8d787daafa4a91991221fbfc9d987495f5e8b1b2650fc8772c9e32348f3ed2da12e93ecb6
-  data.tar.gz: f0e510ec423c65a22e10671a3b4744f696700d8745ff43da81fb7b549b3081ee2c4ee50bf7c8c1905bceaca49046965e1383a599b38cc168da1e82b24388cc9c
+  metadata.gz: 534b858e18d9fe81c87b04cc4a5a4abfc74529b1f8dd947cb07f09098ebad0cad034b5a2bf7a5765cd8df045237977b319bf83b46f4eae249095159fb7f235df
+  data.tar.gz: 8b8e2562535dbc7f8c1e2c2e38e2a4ff31b2b09074ac02b3e6ab6ff935435a3c52c07b6b6ceb044e51bee3973c7ae578c4e8d6a6d012b4b9a777457f4a6af705

data/lib/diplomat/rest_client.rb

@@ -58,8 +58,8 @@ module Diplomat
           # See https://bugs.ruby-lang.org/issues/10969
           begin
             super
-          rescue NameError => err
-            raise NoMethodError, err
+          rescue NameError => e
+            raise NoMethodError, e
           end
         end
       end
@@ -198,6 +198,7 @@ module Diplomat
       url += custom_params unless custom_params.nil?
       begin
         connection.get do |req|
+          req.options[:params_encoder] = options[:params_encoder] if options[:params_encoder]
           req.url rest_options[:url_prefix] ? rest_options[:url_prefix] + concat_url(url) : concat_url(url)
           rest_options[:headers].map { |k, v| req.headers[k.to_sym] = v } unless rest_options[:headers].nil?
           req.options.timeout = options[:timeout] if options[:timeout]

data/lib/diplomat/service.rb

@@ -15,7 +15,21 @@ module Diplomat
       custom_params << use_named_parameter('wait', options[:wait]) if options[:wait]
       custom_params << use_named_parameter('index', options[:index]) if options[:index]
       custom_params << use_named_parameter('dc', options[:dc]) if options[:dc]
-      custom_params << use_named_parameter('tag', options[:tag]) if options[:tag]
+      if options[:tag]
+        # tag can be either a String, or an array of strings
+        # by splatting it is guaranteed to be an array of strings
+        [*options[:tag]].each do |value|
+          custom_params << use_named_parameter('tag', value)
+        end
+      end
+
+      # We have to provide a custom params encoder here because Faraday - by default - assumes that
+      # list keys have [] as part of their name. This is however not the case for consul tags, which
+      # just use repeated occurences of the same key.
+      #
+      # So faraday reduces this: http://localhost:8500?a=1&a=2 to http://localhost:8500?a=2 unless you
+      # explicitly tell it not to.
+      options[:params_encoder] = Faraday::FlatParamsEncoder
 
       ret = send_get_request(@conn, ["/v1/catalog/service/#{key}"], options, custom_params)
       if meta && ret.headers

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = '2.1.3'.freeze
+  VERSION = '2.2.0'.freeze
 end

data/lib/diplomatic_bag.rb

@@ -0,0 +1,7 @@
+require 'diplomat'
+
+# Usefull usage of Diplomat lib.
+module DiplomaticBag
+  # Load all module files
+  Dir[File.join(__dir__, 'diplomatic_bag', '*.rb')].each { |file| require file }
+end

data/lib/diplomatic_bag/datacenters.rb

@@ -0,0 +1,11 @@
+# Usefull usage of Diplomat lib: Datacenter functions
+module DiplomaticBag
+  def self.get_datacenters_list(dc, options = {})
+    dcs = []
+    datacenters = Diplomat::Datacenter.get(nil, options)
+    dc.each do |c|
+      dcs.concat(datacenters.select { |d| d[/#{c}/] })
+    end
+    dcs.uniq
+  end
+end

data/lib/diplomatic_bag/info.rb

@@ -0,0 +1,32 @@
+# Usefull usage of Diplomat lib: Info functions
+module DiplomaticBag
+  # rubocop:disable AbcSize
+  def self.consul_info(options = {})
+    consul_self = Diplomat::Agent.self(options)
+    puts 'Server: ' + consul_self['Config']['NodeName']
+    puts 'Datacenter: ' + consul_self['Config']['Datacenter']
+    puts 'Consul Version: ' + consul_self['Config']['Version']
+    if consul_self['Stats']['consul']['leader_addr']
+      puts 'Leader Address: ' + consul_self['Stats']['consul']['leader_addr']
+      puts 'applied_index: ' + consul_self['Stats']['raft']['applied_index']
+      puts 'commit_index: ' + consul_self['Stats']['raft']['commit_index']
+    end
+    members = Diplomat::Members.get(options)
+    servers = members.select { |member| member['Tags']['role'] == 'consul' }.sort_by { |n| n['Name'] }
+    nodes = members.select { |member| member['Tags']['role'] == 'node' }
+    leader = Diplomat::Status.leader(options).split(':')[0]
+    puts 'Servers Count: ' + servers.count.to_s
+    puts 'Nodes Count: ' + nodes.count.to_s
+    puts 'Servers:'
+    servers.map do |s|
+      if s['Tags']['role'] == 'consul'
+        if s['Addr'] == leader
+          puts '  ' + s['Name'] + ' ' + s['Addr'] + ' *Leader*'
+        else
+          puts '  ' + s['Name'] + ' ' + s['Addr']
+        end
+      end
+    end
+  end
+  # rubocop:enable AbcSize
+end

data/lib/diplomatic_bag/nodes.rb

@@ -0,0 +1,28 @@
+# Usefull usage of Diplomat lib: Nodes functions
+module DiplomaticBag
+  def self.get_duplicate_node_id(options = {})
+    status = {
+      1 => 'Alive',
+      2 => '?',
+      3 => 'Left',
+      4 => 'Failed'
+    }
+    result = []
+    members = Diplomat::Members.get(options)
+    grouped = members.group_by do |row|
+      [row['Tags']['id']]
+    end
+    filtered = grouped.values.select { |a| a.size > 1 }
+    filtered.each do |dup|
+      instance = {}
+      instance[:node_id] = dup[0]['Tags']['id']
+      nodes = []
+      dup.each do |inst|
+        nodes << { name: inst['Name'], status: status[inst['Status']] }
+      end
+      instance[:nodes] = nodes
+      result << instance
+    end
+    result
+  end
+end

data/lib/diplomatic_bag/service.rb

@@ -0,0 +1,20 @@
+# Usefull usage of Diplomat lib: Service functions
+module DiplomaticBag
+  def self.get_service_info(service, options = {})
+    result = {}
+    health = Diplomat::Health.service(service, options)
+    result[service] = {}
+    health.each do |h|
+      result[service][h['Node']['Node']] = {
+        'Address': h['Node']['Address'],
+        'Port': h['Service']['Port']
+      }
+      checks = {}
+      h['Checks'].each do |c|
+        checks[c['Name']] = { 'status': c['Status'], 'output': c['Output'] }
+      end
+      result[service][h['Node']['Node']]['Checks'] = checks
+    end
+    result
+  end
+end

data/lib/diplomatic_bag/services.rb

@@ -0,0 +1,38 @@
+# Usefull usage of Diplomat lib: Services functions
+module DiplomaticBag
+  def self.compute_service_name(s)
+    return '/node::health/' if s.nil? || s == ''
+
+    s
+  end
+
+  def self.get_all_services_status(options = {})
+    result = {}
+    services = Diplomat::Health.state('any', options)
+    grouped_by_service = services.group_by { |h| compute_service_name(h['ServiceName']) }.values
+    grouped_by_service.each do |s|
+      grouped_by_status = s.group_by { |h| h['Status'] }.values
+      status = {}
+      grouped_by_status.each do |state|
+        status[state[0]['Status']] = state.count
+      end
+      service_name = compute_service_name(s[0]['ServiceName'])
+      result[service_name] = status
+    end
+    result
+  end
+
+  def self.get_services_list(service, options = {})
+    services = Diplomat::Service.get_all(options)
+    services.to_h.keys.grep(/#{service}/)
+  end
+
+  def self.get_services_info(service, options = {})
+    result = []
+    services = get_services_list(service, options)
+    services.each do |s|
+      result << get_service_info(s.to_s, options)
+    end
+    result
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomat
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.2.0
 platform: ruby
 authors:
 - John Hamelink
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-20 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -239,6 +239,12 @@ files:
 - lib/diplomat/session.rb
 - lib/diplomat/status.rb
 - lib/diplomat/version.rb
+- lib/diplomatic_bag.rb
+- lib/diplomatic_bag/datacenters.rb
+- lib/diplomatic_bag/info.rb
+- lib/diplomatic_bag/nodes.rb
+- lib/diplomatic_bag/service.rb
+- lib/diplomatic_bag/services.rb
 homepage: https://github.com/WeAreFarmGeek/diplomat
 licenses:
 - BSD-3-Clause