port-authority 0.4.6 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2a4e10d54d910de555798deb51e4311e1182d9bc
-  data.tar.gz: 693d8f129ab1a1102e04784be34e952561c19244
+  metadata.gz: 19da798e807911a92aba99e063385e16fe4df4d1
+  data.tar.gz: da3fe4c9ad5f824fd8fcbf49c8ef1e91ad8b392a
 SHA512:
-  metadata.gz: 8c1817f66a0872a6cab73f1628809dd6cb8b932b2aba3d673e64fca203d8138ca715df92e46c6b52b63451d704a434cfad390828cc5c6ae27ee4b5a7fec0814e
-  data.tar.gz: bb161b523118bf5100e7e64210e92b46983c2643fde1bb4aff2ceea5b74a6def589890707ea825344ea7004a1dd54fb445a5010dd16bc63728cfc732772dd962
+  metadata.gz: e0e8b128d235b4271dddc7d7c9e12b191118cf6dc55f56f2d537694c17da28332764f63540cafe19e57f46bfc2224b6b5e50902ff21722aef8809b5bf1e88837
+  data.tar.gz: a3993e2d0677d1baccf8c0a36127a6a7c3c4fe897dbd4b5b4b77e9a830ef3b3a48ea4753f091733782e1a489deaed31a19ebdf7badb28a105fc0a3d6203d20ee

data/bin/pa-manager

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-require 'port-authority/manager/app'
+require 'port-authority/manager'
 PortAuthority::Manager::App.new('pa-manager').run

data/bin/pa-service-list

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+require 'port-authority/services'
+PortAuthority::Services::App.new.run

data/lib/port-authority/services.rb

@@ -0,0 +1,97 @@
+require 'optparse'
+require 'json'
+require 'yaml'
+require 'etcd-tools'
+require 'etcd-tools/etcd'
+require 'port-authority/util/etcd'
+
+module PortAuthority
+  module Services
+    class App
+      include PortAuthority::Util::Etcd
+      include EtcdTools::Etcd
+
+      attr_reader :etcd
+
+      def optparse
+        @options = Hash.new
+        @options[:url] = ENV['ETCDCTL_ENDPOINT']
+        @options[:url] ||= "http://127.0.0.1:2379"
+        @options[:output_yaml] = false
+        @options[:output_json] = false
+        @options[:ip_only] = false
+        @options[:ports] = false
+        @options[:service_filter] = '.*'
+
+        OptionParser.new do |opts|
+          opts.banner = "Lists\n\nUsage: #{$0} [OPTIONS] NETWORK_NAME"
+          opts.separator ""
+          opts.separator "Connection options:"
+          opts.on("-u", "--url URL", "URL endpoint of the ETCD service (ETCDCTL_ENDPOINT envvar also applies) [DEFAULT: http://127.0.0.1:2379]") do |param|
+            @options[:url] = param
+          end
+
+          opts.separator ""
+          opts.separator "Filter options:"
+          opts.on("-s SERVICE_NAME", "--service-filter SERVICE_NAME", String, "List only services by name") do |param|
+            @options[:service_filter] = param
+          end
+
+          opts.separator ""
+          opts.separator "Output options:"
+          opts.on("-i", "--ips", "List only IPs (text mode)") do
+            @options[:ip_only] = true
+          end
+          opts.on("-p", "--ports", "List exposed ports (text mode)") do
+            @options[:ports] = true
+          end
+          opts.on("-y", "--yaml", "Output the data as YAML") do
+            @options[:output_yaml] = true
+          end
+          opts.on("-j", "--json", "Output the data as JSON") do
+            @options[:output_json] = true
+          end
+
+          opts.separator ""
+          opts.separator "Common options:"
+          opts.on_tail("-h", "--help", "show usage") do |param|
+            puts opts
+            exit! 0
+          end
+        end.parse!
+      end
+
+      def initialize
+        self.optparse
+        @network = ARGV.pop
+        unless @network
+          $stderr.puts "Missing NETWORK_NAME!"
+          exit 1
+        end
+        @etcd = etcd_connect @options[:url]
+      end
+
+      def run
+        services = list_services(@etcd, @network, @options[:service_filter])
+
+        if @options[:output_yaml]
+          puts services.to_yaml
+        elsif @options[:output_json]
+          puts services.to_json
+        else
+          if @options[:ip_only]
+            services.each { |name, params| puts "#{params['ip']}" }
+          elsif @options[:ports]
+            services.each do |name, params|
+              params['ports'].each do |port|
+                puts "#{name} #{params['ip']}:#{port}"
+              end
+            end
+          else
+            services.each { |name, params| puts "#{name} #{params['ip']}" }
+          end
+        end
+      end
+    end
+  end
+end

data/lib/port-authority/util/etcd.rb

@@ -26,6 +26,25 @@ module PortAuthority
         Socket.ip_address_list.map(&:ip_address).member?(swarm_leader(etcd).split(':').first)
       end
 
+      def overlay_id(etcd, name)
+        etcd.get_hash('/_pa/docker/network/v1.0/network').each_value do |network|
+          return network['id'] if network['name'] == name
+        end
+      end
+
+      def list_services(etcd, network, service_name='.*')
+        svc_filter = Regexp.new(service_name)
+        network_id = overlay_id(etcd, network)
+        services = Hash.new
+        etcd.get_hash("/_pa/docker/network/v1.0/endpoint/#{network_id}").each_value do |container|
+          next unless svc_filter.match container['name']
+          services[container['name']] = Hash.new
+          services[container['name']]['id'] = container['id']
+          services[container['name']]['ip'] = container['ep_iface']['addr'].sub(/\/[0-9]+$/, '')
+          services[container['name']]['ports'] = container['exposed_ports'].map { |port| port['Port'] }
+        end
+        services
+      end
     end
   end
 end

data/lib/port-authority.rb

@@ -2,6 +2,9 @@ module PortAuthority
   module Manager
   end
 
+  module Services
+  end
+
   module Util
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: port-authority
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.4.7
 platform: ruby
 authors:
 - Radek 'blufor' Slavicinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-08 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: etcd
@@ -93,16 +93,19 @@ dependencies:
 description: CLI Tools for PortAuthority
 email: radek.slavicinsky@gmail.com
 executables:
+- pa-service-list
 - pa-manager
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/pa-manager
+- bin/pa-service-list
 - lib/port-authority.rb
-- lib/port-authority/manager/app.rb
+- lib/port-authority/manager.rb
 - lib/port-authority/manager/init.rb
 - lib/port-authority/manager/threads/icmp.rb
 - lib/port-authority/manager/threads/swarm.rb
+- lib/port-authority/services.rb
 - lib/port-authority/util/config.rb
 - lib/port-authority/util/etcd.rb
 - lib/port-authority/util/helpers.rb