aly 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 929950a91790b6ca3522f18cb114d29d58ccc1d4c61e4de6b649198d5624ecf3
-  data.tar.gz: 0c55d48418ec5a8661f8ef912dc7fc647514c99be0c14964a2f2d7fb4ed78198
+  metadata.gz: 1f26b851dc09f00694624a45426546e11bc72c63de0a991ceb1e6b1e8989a3f1
+  data.tar.gz: e4f1e81074036af2e6565f0f98a30ffd7a81dc82a1c42bb878f6357c5a93cf55
 SHA512:
-  metadata.gz: e3e21c88c0dc447b9ca035786bbe4f1c4504f148a7731cb9cc8b9d1205152392e5e83d7fb702aaefd6f20ffb5acea3fc22677f3bccd20332c0914391ceae2e30
-  data.tar.gz: da9a871f358fa988084dc84f5498c3800bd6eefc8467dcae6faf81fc7f4a2aab60cc6128cf84d387103ff92b658611dda502c4a9f1beb2162100749a6dc0b3e8
+  metadata.gz: c762fdf73886adb7229a88510e613ec7d58966dc42cb1fe98bf3d84b7082274551e2201f08439953c467743561e90a4229d777294963d765a68987f0c3916c2d
+  data.tar.gz: 97f110b453a54434943d380ad960536dc26934ceff82b6f8fac8782011c38f2e8aba9692ff56cd8d5714c2df78926f0a947e965d78169e55f8d9fcf1f35d9796

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    aly (0.2.2)
+    aly (0.2.3)
       terminal-table (~> 1.8.0)
       thor (~> 0.20.0)
 

data/lib/aly/app.rb

@@ -63,6 +63,7 @@ module Aly
         end
       end
 
+
       if options['detail']
         puts JSON.pretty_generate(selected)
       else
@@ -94,6 +95,10 @@ module Aly
       raw_out = exec('slb', 'DescribeLoadBalancers', '--pager', **options)
       selected = raw_out['LoadBalancers']['LoadBalancer'] || []
 
+      eips = exec('vpc', 'DescribeEipAddresses', "--PageSize=#{selected.size}", **options)['EipAddresses']['EipAddress'].each_with_object({}) do |item, result|
+        result[item['InstanceId']] = item['IpAddress']
+      end
+
       listeners = (exec('slb', 'DescribeLoadBalancerListeners', '--pager', 'path=Listeners', **options)['Listeners'] || []).each_with_object({}) do |listener, result|
         instance_id = listener['LoadBalancerId']
         result[instance_id] ||= []
@@ -140,6 +145,7 @@ module Aly
             Id: row['LoadBalancerId'],
             Name: row['LoadBalancerName'],
             Address: row['Address'],
+            Eip: eips[row['LoadBalancerId']] || '',
             Listeners: listeners
           }
         end
@@ -148,7 +154,7 @@ module Aly
     end
 
     def slb_contains_host?(host)
-      @slb.any? { |lb| lb['Address'] == host }
+      @slb.any? { |lb| lb['Address'] == host || lb['Eip'] == host }
     end
 
     def ecs_contains_host?(host)
@@ -157,7 +163,7 @@ module Aly
 
     def show_slb(host, **options)
       @listeners ||= exec('slb', 'DescribeLoadBalancerListeners', '--pager', 'path=Listeners', **options)['Listeners'] || []
-      lb = @slb.find { |e| e['Address'] == host }
+      lb = @slb.find { |e| e['Address'] == host || e['Eip'] == host }
       listeners = @listeners.select { |e| e['LoadBalancerId'] == lb['LoadBalancerId'] }
       background_servers = exec('slb', 'DescribeLoadBalancerAttribute', "--LoadBalancerId=#{lb['LoadBalancerId']}", **options)['BackendServers']['BackendServer']
 
@@ -166,6 +172,7 @@ module Aly
         Id: lb['LoadBalancerId'],
         Name: lb['LoadBalancerName'],
         Address: lb['Address'],
+        Eip: lb['Eip'],
         Listeners: listeners.size
       }].table.to_s)
       puts
@@ -257,6 +264,12 @@ module Aly
       @slb ||= exec('slb', 'DescribeLoadBalancers', '--pager', **options)['LoadBalancers']['LoadBalancer'] || []
 
       @eip ||= exec('vpc', 'DescribeEipAddresses', '--PageSize=100', **options)['EipAddresses']['EipAddress'] || []
+
+      eip_map = @eip.each_with_object({}) { |eip, h| h[eip['InstanceId']] = eip['IpAddress'] }
+      @slb.each do |slb|
+        slb['Eip'] = eip_map[slb['LoadBalancerId']]
+      end
+
       unless @ecs
         @ecs = exec('ecs', 'DescribeInstances', '--pager', **options)['Instances']['Instance'] || []
         @ecs.each do |item|
@@ -282,7 +295,7 @@ module Aly
       elsif ecs_contains_host?(host)
         show_ecs(host)
       elsif eip_contains_host?(host)
-        eip(host)
+        eip(host, **options)
       else
         puts "Not found: #{host}"
       end

data/lib/aly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aly
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aly
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Liu Xiang