ufo 4.3.0 → 4.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a18cfeb62cd6924458083a9bd9726f03fc74cf38e5e9e75e1bcc0987a2cce0bf
-  data.tar.gz: ddcaad850b0446346e103facef3616cb9e647682b4d45cf9b51021a2159b1e37
+  metadata.gz: e4dfad82bcb8f29c81c11bec2298b540885b11337abf57b25371f4068a474b02
+  data.tar.gz: 352909476cc73ddab7f16a88bc5878b3be7a7f8bfdff85d22856570a0d7be5e4
 SHA512:
-  metadata.gz: d248be6a98f50af4f848e8a20da96f8a47e27a9e340276844c4ab41146aa42daead39b587026aa73fdf50c822f8b29b75fdeecc27ce41ca334a7bc7b6c20d099
-  data.tar.gz: 427d5cc7887712b84cf1e07ec3ea8cd599f9b8963f0f1ea47d03a7c900a96ea8e10b4a9ba65a4636f73f3e74293b79648f43f29f554547346222b7c2d23ace40
+  metadata.gz: 4d3cbfbd3ea2ce9622995c61e862188d5f0f7f67afe4bca7c9261f056d7f4b33edec6ba4e389198220007c376fab155dfc6c8d02fe8d1dc7c39df0a8fb4b5fc6
+  data.tar.gz: '09a4f4fc612c3f4ebcb782bc6fe146ebfb88b75bb5cfab5e55f712158fef225b18c11fd759c649a4bb7bf361655ccf750152d5e626fede67331a0c9d6dc23443'

data/CHANGELOG.md

@@ -3,6 +3,9 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [4.3.1]
+- #70 ps --status filter and fix list_tasks 100 limit issue
+
 ## [4.3.0]
 - Default starter ecs ec2 template to networkMode awsvpc
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ufo (4.2.1)
+    ufo (4.3.1)
       aws-sdk-cloudformation
       aws-sdk-cloudwatchlogs
       aws-sdk-ec2
@@ -19,17 +19,17 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (5.2.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    aws-eventstream (1.0.1)
-    aws-partitions (1.141.0)
+    aws-eventstream (1.0.2)
+    aws-partitions (1.144.0)
     aws-sdk-cloudformation (1.14.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-cloudwatchlogs (1.13.0)
+    aws-sdk-cloudwatchlogs (1.14.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-core (3.46.2)
@@ -37,28 +37,29 @@ GEM
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.71.0)
+    aws-sdk-ec2 (1.72.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-ecr (1.11.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-ecs (1.30.0)
+    aws-sdk-ecs (1.31.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-elasticloadbalancingv2 (1.21.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.3)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     byebug (11.0.0)
     cli_markdown (0.1.0)
     codeclimate-test-reporter (1.0.9)
       simplecov (<= 0.13)
-    concurrent-ruby (1.1.4)
+    concurrent-ruby (1.1.5)
     deep_merge (1.2.1)
     diff-lcs (1.3)
     docile (1.1.5)
-    i18n (1.5.3)
+    i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     json (2.2.0)

data/docs/_reference/ufo-ps.md

@@ -46,6 +46,8 @@ Skip the summary info:
 [--summary], [--no-summary]  # Display summary header info.
                              # Default: true
 [--extra], [--no-extra]      # Display extra debugging columns.
+[--status=STATUS]            # Status filter: all, pending, stopped, running.
+                             # Default: all
 [--verbose], [--no-verbose]  
 [--mute], [--no-mute]        
 [--noop], [--no-noop]        

data/lib/ufo/cli.rb

@@ -163,6 +163,7 @@ module Ufo
     long_desc Help.text(:ps)
     option :summary, type: :boolean, default: true, desc: "Display summary header info."
     option :extra, type: :boolean, default: false, desc: "Display extra debugging columns."
+    option :status, default: "all", desc: "Status filter: all, pending, stopped, running."
     def ps(service=:current)
       Ps.new(service, options).run
     end

data/lib/ufo/ps.rb

@@ -13,14 +13,18 @@ module Ufo
       end
 
       summary
+
       if task_arns.empty?
         puts "There are 0 running tasks."
         return
       end
 
-      resp = ecs.describe_tasks(tasks: task_arns, cluster: @cluster)
-      display_tasks(resp)
+      all_task_arns = task_arns.each_slice(100).map do |arns|
+        resp = ecs.describe_tasks(tasks: arns, cluster: @cluster)
+        resp["tasks"]
+      end.flatten
 
+      display_tasks(all_task_arns)
       display_scale_help
       display_target_group_help
     end
@@ -79,11 +83,11 @@ module Ufo
       end
     end
 
-    def display_tasks(resp)
+    def display_tasks(tasks)
       table = Text::Table.new
       Task.extra_columns = @options[:extra]
       table.head = Task.header
-      tasks = resp["tasks"].sort_by { |t| t["task_arn"] }
+      tasks = tasks.sort_by { |t| t["task_arn"] }
       tasks.each do |t|
         task = Task.new(t)
         table.rows << task.to_a unless task.hide?
@@ -91,17 +95,37 @@ module Ufo
       puts table
     end
 
+    def statuses
+      status = @options[:status].upcase
+      valid_statuses = %w[RUNNING PENDING STOPPED]
+      all_statuses = valid_statuses + ["ALL"]
+      unless all_statuses.include?(status)
+        puts "Invalid status filter provided. Please provided one of the following:"
+        puts all_statuses.map(&:downcase).join(", ")
+        exit 1
+      end
+
+      status == "ALL" ? valid_statuses : [status]
+    end
+
     def task_arns
       threads, results = [], {}
-      statuses = %w[RUNNING PENDING STOPPED]
       statuses.each do |status|
         threads << Thread.new do
-          resp = ecs.list_tasks(service_name: service.service_name, cluster: @cluster, desired_status: status)
+          options = {
+            service_name: service.service_name,
+            cluster: @cluster,
+            desired_status: status,
+          }
+          # Limit display of too many stopped tasks
+          options[:max_results] = 20 if status == "STOPPED"
+          resp = ecs.list_tasks(options)
           results[status] = resp.task_arns
         end
       end
       threads.map(&:join)
       results.values.flatten.uniq
     end
+    memoize :task_arns
   end
 end

data/lib/ufo/version.rb

@@ -1,3 +1,3 @@
 module Ufo
-  VERSION = "4.3.0"
+  VERSION = "4.3.1"
 end

data/spec/lib/ps_spec.rb

@@ -4,11 +4,11 @@ describe Ufo::Ps do
   end
 
   context "running tasks" do
-    let(:describe_tasks_response) do
-      JSON.load(IO.read("spec/fixtures/ps/describe_tasks.json"))
+    let(:task_arns) do
+      JSON.load(IO.read("spec/fixtures/ps/describe_tasks.json"))["tasks"]
     end
     it "display_tasks" do
-      ps.display_tasks(describe_tasks_response)
+      ps.display_tasks(task_arns)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ufo
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.3.1
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-cloudformation