aws-cleaner 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a860204167856b0780e8d060df21fa840282d4f7
-  data.tar.gz: 14f02a03f31bfb6a88cc094e0f5b407b348a91ec
+  metadata.gz: 67474a14055387fa8416c92892bcc73d236d76f0
+  data.tar.gz: 544af743776d8bc8a68157813a3327926454baeb
 SHA512:
-  metadata.gz: 12570ca1ccde43a84f34d13a0c10a816900b880d75203a70f151f382dc7bfa8d1f127b8b8366662bf39fe5af8f1e96328c155afa1749cbbcb7610203b1a33204
-  data.tar.gz: 2553ca1184dec0443c0ad1db5e796a198fdb2179bf92cc23307907a55f05554bd89f2e87036480b89ada5fb3d1bcf58cd0338e6c42736c5a4c2acdba26e15e07
+  metadata.gz: 8c0fc65ffcc9377f19a99cfffaa746835abb9d1cd966e0535443c1316fabdc7b6cc04446ee196bfea927d50ab5256ff7f918d10ee7576eea4e50866d6047e51f
+  data.tar.gz: 87a062ea6578a0a6b8c97d959a9a5d19839954aa5fbbe2daec88f0cd1f78ad30bf42ea1ea6dae5bb4e15ca41991051a1418f94d78ac10e77b25b957d65103689

data/bin/aws_cleaner.rb

@@ -4,7 +4,7 @@
 # and remove the node from Chef and Sensu and send a notification
 # to Hipchat
 #
-# Copyright (c) 2015 Eric Heydrick
+# Copyright (c) 2015, 2106 Eric Heydrick
 # Licensed under The MIT License
 #
 
@@ -94,7 +94,7 @@ end
 # check if the node exists in Sensu
 def in_sensu?(node_name)
   begin
-    RestClient.get("#{@config[:sensu][:url]}/clients/#{node_name}")
+    RestClient::Request.execute(url: "#{@config[:sensu][:url]}/clients/#{node_name}", method: :get, timeout: 5, open_timeout: 5)
   rescue RestClient::ResourceNotFound
     return false
   rescue => e
@@ -107,7 +107,7 @@ end
 
 # call the Sensu API to remove the node
 def remove_from_sensu(node_name)
-  response = RestClient.delete("#{@config[:sensu][:url]}/clients/#{node_name}")
+  response = RestClient::Request.execute(url: "#{@config[:sensu][:url]}/clients/#{node_name}", method: :delete, timeout: 5, open_timeout: 5)
   case response.code
   when 202
     notify_hipchat('Removed ' + node_name + ' from Sensu') if @config[:hipchat][:enable]
@@ -143,9 +143,15 @@ end
 
 # generate the URL for the webhook
 def generate_template(item, template_variable_method, template_variable_argument, template_variable)
-  replacement = send(template_variable_method, eval(template_variable_argument))
-  item.gsub!(/{#{template_variable}}/, replacement)
-  item
+  begin
+    replacement = send(template_variable_method, eval(template_variable_argument))
+    item.gsub!(/{#{template_variable}}/, replacement)
+  rescue Exception => e
+    puts "Error generating template: #{e.message}"
+    return false
+  else
+    item
+  end
 end
 
 # call an HTTP endpoint
@@ -158,6 +164,7 @@ def fire_webhook(config)
       config[:template_variables][:argument],
       config[:template_variables][:variable]
     )
+    return false unless url
   else
     url = config[:url]
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cleaner
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Eric Heydrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-06 00:00:00.000000000 Z
+date: 2016-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: AWS Cleaner cleans up after EC2 instances are terminated