awful 0.0.184 → 0.0.185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59dd0f87f7f3923ccb2513df11036452ae454876
-  data.tar.gz: 5fd17954751108e596562f5a2c60121203c628cc
+  metadata.gz: 87f2a0676250644bd5230e35158ba527dd25ba96
+  data.tar.gz: fe588f61abad3ecc1fdcd4eb713abf8e954938c9
 SHA512:
-  metadata.gz: acc31dd1f4fcafb05fa9edf887f3ef0f0cadee94f8ec173585764182403173044712a30a6908c154938533a44d7fcdea631bf882d52667686054ca8c1e518eac
-  data.tar.gz: 98e1a0ddfb2854a4e7382028403cf769bbcaf7d1ec708f35cc9ca811178c6002b7dc817b27b93edca08af637eb45e114e63b7e39cb70159eeb731f6ef4548f58
+  metadata.gz: 0bbd35722e545882c17ea07f6eaf3d387b1f323f26f007c329753c598394a51e5cb5e515b9a24a70675ce0c87c7b4b18c32f674cecd7cbe096e978c7dd2df515
+  data.tar.gz: e1b3fde92c3f5319bcd3eccd057f0dc6e7a0fe1f14db91c3fb419b1a9e7edf65cc859b974e6bcf41aff1aef7568fce9aac28d3614f4181c2be45c25a61600419

data/lib/awful.rb

@@ -88,6 +88,10 @@ module Awful
         @support ||= Aws::Support::Client.new
       end
 
+      def cf
+        @cf ||= Aws::CloudFormation::Client.new
+      end
+
       def symbolize_keys(thing)
         if thing.is_a?(Hash)
           Hash[ thing.map { |k,v| [ k.to_sym, symbolize_keys(v) ] } ]

data/lib/awful/cloudformation.rb

@@ -23,6 +23,16 @@ module Awful
       rollback_complete:                   :red,
     }
 
+    ## stack statuses that are not DELETE_COMPLETE
+    STATUSES = %i[
+      CREATE_IN_PROGRESS CREATE_FAILED CREATE_COMPLETE
+      ROLLBACK_IN_PROGRESS ROLLBACK_FAILED ROLLBACK_COMPLETE
+      DELETE_IN_PROGRESS DELETE_FAILED
+      UPDATE_IN_PROGRESS UPDATE_COMPLETE_CLEANUP_IN_PROGRESS UPDATE_COMPLETE
+      UPDATE_ROLLBACK_IN_PROGRESS UPDATE_ROLLBACK_FAILED UPDATE_ROLLBACK_COMPLETE_CLEANUP_IN_PROGRESS UPDATE_ROLLBACK_COMPLETE
+      REVIEW_IN_PROGRESS
+    ]
+
     no_commands do
       def color(string)
         set_color(string, COLORS.fetch(string.downcase.to_sym, :blue))
@@ -41,28 +51,16 @@ module Awful
     end
 
     desc 'ls [PATTERN]', 'list cloudformation stacks matching PATTERN'
-    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'Long listing'
-    method_option :all,  aliases: '-a', type: :boolean, default: false, desc: 'Show all, including stacks in DELETE_COMPLETE'
-    def ls(name = /./)
-      stacks = stack_summaries
-
-      ## skip deleted stacks unless -a given
-      unless options[:all]
-        stacks = stacks.select { |stack| stack.stack_status != 'DELETE_COMPLETE' }
-      end
-
-      ## match on given arg
-      stacks.select do |stack|
-        stack.stack_name.match(name)
+    method_option :long, aliases: '-l', type: :boolean, default: false, desc: 'long listing'
+    def ls(name = nil)
+      paginate(:stack_summaries) do |next_token|
+        cf.list_stacks(stack_status_filter: STATUSES, next_token: next_token)
+      end.tap do |stacks|
+        stacks.select! { |s| s.stack_name.match(name) } if name
       end.output do |list|
         if options[:long]
           print_table list.map { |s|
-            [
-              s.stack_name,
-              s.creation_time,
-              color(s.stack_status),
-              s.template_description,
-            ]
+            [s.stack_name, s.creation_time, color(s.stack_status), s.template_description]
           }.sort
         else
           puts list.map(&:stack_name).sort

data/lib/awful/s3.rb

@@ -18,11 +18,16 @@ module Awful
         nil
       end
 
-      ## get a stack if it exists, or nil
-      def cfn_stack(name)
-        name && cf.describe_stacks(stack_name: name)
-      rescue Aws::CloudFormation::Errors::ValidationError
-        nil
+      def get_stack_tag(name)
+        (get_tags(name) || []).find do |tag|
+          tag.key == 'aws:cloudformation:stack-name'
+        end&.value
+      end
+
+      def stack_exists?(name)
+        cf.describe_stacks(stack_name: name) && true
+      rescue ::Aws::CloudFormation::Errors::ValidationError
+        false
       end
     end
 
@@ -205,21 +210,14 @@ module Awful
       )
     end
 
-    desc 'orphans', 'get buckets tagged by a stack that no longer exists'
-    method_option :delete, aliases: '-d', type: :boolean, default: false, desc: 'delete empty orphaned buckets'
+    desc 'orphans', 'find empty buckets from a deleted CFN stack'
+    method_option :delete, type: :boolean, default: false, desc: 'delete orphaned buckets'
     def orphans
-      s3.list_buckets.buckets.each do |b|
-        stack = get_tags(b.name)&.find{ |t| t.key == 'aws:cloudformation:stack-name' }&.value
-        next if cfn_stack(stack) # not an orphan if stack exists
-
-        if options[:delete]
-          if s3.list_objects_v2(bucket: b.name, max_keys: 1).key_count == 0
-            s3.delete_bucket(bucket: b.name) if yes?("Delete empty bucket #{b.name}?", :yellow)
-          else
-            puts "#{b.name} not empty"
-          end
-        else
-          puts b.name
+      s3.list_buckets.buckets.each do |bucket|
+        if (stack = get_stack_tag(bucket.name))
+          next if stack_exists?(stack)
+          puts bucket.name
+          s3.delete_bucket(bucket: bucket.name) if options[:delete]
         end
       end
     end

data/lib/awful/version.rb

@@ -1,3 +1,3 @@
 module Awful
-  VERSION = '0.0.184'
+  VERSION = '0.0.185'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: awful
 version: !ruby/object:Gem::Version
-  version: 0.0.184
+  version: 0.0.185
 platform: ruby
 authors:
 - Ric Lister
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-21 00:00:00.000000000 Z
+date: 2018-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler