aws-cleanup 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d76a721be9a48db71abf45c602cdd0f69bf2e078
-  data.tar.gz: 634f6578225b28789a040a48eb88b0bc9be6f064
+  metadata.gz: 02e9500fcca4dfdde54f6f7192d98edcccf7535f
+  data.tar.gz: 7dc4b26dd7fbffdcae6525927dda09e5e5d01059
 SHA512:
-  metadata.gz: 918b6032b0dfd66a382466ecf50d0b3dded623e2a87d2499783a4f0fd552e2a5040f15a9d269d118c27de014a8848a92d7f8a4c8318dfe1bef99163c09ca101f
-  data.tar.gz: 71e69e3bd5b27bace431c01413b9ef05c7f37b0de47b2502bb3d825d38b1ac875b7082d949bc54a930150be5f799d82ad32cb97e5d3c46ef03cf940182047e4e
+  metadata.gz: 929a7bf9ded486e1769500f32453c263f417275d3f9a4c2612898621260172116f6077418822fea70b99ffe85393632c752690c5c0964658cf552acf58d694d4
+  data.tar.gz: 8c0609881fe5016af4922830c7e2ab731811a8d2d33648ad9a68d99b4280d30e38fcf469f19568cc300941e7adc3a0e7001b8e9c9ef4d8a2b28ab7a5e8751ce1

data/.gitignore

@@ -1,9 +1,10 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
 /pkg/
 /spec/reports/
 /tmp/
+
+.byebug_history

data/.rubocop.yml

@@ -3,3 +3,9 @@ LineLength:
 
 MethodLength:
   Max: 30
+
+AbcSize:
+  Max: 30
+
+Documentation:
+  Enabled: false

data/Gemfile.lock

@@ -0,0 +1,45 @@
+PATH
+  remote: .
+  specs:
+    aws-cleanup (1.0.1)
+      aws-sdk
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-sdk (2.9.16)
+      aws-sdk-resources (= 2.9.16)
+    aws-sdk-core (2.9.16)
+      aws-sigv4 (~> 1.0)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.9.16)
+      aws-sdk-core (= 2.9.16)
+    aws-sigv4 (1.0.0)
+    diff-lcs (1.3)
+    jmespath (1.3.1)
+    rake (10.5.0)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aws-cleanup!
+  bundler (~> 1.13)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+
+BUNDLED WITH
+   1.13.3

data/exe/aws-cleanup

@@ -1,4 +1,4 @@
 require 'rubygems'
 require 'aws-cleanup'
 
-AwsCleanup.run
+AwsCleanup.run ARGV[0]

data/lib/aws-cleanup.rb

@@ -5,100 +5,27 @@ class AwsCleanup
   TEST_INSTANCE_EXPIRE_AGE = (3_600 * 24).freeze
   TEST_GROUP_ID = 'sg-1e804874'.freeze
   TEST_GROUP_NAME = 'ci-testing'.freeze
+  DELETE_LIMIT = 10
 
-  def self.run
-    AwsCleanup.new.run
+  def self.run(resource)
+    AwsCleanup.new.run resource
   end
 
-  def run
-    cleanup_instances
-    cleaup_alarms
-  end
-
-  private
-
-  def cleanup_instances
-    eii = expired_instances_ids
-    return unless eii.any?
-    puts 'Deleting instances: ' + eii.join(', ')
-    ec2.terminate_instances instance_ids: eii
-  end
-
-  def cleaup_alarms
-    oa = orphaned_alarms.map(&:alarm_name)
-    return unless oa.any?
-    puts 'Deleting alarms: ' + oa.join(', ')
-    cloudwatch.delete_alarms alarm_names: oa
-  end
-
-  def orphaned_alarms
-    insufficient_data_alarms.select do |alarm|
-      alarm.dimensions.any? &&
-        !alarm.dimensions.find { |dimension| dimension_in_use? dimension }
+  def run(resource = nil)
+    if resource
+      require "#{resource}-cleanup"
+      AwsCleanup.const_get("#{resource.capitalize}Cleanup").run
+      return
     end
-  end
 
-  def dimension_in_use?(dimension)
-    case dimension.name
-    when 'InstanceId'
-      instance_ids.include? dimension.value
-    when 'QueueName'
-      queue_names.include? dimension.value
-    when 'DBInstanceIdentifier'
-      db_names.include? dimension.value
-    else
-      puts "Unsupported dimension: #{dimension.name}"
-      true
+    Dir.glob(File.dirname(File.absolute_path __FILE__) + '/modules/*').each do |resource_file|
+      require resource_file
+      class_name = "#{File.basename(resource_file).sub('.rb', '').capitalize}Cleanup"
+      AwsCleanup.const_get(class_name).run
     end
   end
 
-  def queue_names
-    @queue_names ||= sqs.list_queues.queue_urls.map { |q| URI(q).path.split('/')[2..-1].join('/') }
-  end
-
-  def db_names
-    @db_names ||= rds.describe_db_instances.db_instances.map(&:db_instance_identifier)
-  end
-
-  def expired_instances_ids
-    expired_instances.map(&:instance_id)
-  end
-
-  def expired_instances
-    expired_test_instances | instances_expired_by_tag
-  end
-
-  def expired_test_instances
-    test_instances.select { |instance| expired_age? TEST_INSTANCE_EXPIRE_AGE, instance.launch_time }
-  end
-
-  def test_instances
-    instances.select do |instance|
-      instance.security_groups.find do |sg|
-        sg.group_name == TEST_GROUP_NAME || sg.group_id == TEST_GROUP_ID
-      end ||
-        instance.tags.find { |t| t.key == 'Type' && t.value == 'test' }
-    end
-  end
-
-  def instances_expired_by_tag
-    instances.select do |instance|
-      instance.tags.find do |t|
-        (t.key == 'expire_after' && expired_age?(t.value, instance.launch_time)) ||
-          (t.key == 'expires' && expired_time?(t.value))
-      end
-    end
-  end
-
-  def expired_age?(secs, launch_time)
-    Time.now > (launch_time + secs)
-  end
-
-  def expired_time?(timestamp)
-    # `timestamp` should be a string in this format:
-    # 2017-05-10 13:04:01 -0400
-    Time.now > Time.parse(timestamp)
-  end
+  private
 
   def instance_ids
     instances.map(&:instance_id)
@@ -111,23 +38,7 @@ class AwsCleanup
       ).reservations.map(&:instances).flatten
   end
 
-  def insufficient_data_alarms
-    cloudwatch.describe_alarms(state_value: 'INSUFFICIENT_DATA').metric_alarms
-  end
-
-  def cloudwatch
-    @cloudwatch ||= Aws::CloudWatch::Client.new
-  end
-
   def ec2
     @ec2 ||= Aws::EC2::Client.new
   end
-
-  def sqs
-    @sqs ||= Aws::SQS::Client.new
-  end
-
-  def rds
-    @rds ||= Aws::RDS::Client.new
-  end
 end

data/lib/aws-cleanup/version.rb

@@ -1,3 +1,3 @@
 class AwsCleanup
-  VERSION = '1.0.0'.freeze
+  VERSION = '1.0.1'.freeze
 end

data/lib/modules/cloudwatch.rb

@@ -0,0 +1,64 @@
+class CloudwatchCleanup < AwsCleanup
+  def self.run
+    CloudwatchCleanup.new.cleaup_alarms
+  end
+
+  def cleaup_alarms
+    oa = orphaned_alarms.map(&:alarm_name)
+
+    if oa.any?
+      puts 'Deleting alarms: ' + oa.join(', ')
+      cloudwatch.delete_alarms alarm_names: oa
+      return
+    end
+
+    puts 'No alarms to clean up'
+  end
+
+  private
+
+  def orphaned_alarms
+    insufficient_data_alarms.select do |alarm|
+      alarm.dimensions.any? &&
+        !alarm.dimensions.find { |dimension| dimension_in_use? dimension }
+    end
+  end
+
+  def dimension_in_use?(dimension)
+    case dimension.name
+    when 'InstanceId'
+      instance_ids.include? dimension.value
+    when 'QueueName'
+      queue_names.include? dimension.value
+    when 'DBInstanceIdentifier'
+      db_names.include? dimension.value
+    else
+      puts "Unsupported dimension: #{dimension.name}"
+      true
+    end
+  end
+
+  def db_names
+    @db_names ||= rds.describe_db_instances.db_instances.map(&:db_instance_identifier)
+  end
+
+  def queue_names
+    @queue_names ||= sqs.list_queues.queue_urls.map { |q| URI(q).path.split('/')[2..-1].join('/') }
+  end
+
+  def insufficient_data_alarms
+    cloudwatch.describe_alarms(state_value: 'INSUFFICIENT_DATA').metric_alarms
+  end
+
+  def cloudwatch
+    @cloudwatch ||= Aws::CloudWatch::Client.new
+  end
+
+  def sqs
+    @sqs ||= Aws::SQS::Client.new
+  end
+
+  def rds
+    @rds ||= Aws::RDS::Client.new
+  end
+end

data/lib/modules/instances.rb

@@ -0,0 +1,67 @@
+class InstancesCleanup < AwsCleanup
+  def self.run
+    InstancesCleanup.new.cleanup_instances
+  end
+
+  def cleanup_instances
+    eii = expired_instances_ids
+    if eii.any?
+      prompt_user eii if eii.count > DELETE_LIMIT
+      puts 'Deleting instances: ' + eii.join(', ')
+      ec2.terminate_instances instance_ids: eii
+      return
+    end
+
+    puts 'No instances to clean up'
+  end
+
+  private
+
+  def prompt_user(eii)
+    puts "WARNING: The following #{eii.count} instances will be terminated."
+    print 'Are you sure? '
+    return if %w(y ye yes).include? gets.strip
+    puts 'Aborted'
+    exit 1
+  end
+
+  def expired_instances_ids
+    expired_instances.map(&:instance_id)
+  end
+
+  def expired_instances
+    expired_test_instances | instances_expired_by_tag
+  end
+
+  def expired_test_instances
+    test_instances.select { |instance| expired_age? TEST_INSTANCE_EXPIRE_AGE, instance.launch_time }
+  end
+
+  def test_instances
+    instances.select do |instance|
+      instance.security_groups.find do |sg|
+        sg.group_name == TEST_GROUP_NAME || sg.group_id == TEST_GROUP_ID
+      end ||
+        instance.tags.find { |t| t.key == 'Type' && t.value == 'test' }
+    end
+  end
+
+  def instances_expired_by_tag
+    instances.select do |instance|
+      instance.tags.find do |t|
+        (t.key == 'expire_after' && expired_age?(t.value, instance.launch_time)) ||
+          (t.key == 'expires' && expired_time?(t.value))
+      end
+    end
+  end
+
+  def expired_age?(secs, launch_time)
+    Time.now > (launch_time + secs)
+  end
+
+  def expired_time?(timestamp)
+    # `timestamp` should be a string in this format:
+    # 2017-05-10 13:04:01 -0400
+    Time.now > Time.parse(timestamp)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cleanup
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Eric Herot
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -79,6 +79,7 @@ files:
 - ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -88,6 +89,8 @@ files:
 - exe/aws-cleanup
 - lib/aws-cleanup.rb
 - lib/aws-cleanup/version.rb
+- lib/modules/cloudwatch.rb
+- lib/modules/instances.rb
 homepage: https://github.com/evertrue/aws-cleanup
 licenses:
 - Apache License 2.0