aws-cleaner 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0d2981c7484b1236640cf90115c5b7b4acd917c
-  data.tar.gz: eff2dcf59111a78a61adee8f839e877b2a8e263d
+  metadata.gz: 80481ad1bbad492ed7a78e64b32ed31e8f8d76e3
+  data.tar.gz: d4925c9b50c0d2cb1380fae10d7be3d5f1bfd552
 SHA512:
-  metadata.gz: 5ecd30d709ab8e93ff5d4402dca538b9cabe3ab1f2f43aea41d81e00a85160a930fa6d480e33cce49a6ace62d85a697e7dd0c041384855eac017fa188ee6501d
-  data.tar.gz: 1a3eae35a5f2b2956dfdda21e5c68666c40229a74d2ff2c13423485679593f7c71cf94eedb8267d8302e4c260da56cda80b8d189a312b255b33d04d60f20ff1b
+  metadata.gz: 97bacc126598670d7884803c370d58cc2629c534d51090e9a7b580bb7196f05de14daf767c10e077015bb97e07ab5d52c949b8b8559f82762b0501e0edf6841d
+  data.tar.gz: ee53322b71a5d4a0c28f3323479f3fa0ab452ee59175ecbfd24c56b332a75c1026cc4e2667147118440467ba239aa37b2ba6a11aafd828db62949a94bcb14068

data/bin/aws_cleaner.rb

@@ -18,6 +18,7 @@ begin
   require 'rest-client'
   require 'trollop'
   require 'slack/poster'
+  require 'logger'
 rescue LoadError => e
   raise "Missing gems: #{e}"
 end
@@ -26,84 +27,133 @@ end
 require_relative '../lib/aws-cleaner.rb'
 
 def config(file)
-  YAML.load(File.read(file))
+  YAML.safe_load(File.read(File.expand_path(file)), [Symbol])
 rescue StandardError => e
   raise "Failed to open config file: #{e}"
 end
 
+def logger(config)
+  file = config[:log][:file] unless config[:log].nil?
+
+  if file
+    begin
+      # Check if specified file can be written
+      awslog = File.open(File.expand_path(file), File::CREAT | File::WRONLY | File::APPEND)
+    rescue StandardError => e
+      $stderr.puts "aws-cleaner: ERROR - Failed to open log file #{file} beause of #{e}. STDOUT will be used instead."
+    end
+  else
+    $stdout.puts 'aws-cleaner: WARN - Log file is not specified. STDOUT will be used instead.'
+  end
+
+  # Use STDOUT if it is not possible to write to log file
+  awslog = STDOUT if awslog.nil?
+
+  # Make sure log is flushed out immediately instead of being buffered
+  awslog.sync = true
+
+  logger = Logger.new(awslog)
+
+  # Configure logger to escape all data
+  formatter = Logger::Formatter.new
+  logger.formatter = proc { |severity, datetime, progname, msg|
+    formatter.call(severity, datetime, progname, msg.dump)
+  }
+
+  logger
+end
+
+def webhook(id, instance_id)
+  if @config[:webhooks]
+    @config[:webhooks].each do |hook, hook_config|
+      if AwsCleaner::Webhooks.fire_webhook(hook_config, @config, instance_id)
+        @logger.info("Successfully ran webhook #{hook}")
+      else
+        @logger.info("Failed to run webhook #{hook}")
+      end
+    end
+    AwsCleaner.new.delete_message(id, @config)
+  end
+end
+
+def chef(id, instance_id, chef_node)
+  if chef_node
+    if AwsCleaner::Chef.remove_from_chef(chef_node, @chef_client, @config)
+      @logger.info("Removed #{chef_node} from Chef")
+      AwsCleaner.new.delete_message(id, @config)
+    end
+  else
+    @logger.info("Instance #{instance_id} does not exist in Chef, deleting message")
+    AwsCleaner.new.delete_message(id, @config)
+  end
+end
+
+def sensu(id, instance_id, chef_node)
+  if AwsCleaner::Sensu.in_sensu?(chef_node, @config)
+    if AwsCleaner::Sensu.remove_from_sensu(chef_node, @config)
+      @logger.info("Removed #{chef_node} from Sensu")
+    else
+      @logger.info("Instance #{instance_id} does not exist in Sensu, deleting message")
+    end
+    AwsCleaner.new.delete_message(id, @config)
+  end
+end
+
+def closelog(message)
+  @logger.debug(message) unless message.nil?
+  @logger.close
+end
+
 # get options
 opts = Trollop.options do
   opt :config, 'Path to config file', type: :string, default: 'config.yml'
 end
 
 @config = config(opts[:config])
-
-# @sqs = Aws::SQS::Client.new(@config[:aws])
+@logger = logger(@config)
 @sqs_client = AwsCleaner::SQS.client(@config)
-
 @chef_client = AwsCleaner::Chef.client(@config)
 
 # main loop
 loop do
-  # get messages from SQS
-  messages = @sqs_client.receive_message(
-    queue_url: @config[:sqs][:queue],
-    max_number_of_messages: 10,
-    visibility_timeout: 3
-  ).messages
-
-  puts "Got #{messages.size} messages"
-
-  messages.each_with_index do |message, index|
-    puts "Looking at message number #{index}"
-    body = AwsCleaner.new.parse(message.body)
-    id = message.receipt_handle
-
-    unless body
-      AwsCleaner.new.delete_message(id, @config)
-      next
-    end
-
-    @instance_id = AwsCleaner.new.process_message(body)
-
-    if @instance_id
-      if @config[:webhooks]
-        @config[:webhooks].each do |hook, hook_config|
-          if AwsCleaner::Webhooks.fire_webhook(hook_config, @config, @instance_id)
-            puts "Successfully ran webhook #{hook}"
-          else
-            puts "Failed to run webhook #{hook}"
-          end
-        end
+  begin
+    # get messages from SQS
+    messages = @sqs_client.receive_message(
+      queue_url: @config[:sqs][:queue],
+      max_number_of_messages: 10,
+      visibility_timeout: 3
+    ).messages
+
+    @logger.info("Got #{messages.size} messages") unless messages.empty?
+
+    messages.each_with_index do |message, index|
+      @logger.info("Looking at message number #{index}")
+      body = AwsCleaner.new.parse(message.body)
+      id = message.receipt_handle
+
+      unless body
         AwsCleaner.new.delete_message(id, @config)
+        next
       end
 
-      chef_node = AwsCleaner::Chef.get_chef_node_name(@instance_id, @config)
+      instance_id = AwsCleaner.new.process_message(body)
 
-      if chef_node
-        if AwsCleaner::Chef.remove_from_chef(chef_node, @chef_client, @config)
-          puts "Removed #{chef_node} from Chef"
-          AwsCleaner.new.delete_message(id, @config)
-        end
+      if instance_id
+        chef_node = AwsCleaner::Chef.get_chef_node_name(instance_id, @config)
+        webhook(id, instance_id)
+        chef(id, instance_id, chef_node)
+        sensu(id, instance_id, chef_node)
       else
-        puts "Instance #{@instance_id} does not exist in Chef, deleting message"
-        AwsCleaner.new.delete_message(id, @config)
-      end
-
-      if AwsCleaner::Sensu.in_sensu?(chef_node, @config)
-        if AwsCleaner::Sensu.remove_from_sensu(chef_node, @config)
-          puts "Removed #{chef_node} from Sensu"
-        else
-          puts "Instance #{@instance_id} does not exist in Sensu, deleting message"
-        end
+        @logger.info('Message not relevant, deleting')
         AwsCleaner.new.delete_message(id, @config)
       end
-
-    else
-      puts 'Message not relevant, deleting'
-      AwsCleaner.new.delete_message(id, @config)
     end
-  end
 
-  sleep(5)
+    sleep(5)
+  rescue Interrupt
+    closelog('Received Interrupt signal. Quit aws-cleaner')
+    exit
+  rescue StandardError => e
+    @logger.error("Encountered #{e}: #{e.message}")
+  end
 end

data/lib/aws-cleaner.rb

@@ -49,7 +49,7 @@ class AwsCleaner
       client.destroy
       node = chef.nodes.fetch(node_name)
       node.destroy
-    rescue => e
+    rescue StandardError => e
       puts "Failed to remove chef node: #{e}"
     else
       # puts "Removed #{node_name} from chef"
@@ -68,7 +68,7 @@ class AwsCleaner
       )
     rescue RestClient::ResourceNotFound
       return false
-    rescue => e
+    rescue StandardError => e
       puts "Sensu request failed: #{e}"
       return false
     else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cleaner
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Eric Heydrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2018-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.46.0
+        version: 0.52.1
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
   requirement: !ruby/object:Gem::Requirement