diplomatic_bag 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641df0432390b52215d6063148e94b402ea200fa5a424ca2499c98aa8ba2d88a
-  data.tar.gz: 4a0ddc8cc86c54a6e52ed1a6b387a21ed206c1fc2743196b3e143cc06db169b7
+  metadata.gz: 313e9bcc3a63667959e8cf0782357d2dc0a20e98879d20743f90cc470fab7fcb
+  data.tar.gz: ea7b73ede3b6d3b08e350b90fa2bf86415273ec25f744762c0ca8c1d6a23390a
 SHA512:
-  metadata.gz: 0f1568f519ef9b7b685bd07905b60ba441051a928c3ec11e0a1b1ae5bae0c4ff15096749c6ac55a52d82a2d34640b99558b5a5bd1cd708e383dfbd59a19240a3
-  data.tar.gz: 34193eac2e23dff911c8c8845a0998102f0a88bafd5e4d9104c29c184d2d934bfd1bd376217a240cf76383efd25787a3779070f449045c0f73db998087ecf960
+  metadata.gz: 746d01ce05942b34c25d60e6997e980b763764ebb3807692c212e36c104987d98297666f863bc899055ae172717c06777c3408ab3307d586a4614505eb2cead5
+  data.tar.gz: 24d806c41db58b9b764881723d14dcafd0b46f066b6359cd53ff2b80f6f48cceec48a14d733e0bb9ff068954283275f04afa16c70c985599b98f900fbcd6f79c

data/bin/consul-cli

@@ -0,0 +1,114 @@
+#!/usr/bin/env ruby
+# rubocop:disable all
+
+require 'diplomatic_bag'
+require 'optparse'
+
+def syntax
+  printf "USAGE: #{$PROGRAM_NAME} [[action]] [[options]]\n\n" \
+          "\t#{$PROGRAM_NAME} services list [options]\n" \
+          "\t#{$PROGRAM_NAME} service status <service-name> [options]\n" \
+          "\t#{$PROGRAM_NAME} info [options]\n" \
+          "\t#{$PROGRAM_NAME} nodes list-duplicate-id [options]\n\n" \
+          "Options:\n" \
+          "\t-a, --http-addr\t\tThe `address` and port of the Consul HTTP agent\n" \
+          "\t-d, --datacenter\tName of the datacenter to query\n" \
+          "\t-f, --format\t\tOutput format (json|text)\n" \
+          "\t-t, --token\t\tACL token to use in the request\n"
+  exit 0
+end
+
+def launch_query(arguments, options)
+  case arguments[0]
+  when 'services'
+    if arguments[1] == 'list'
+      DiplomaticBag.get_all_services_status(options)
+    else
+      syntax
+      exit 0
+    end
+  when 'service'
+    if arguments[1] == 'status'
+      DiplomaticBag.get_services_info(arguments[2], options)
+    else
+      syntax
+      exit 0
+    end
+  when 'info'
+    DiplomaticBag.consul_info(options)
+  when 'nodes'
+    if arguments[1] == 'list-duplicate-id'
+      DiplomaticBag.get_duplicate_node_id(options)
+    else
+      syntax
+      exit 0
+    end
+  else
+    syntax
+    exit 0
+  end
+end
+
+def parse_as_text(input, indent)
+  case input
+  when Array
+    input.each do |v|
+      parse_as_text(v, indent)
+    end
+  when Hash
+    input.each do |k, v|
+      print "#{indent}#{k}:\n"
+      parse_as_text(v, indent+'  ')
+    end
+  else
+    print "#{indent}#{input}\n"
+  end
+end
+
+options = {http_addr: ENV['CONSUL_HTTP_ADDR'] || 'localhost:8500'}
+params = {}
+output = {}
+
+OptionParser.new do |opts|
+  opts.banner = "USAGE: #{$PROGRAM_NAME} -a [[action]] [[options]]"
+
+  opts.on('-h', '--help', 'Show help') do
+    syntax
+  end
+
+  opts.on("-a", "--http-addr [CONSUL_URL]", "The `address` and port of the Consul HTTP agent") do |server|
+    options[:http_addr] = server
+  end
+
+  opts.on("-d", "--datacenter [DATACENTER]", "Name of the datacenter to query (services option)") do |dc|
+    params[:dcs] = dc
+  end
+
+  opts.on("-f", "--format TYPE", [:json, :txt], "Output format") do |format|
+    params[:format] = format
+  end
+
+  opts.on("-t", "--token [TOKEN]", "ACL token to use in the request") do |token|
+    options[:token] = token
+  end
+end.parse!
+
+options[:http_addr] = "http://#{options[:http_addr]}" unless options[:http_addr].start_with? 'http'
+
+if params[:dcs]
+  dcs = DiplomaticBag.get_datacenters_list(params[:dcs].split(','), options)
+  dcs.each do |dc|
+    options[:dc] = dc
+    output[dc] = launch_query(ARGV, options)
+  end
+else
+  output = launch_query(ARGV, options)
+end
+case params[:format]
+when :json
+  puts JSON.pretty_generate(output) unless output == {}
+else
+  parse_as_text(output, '') unless output == {}
+end
+
+# rubocop:enable all

data/lib/diplomat/version.rb

@@ -1,3 +1,3 @@
 module Diplomat
-  VERSION = '2.2.1'.freeze
+  VERSION = '2.2.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: diplomatic_bag
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Nicolas Benoit
@@ -14,16 +14,16 @@ dependencies:
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 2.2.2
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.2.2
 description: Toolbox for Consul
 email:
 - n.benoit@criteo.com
@@ -33,6 +33,7 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README.md
+- bin/consul-cli
 - features/configuration.feature
 - features/step_definitions/setup_diplomat.rb
 - features/step_definitions/test_key_value.rb