aws-cleaner 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9da716cb03b98e3f96803ea61d439e0742342000
-  data.tar.gz: 046b434375c5162c69576b071522da65e41a3413
+  metadata.gz: a860204167856b0780e8d060df21fa840282d4f7
+  data.tar.gz: 14f02a03f31bfb6a88cc094e0f5b407b348a91ec
 SHA512:
-  metadata.gz: fb0c1283415898539326b64f0ada29e1cc0fdf35be695294880e5d2075e32680dceaa04df27bc8281501c58825d255534063bf4fccaaf35e926d8d3a0b6d6187
-  data.tar.gz: 29f93af8ec083c44b4b853dd1292732a58e0e1f7621ec643fa7c1bbd4108acd62dc4fa38dbf18407b7facdf32ff1a3c2c50d0fc87a90c55025421b6ffd468cab
+  metadata.gz: 12570ca1ccde43a84f34d13a0c10a816900b880d75203a70f151f382dc7bfa8d1f127b8b8366662bf39fe5af8f1e96328c155afa1749cbbcb7610203b1a33204
+  data.tar.gz: 2553ca1184dec0443c0ad1db5e796a198fdb2179bf92cc23307907a55f05554bd89f2e87036480b89ada5fb3d1bcf58cd0338e6c42736c5a4c2acdba26e15e07

data/bin/aws_cleaner.rb

@@ -142,17 +142,17 @@ def notify_hipchat(msg)
 end
 
 # generate the URL for the webhook
-def generate_webhook_url(url, template_variable_method, template_variable_argument, template_variable)
+def generate_template(item, template_variable_method, template_variable_argument, template_variable)
   replacement = send(template_variable_method, eval(template_variable_argument))
-  url.gsub!(/{#{template_variable}/, replacement)
-  url
+  item.gsub!(/{#{template_variable}}/, replacement)
+  item
 end
 
 # call an HTTP endpoint
 def fire_webhook(config)
   # generate templated URL
   if config[:template_variables] && config[:url] =~ /\{\S+\}/
-    url = generate_webhook_url(
+    url = generate_template(
       config[:url],
       config[:template_variables][:method],
       config[:template_variables][:argument],
@@ -163,11 +163,20 @@ def fire_webhook(config)
   end
 
   hook = { method: config[:method].to_sym, url: url }
-  begin
-    RestClient::Request.execute(hook)
-  rescue
+  r = RestClient::Request.execute(hook)
+  if r.code != 200
     return false
   else
+    # notify hipchat when webhook is successful
+    if config[:hipchat][:enable]
+      msg = generate_template(
+        config[:hipchat][:message],
+        config[:hipchat][:method],
+        config[:hipchat][:argument],
+        config[:hipchat][:variable]
+      )
+      notify_hipchat(msg)
+    end
     return true
   end
 end
@@ -193,10 +202,21 @@ loop do
       next
     end
 
-    instance_id = process_message(body)
+    @instance_id = process_message(body)
+
+    if @instance_id
+      if @config[:webhooks]
+        @config[:webhooks].each do |hook, config|
+          if fire_webhook(config)
+            puts "Successfully ran webhook #{hook}"
+          else
+            puts "Failed to run webhook #{hook}"
+          end
+        end
+        delete_message(id)
+      end
 
-    if instance_id
-      chef_node = get_chef_node_name(instance_id)
+      chef_node = get_chef_node_name(@instance_id)
 
       if chef_node
         if remove_from_chef(chef_node)
@@ -204,7 +224,7 @@ loop do
           delete_message(id)
         end
       else
-        puts "Instance #{instance_id} does not exist in Chef, deleting message"
+        puts "Instance #{@instance_id} does not exist in Chef, deleting message"
         delete_message(id)
       end
 
@@ -213,18 +233,11 @@ loop do
           puts "Removed #{chef_node} from Sensu"
           delete_message(id)
         else
-          puts "Instance #{instance_id} does not exist in Sensu, deleting message"
+          puts "Instance #{@instance_id} does not exist in Sensu, deleting message"
           delete_message(id)
         end
       end
 
-      if @config[:webhooks]
-        @config[:webbooks].each do |_hook, config|
-          fire_webhook(config)
-        end
-        delete_message(id)
-      end
-
     else
       puts 'Message not relevant, deleting'
       delete_message(id)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Eric Heydrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-23 00:00:00.000000000 Z
+date: 2016-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core