aly 0.2.0 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a67b93ee1a1850b5f9af5afaffbd14d0d989f2394571f09c7a5d22382a128535
-  data.tar.gz: 837c13099835afd7b34f2e7db2143fb96ad1c208083ba84ee2bda0fd15eb1ed7
+  metadata.gz: 1f26b851dc09f00694624a45426546e11bc72c63de0a991ceb1e6b1e8989a3f1
+  data.tar.gz: e4f1e81074036af2e6565f0f98a30ffd7a81dc82a1c42bb878f6357c5a93cf55
 SHA512:
-  metadata.gz: 480f9262bdc049a8b6028fd3cbaca0b3ca7e6be60506464be6a51e65cb227add6e74447d43ded3bccb8870294c8874f0736522c2ed0ae9bae243c50e09d417c5
-  data.tar.gz: 93bd2d071c76d4eb30552e7512e061e583906470debe1cd1b59d9a4ee70f1bc3a1397099b33bf19a9fc443fe297624771c405492ad6981fee56847f0d398875a
+  metadata.gz: c762fdf73886adb7229a88510e613ec7d58966dc42cb1fe98bf3d84b7082274551e2201f08439953c467743561e90a4229d777294963d765a68987f0c3916c2d
+  data.tar.gz: 97f110b453a54434943d380ad960536dc26934ceff82b6f8fac8782011c38f2e8aba9692ff56cd8d5714c2df78926f0a947e965d78169e55f8d9fcf1f35d9796

data/Gemfile.lock

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

data/lib/aly/app.rb

@@ -22,11 +22,11 @@ module Aly
     end
 
     def ecs(*args, **options)
-      raw_out = exec('ecs', 'DescribeInstances', '--pager')
-      selected = raw_out['Instances']['Instance'].each do |item|
-        item['PrivateIP'] = (item['NetworkInterfaces']['NetworkInterface'] || []).map { |ni| ni['PrimaryIpAddress'] }.join(', ')
+      raw_out = exec('ecs', 'DescribeInstances', '--pager', **options)
+      selected = (raw_out['Instances']['Instance'] || []).each do |item|
+        item['PrivateIP'] = (item['NetworkInterfaces']['NetworkInterface'] || []).map { |ni| ni['PrimaryIpAddress'] }.join(',')
         item['PublicIP'] = item['EipAddress']['IpAddress'] || ''
-        item['PublicIP'] = item['PublicIpAddress']['IpAddress'].join(', ') if item['PublicIP'] == ''
+        item['PublicIP'] = item['PublicIpAddress']['IpAddress'].join(',') if item['PublicIP'] == ''
       end
 
       if query = args.first&.split(',')
@@ -54,7 +54,7 @@ module Aly
 
     def eip(*args, **options)
       puts 'EIPs:'
-      raw_out = exec('vpc', 'DescribeEipAddresses', '--PageSize=100')
+      raw_out = exec('vpc', 'DescribeEipAddresses', '--PageSize=100', **options)
       selected = raw_out['EipAddresses']['EipAddress']
 
       if query = args.first&.split(',')
@@ -63,10 +63,11 @@ module Aly
         end
       end
 
+
       if options['detail']
         puts JSON.pretty_generate(selected)
       else
-        net_intefraces = exec('ecs', 'DescribeNetworkInterfaces', '--pager')['NetworkInterfaceSets']['NetworkInterfaceSet'].each_with_object({}) do |item, result|
+        net_intefraces = exec('ecs', 'DescribeNetworkInterfaces', '--pager', **options)['NetworkInterfaceSets']['NetworkInterfaceSet'].each_with_object({}) do |item, result|
           result[item['NetworkInterfaceId']] = item
         end
         selected = selected.map do |row|
@@ -91,10 +92,14 @@ module Aly
     end
 
     def slb(*args, **options)
-      raw_out = exec('slb', 'DescribeLoadBalancers', '--pager')
-      selected = raw_out['LoadBalancers']['LoadBalancer']
+      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')['Listeners'].each_with_object({}) do |listener, result|
+      listeners = (exec('slb', 'DescribeLoadBalancerListeners', '--pager', 'path=Listeners', **options)['Listeners'] || []).each_with_object({}) do |listener, result|
         instance_id = listener['LoadBalancerId']
         result[instance_id] ||= []
         result[instance_id] << listener
@@ -112,11 +117,11 @@ module Aly
 
       if options['detail']
         selected.each do |row|
-          described_load_balancer_attributes = exec('slb', 'DescribeLoadBalancerAttribute', "--LoadBalancerId=#{row['LoadBalancerId']}")
+          described_load_balancer_attributes = exec('slb', 'DescribeLoadBalancerAttribute', "--LoadBalancerId=#{row['LoadBalancerId']}", **options)
           row['BackendServers'] = described_load_balancer_attributes['BackendServers']['BackendServer']
 
           row['Listeners'].select { |e| e['VServerGroupId'] }.each do |listener|
-            vserver_group = exec('slb', 'DescribeVServerGroupAttribute', "--VServerGroupId=#{listener['VServerGroupId']}")
+            vserver_group = exec('slb', 'DescribeVServerGroupAttribute', "--VServerGroupId=#{listener['VServerGroupId']}", **options)
             listener['VServerGroup'] = vserver_group
           end
         end
@@ -140,6 +145,7 @@ module Aly
             Id: row['LoadBalancerId'],
             Name: row['LoadBalancerName'],
             Address: row['Address'],
+            Eip: eips[row['LoadBalancerId']] || '',
             Listeners: listeners
           }
         end
@@ -148,34 +154,40 @@ 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)
       @ecs.any? { |item| item['AllIPs'].include?(host) }
     end
 
-    def show_slb(host)
-      @listeners ||= exec('slb', 'DescribeLoadBalancerListeners', '--pager', 'path=Listeners')['Listeners']
-      lb = @slb.find { |e| e['Address'] == host }
+    def show_slb(host, **options)
+      @listeners ||= exec('slb', 'DescribeLoadBalancerListeners', '--pager', 'path=Listeners', **options)['Listeners'] || []
+      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']}")['BackendServers']['BackendServer']
+      background_servers = exec('slb', 'DescribeLoadBalancerAttribute', "--LoadBalancerId=#{lb['LoadBalancerId']}", **options)['BackendServers']['BackendServer']
 
       puts 'LoadBalancers:'
       puts([{
         Id: lb['LoadBalancerId'],
         Name: lb['LoadBalancerName'],
         Address: lb['Address'],
-        Listeners: listeners.size,
-        BackendServers: background_servers.map { |e| e['ServerId'] }.join(', ')
+        Eip: lb['Eip'],
+        Listeners: listeners.size
       }].table.to_s)
       puts
 
+      if background_servers && background_servers.size > 0
+        puts 'Default Backend Servers:'
+        puts background_servers.table.to_s
+        puts
+      end
+
       listeners_info = listeners.map do |listener|
         {
           Port: listener['ListenerPort'],
           Protocol: listener['ListenerProtocol'],
-          Status: listener['ListenerStatus'],
+          Status: listener['Status'],
           BackendServerPort: listener['BackendServerPort'],
           ForwardPort: listener.dig('HTTPListenerConfig', 'ForwardPort'),
           VServerGroup: listener['VServerGroupId']
@@ -188,11 +200,11 @@ module Aly
 
       listeners_info.each do |listener|
         if listener[:VServerGroup]
-          vserver_group = exec('slb', 'DescribeVServerGroupAttribute', "--VServerGroupId=#{listener[:VServerGroup]}")["BackendServers"]["BackendServer"]
+          vserver_group = exec('slb', 'DescribeVServerGroupAttribute', "--VServerGroupId=#{listener[:VServerGroup]}", **options)["BackendServers"]["BackendServer"]
           puts "VServerGroup #{listener[:VServerGroup]}:"
           puts(vserver_group.map { |e|
             {
-              EcInstanceId: e['ServerId'],
+              EcsInstanceId: e['ServerId'],
               Port: e['Port'],
               Weight: e['Weight'],
               Type: e['Type']
@@ -205,7 +217,7 @@ module Aly
       ecs_ids = background_servers.map { |e| e['ServerId'] }
       ecs_ids += listeners_info.flat_map { |e|
         if e[:VServerGroup]
-          exec('slb', 'DescribeVServerGroupAttribute', "--VServerGroupId=#{e[:VServerGroup]}")["BackendServers"]["BackendServer"].map { |e| e['ServerId'] }
+          exec('slb', 'DescribeVServerGroupAttribute', "--VServerGroupId=#{e[:VServerGroup]}", **options)["BackendServers"]["BackendServer"].map { |e| e['ServerId'] }
         else
           []
         end
@@ -220,8 +232,8 @@ module Aly
         {
           Id: row['InstanceId'],
           Name: row['InstanceName'],
-          PrivateIP: row['PrivateIP'].join(', '),
-          PublicIP: row['PublicIP'].join(', '),
+          PrivateIP: row['PrivateIP'].join(','),
+          PublicIP: row['PublicIP'].join(','),
           CPU: row['Cpu'],
           RAM: "#{row['Memory'] / 1024.0} GB"
         }
@@ -234,8 +246,8 @@ module Aly
         {
           Id: row['InstanceId'],
           Name: row['InstanceName'],
-          PrivateIP: row['PrivateIP'].join(', '),
-          PublicIP: row['PublicIP'].join(', '),
+          PrivateIP: row['PrivateIP'].join(','),
+          PublicIP: row['PublicIP'].join(','),
           CPU: row['Cpu'],
           RAM: "#{row['Memory'] / 1024.0} GB"
         }
@@ -249,11 +261,17 @@ module Aly
     end
 
     def show(*args, **options)
-      @slb ||= exec('slb', 'DescribeLoadBalancers', '--pager')['LoadBalancers']['LoadBalancer']
+      @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
 
-      @eip ||= exec('vpc', 'DescribeEipAddresses', '--PageSize=100')['EipAddresses']['EipAddress']
       unless @ecs
-        @ecs = exec('ecs', 'DescribeInstances', '--pager')['Instances']['Instance']
+        @ecs = exec('ecs', 'DescribeInstances', '--pager', **options)['Instances']['Instance'] || []
         @ecs.each do |item|
           item['PrivateIP'] = (item['NetworkInterfaces']['NetworkInterface'] || []).map { |ni| ni['PrimaryIpAddress'] }
           item['PublicIP'] = []
@@ -273,18 +291,20 @@ module Aly
       puts
 
       if slb_contains_host?(host)
-        show_slb(host)
+        show_slb(host, **options)
       elsif ecs_contains_host?(host)
         show_ecs(host)
       elsif eip_contains_host?(host)
-        eip(host)
+        eip(host, **options)
       else
         puts "Not found: #{host}"
       end
     end
 
-    def exec(command, sub_command, *args)
-      JSON.parse(`aliyun #{command} #{sub_command} #{args.join(' ')}`)
+    def exec(command, sub_command, *args, **options)
+      command = "aliyun #{command} #{sub_command} #{args.join(' ')}"
+      command += " -p #{options['profile']}" if options['profile']
+      JSON.parse(`#{command}`)
     end
   end
 end

data/lib/aly/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aly
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.3
 platform: ruby
 authors:
 - Liu Xiang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2022-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor