vaws 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ef88a26bd7a8546b4446da23d67d7bda2a1fc24fb4cf6e6b94b3289f3efd89e
-  data.tar.gz: 44eae4395d523b11ea01f5e13f254960177ac02957d41ff59084e5accdb9e880
+  metadata.gz: ca435519c8294b066a053a4bc36de39e8bd346bd9525c816078179d07b57739a
+  data.tar.gz: f6288d2518b0bdec627bf92a95ffc88b59546f08ef80c7fbbe94488d8177f1a6
 SHA512:
-  metadata.gz: 20c89a795c4df9904d7ae9f7351a962e6368b2c3a5f5d5b7724a69ee782ee89ca5d639086de2c63a58bea9978fc5b9893c77b801b22b7b51f888bb3e92875615
-  data.tar.gz: b43a6f6737b2b01ff117d77b1d7038a2ad13e167a3166f377ff7cdeaf9741b01759a7d214cc6d621f9a90dcdabe323f02f21585d38d8c2b7fba8f15557f96275
+  metadata.gz: e05a075e2a9cbd643125f48f3af753d75237e75e43af04fb17bab6a020cb02b9347c15994870e351b69ce5dec53a6464d873f14ad43da6e08a2b063df0c1f999
+  data.tar.gz: e7480c918eb5fbeb6bceaa2311f7d9cc75947f63c0db22b4d27a0781f4ee35bb51d5b7eb4984f91cd0efffaeb38ebe15e2cb38cd3effba480cd7fd62b72c41e7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    vaws (0.8.1)
+    vaws (0.8.2)
       aws-sdk-acm
       aws-sdk-ec2
       aws-sdk-ecs
@@ -60,7 +60,7 @@ GEM
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
     thor (0.20.3)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.7.0)
 
 PLATFORMS
   ruby

data/lib/vaws/aws/describer.rb

@@ -2,8 +2,14 @@ module Vaws
   module Aws
     class Describer
       #TODO Add def to confirm AWS credential
-      def set_basic_info
-        raise NotImplementedError
+
+      # 単一のオプションしか許可されていないコマンドのオプション数を確認
+      def single_option_validation(*options)
+        options_count = options.length - options.count(nil)
+        if options_count > 1
+          puts "Can't specify more than one option"
+          exit 1
+        end
       end
     end
   end

data/lib/vaws/aws/ecs_describer.rb

@@ -4,36 +4,90 @@ require 'vaws/aws/describer'
 module Vaws
   module Aws
     class EcsDescriber < Describer
-      attr_reader :term_table
-
       def initialize
-        @ecs_client   = ::Aws::ECS::Client.new
-        @term_table   = ''
-        @cluster_arns = []
-        @cluster_info = {}
+        @ecs_client = ::Aws::ECS::Client.new
       end
 
-      def set_basic_info
-        rows = []
+      def terminal_table(opt_tasks:, opt_networks:, opt_services:)
+        single_option_validation(opt_tasks, opt_networks, opt_services)
+        table = tasks if opt_tasks
+        table = networks if opt_networks
+        table = services if opt_services
+        table = clusters if opt_tasks.nil? && opt_networks.nil? && opt_services.nil?
+        table
+      end
 
+      private
+
+      def clusters
+        rows = []
         cluster_arns.each do |cluster_arn|
-          cluster_name = cluster_arn.gsub(/arn:aws:ecs:#{ENV['AWS_DEFAULT_REGION']}:[0-9]*:cluster\//, "")
-          @cluster_info.store("#{cluster_name}", {})
-          cluster_name     = "#{cluster_name}"
-          cluster_services = service_names(cluster_arn)
+          cluster_name     = cluster_arn.gsub(/arn:aws:ecs:#{ENV['AWS_DEFAULT_REGION']}:[0-9]*:cluster\//, "")
+          cluster_services = service_arns(cluster_arn).join("\n").gsub(/.*:[0-9]*:service\//, "")
 
           ecs_cluster           = @ecs_client.describe_clusters({ clusters: ["#{cluster_arn}"] }).clusters
           running_tasks_count   = ecs_cluster[0].running_tasks_count
           pending_tasks_count   = ecs_cluster[0].pending_tasks_count
           active_services_count = ecs_cluster[0].active_services_count
 
-          rows << [cluster_name, cluster_services, active_services_count, running_tasks_count, pending_tasks_count]
+          rows << [cluster_name, active_services_count, running_tasks_count, pending_tasks_count, cluster_services]
         end
 
-        @term_table = Terminal::Table.new :headings => ['ClusterName', 'Services', 'ActService', 'RunTask', 'PenTask'], :rows => rows.sort
+        Terminal::Table.new :headings => ['ClusterName', 'ActService', 'RunTask', 'PenTask', 'Services'], :rows => rows.sort
       end
 
-      private
+      def tasks
+        rows                                                        = []
+        lb_target_group                                             = nil
+        task, d_count, p_count, r_count, updated_at, sg, c_provider = nil
+        cluster_arn                                                 = selected_cluster_arn
+        cluster_name                                                = cluster_arn.gsub(/.*:cluster\//, '')
+        service_names                                               = service_names(cluster_arn)
+
+        service_names.each_slice(1).to_a.each do |s|
+          describe_services(cluster: cluster_name, service_names: s).services.each do |ds|
+            ds.load_balancers.each do |lb|
+              lb_target_group = lb.target_group_arn.gsub(/.*:targetgroup\//, '')
+            end
+
+            ds.deployments.each do |d|
+              task       = d.task_definition.gsub(/.*:task-definition\//, '')
+              d_count    = d.desired_count
+              p_count    = d.pending_count
+              r_count    = d.running_count
+              updated_at = d.updated_at
+              sg         = d.network_configuration.awsvpc_configuration.security_groups.join(',') if d.network_configuration
+              if d.capacity_provider_strategy
+                d.capacity_provider_strategy.each do |c|
+                  c_provider = c.capacity_provider
+                end
+              else
+                c_provider = "EC2"
+              end
+            end
+
+            rows << [task, d_count, r_count, p_count, lb_target_group, sg, updated_at, c_provider]
+            task, d_count, r_count, p_count, lb_target_group, sg, updated_at, c_provider = nil
+          end
+        end
+
+        Terminal::Table.new :headings => ['TaskDefinition', 'Desired', 'Running', 'Pending', 'LbTargetGroup', 'SecurityGroup', 'UpdatedAt', 'CapacityProvider'], :rows => rows.sort
+      end
+
+      def networks
+        # TODO
+      end
+
+      def services
+        # TODO
+      end
+
+      def describe_services(cluster:, service_names:)
+        @ecs_client.describe_services({
+          cluster:  cluster,
+          services: service_names,
+        })
+      end
 
       def cluster_arns
         param_args = {
@@ -42,17 +96,36 @@ module Vaws
         @ecs_client.list_clusters(param_args)[:cluster_arns]
       end
 
+      def selected_cluster_arn
+        puts "# CLUSTER LIST"
+        arns = cluster_arns
+        arns.each_with_index do |arn, cnt|
+          puts "#{cnt}: #{arn}"
+        end
+        print "cluster numbner:"
+        input = STDIN.gets
+        begin
+          raise unless /[0-9].*/ =~ input
+          input_cluster_number = input.to_i
+          arns[input_cluster_number]
+        rescue
+          puts "Not found cluster"
+          exit
+        end
+      end
+
       def service_arns(cluster_arn)
-        param_args = {
-          cluster:     cluster_arn,
-          max_results: 1
-        }
-        @ecs_client.list_services(param_args)[:service_arns]
+        service_ary = []
+        service_ary << @ecs_client.list_services({ cluster: "#{cluster_arn}", max_results: 100 })[:service_arns].sort
       end
 
       def service_names(cluster_arn)
-        service_ary = @ecs_client.list_services({ cluster: "#{cluster_arn}", max_results: 100 })[:service_arns].sort
-        service_ary.join("\n").gsub(/arn:aws:ecs:#{ENV['AWS_DEFAULT_REGION']}:[0-9]*:service\//, "")
+        service_ary = []
+        names       = []
+        service_ary << @ecs_client.list_services({ cluster: "#{cluster_arn}", max_results: 100 })[:service_arns].sort.each do |arn|
+          names << arn.gsub(/.*:[0-9]*:service\//, "")
+        end
+        names
       end
     end
   end

data/lib/vaws/handlers/describer.rb

@@ -46,11 +46,13 @@ module Vaws
       end
 
       desc 'ecs', 'View ECS'
+      option :tasks, aliases: 't', :type => :boolean
+      option :networks, aliases: 'n', :type => :boolean
+      option :services, aliases: 's', :type => :boolean
 
       def ecs
-        ecs_desc = Vaws::Aws::EcsDescriber.new
-        ecs_desc.set_basic_info
-        puts ecs_desc.term_table
+        describer = Vaws::Aws::EcsDescriber.new
+        puts describer.terminal_table(opt_tasks: options["tasks"], opt_networks: options["networks"], opt_services: options["services"])
       end
 
       desc 'route53', 'View Route53'

data/lib/vaws/version.rb

@@ -1,3 +1,3 @@
 module Vaws
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vaws
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Shota Ito
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler