aly 0.3.1 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a2457a76990e5b419f291514cc1fef338740d4d92ec8e1cafef0722f5a9e898
-  data.tar.gz: 976571d639a35952bde380eac487c4d4532f5746d8c5ce39acc62f8d31dbb2d7
+  metadata.gz: 710c187d9fac4262f8c0507ba0334d54b983dd1bcdf19248e5f4cb2d52cf707d
+  data.tar.gz: ef60807c9b0184da58027f9048da53845924aaa5edcc4beac8c43d6dd0dd9236
 SHA512:
-  metadata.gz: b243a6c0e3424e6078441fa504eedad8c88a32a032134a6494fc4fc40fa4819d030e1d26c2ae15a88754e4b8f7fa8d669c149b5322ecb8cf2929c41937074891
-  data.tar.gz: 1c8dcfa337ab879b1fa4d45b7e92686286fee9c04e79231277cf6d051cacfc1c3e28b720b0e6aa709fc5f418164377718a65240fe40fadcba35411779cec443b
+  metadata.gz: f366b47ab659a41bb3e1d9aa78045e281fb3330b02fa41f193ed83561d50c5b8f4aef313f9916549081e0126a3284797c7b715136accc76eea1714da1abc99a3
+  data.tar.gz: 985ea70ca8b61ec19d9ab78c1db6f7692c5f5e992116f7b18c92c15943d0474165685530c2898f93e7bc1de5637f090fdd9839b3a79ef40ce655a72300f60b14

data/Gemfile.lock

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

data/lib/aly/app.rb

@@ -18,7 +18,7 @@ end
 module Aly
   class App
     def start(options)
-      send(options[:command], *options[:args], **options[:options])
+      send(options[:command], *options[:args], **(options[:options].transform_keys(&:to_sym)))
     end
 
     def ecs(*args, **options)
@@ -35,7 +35,20 @@ module Aly
         end
       end
 
-      if options['detail']
+      if options[:full]
+        selected = selected.map do |row|
+          {
+            Id: row['InstanceId'],
+            Name: row['InstanceName'],
+            PrivateIP: row['PrivateIP'],
+            PublicIP: row['PublicIP'],
+            CPU: row['Cpu'],
+            RAM: "#{row['Memory'] / 1024.0} GB",
+            WEB: "https://ecs.console.aliyun.com/#/server/#{row['InstanceId']}/monitor?regionId=#{row['RegionId']}"
+          }
+        end
+        puts selected.table&.to_s
+      elsif options[:detail]
         puts JSON.pretty_generate(selected)
       else
         selected = selected.map do |row|
@@ -64,7 +77,7 @@ module Aly
       end
 
 
-      if options['detail']
+      if options[:detail]
         puts JSON.pretty_generate(selected)
       else
         net_intefraces = exec('ecs', 'DescribeNetworkInterfaces', '--pager', **options)['NetworkInterfaceSets']['NetworkInterfaceSet'].each_with_object({}) do |item, result|
@@ -104,7 +117,8 @@ module Aly
                 Name: lb['LoadBalancerName'],
                 Address: lb['Address'],
                 Eip: lb['Eip'],
-                Listeners: listeners.size
+                Listeners: listeners.size,
+                WEB: "https://slb.console.aliyun.com/slb/#{lb['RegionId']}/slbs/#{lb['LoadBalancerId']}/listeners"
               }].table.to_s.gsub(/^/, '    '))
         puts
 
@@ -189,7 +203,7 @@ module Aly
         puts listener_rules.table.to_s.gsub(/^/, '    ')
         puts
 
-        if options['acl']
+        if options[:acl]
           acl_ids = listeners.flat_map { |listener| listener['AclIds'] || [] }.uniq
           unless acl_ids.empty?
             alc_entries = acl_ids.flat_map do |acl_id|
@@ -257,9 +271,9 @@ module Aly
         item['AllIPs'] = item['PrivateIP'] + item['PublicIP']
       end
 
-      if options['full']
+      if options[:full]
         full_slb(selected, eips, **options)
-      elsif options['detail']
+      elsif options[:detail]
         selected.each do |row|
           described_load_balancer_attributes = exec('slb', 'DescribeLoadBalancerAttribute', "--LoadBalancerId=#{row['LoadBalancerId']}", **options)
           row['BackendServers'] = described_load_balancer_attributes['BackendServers']['BackendServer']
@@ -405,25 +419,22 @@ module Aly
       puts listener_rules.table.to_s.gsub(/^/, '    ')
       puts
 
-      if options['acl']
-        acl_ids = listeners.flat_map { |listener| listener['AclIds'] || [] }.uniq
-        unless acl_ids.empty?
-          alc_entries = acl_ids.flat_map do |acl_id|
-            attr = exec('slb', 'DescribeAccessControlListAttribute', "--AclId=#{acl_id}", **options)
-            (attr.dig('AclEntrys', 'AclEntry') || []).each_with_index.map do |e, idx|
-              {
-                AclId: (idx.zero? ? attr['AclId'] : ''),
-                AclName: (idx.zero? ? attr['AclName'] : ''),
-                AclEntryIP: e['AclEntryIP'],
-                AclEntryComment: e['AclEntryComment']
-              }
-            end + [nil]
-          end
-          puts '    Access Control Lists:'
-          puts alc_entries[0..-2].table.to_s.gsub(/^/, '    ')
-          puts
+      acl_ids = listeners.flat_map { |listener| listener['AclIds'] || [] }.uniq
+      unless acl_ids.empty?
+        alc_entries = acl_ids.flat_map do |acl_id|
+          attr = exec('slb', 'DescribeAccessControlListAttribute', "--AclId=#{acl_id}", **options)
+          (attr.dig('AclEntrys', 'AclEntry') || []).each_with_index.map do |e, idx|
+            {
+              AclId: (idx.zero? ? attr['AclId'] : ''),
+              AclName: (idx.zero? ? attr['AclName'] : ''),
+              AclEntryIP: e['AclEntryIP'],
+              AclEntryComment: e['AclEntryComment']
+            }
+          end + [nil]
         end
-
+        puts '    Access Control Lists:'
+        puts alc_entries[0..-2].table.to_s.gsub(/^/, '    ')
+        puts
       end
     end
 
@@ -489,7 +500,7 @@ module Aly
 
     def exec(command, sub_command, *args, **options)
       command = "aliyun #{command} #{sub_command} #{args.join(' ')}"
-      command += " -p #{options['profile']}" if options['profile']
+      command += " -p #{options[:profile]}" if options[:profile]
       JSON.parse(`#{command}`)
     end
   end

data/lib/aly/version.rb

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

metadata

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