aws-cleaner 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6b8b2239ddd24083d572e06d8a61da41b97696ac578480da008828e5eebd9dc
-  data.tar.gz: 5c040b5b2a48e959d38f85ef4f4c89968089e90ce3da31bf995dc9db32eaea39
+  metadata.gz: 82eb0534b15563d341447daf04082161d61ca6ef4ca738b26f583762554cb8f2
+  data.tar.gz: 85514fd0d1e61c53043eb2839b772cdc0a70ed6a5e6807ef9f1019c2b9108fee
 SHA512:
-  metadata.gz: 76a725cc5c9f598cef66301ec03d288c80e226a03340af20678b942eecbf62f5fea7dd45eee42738d2ee43efb8f5370bc5dcee95ada2ddec19f5db9c736a8c2a
-  data.tar.gz: b008599496fb63ecfb5b8acf81b633184e0a6d65fdf13f5bf67be540e37e2576a3177e3e21b37c9cf8957b298851cbc5e324b0a24666ba5ed3174a433d48a40f
+  metadata.gz: 5576f65b412d9eb0260a5553613a863ff523fc450b8e93312c45e65803addd094e72b3ca4fc21a680489d342e35fc1e4d01938f8edf2beda17fa29574dbd52cd
+  data.tar.gz: 174d57e866695f609b9b5eea5bf50af966d99f1c5194d2ae199d44e81784cea46cdb26adc4c9c25de38834f2075fffd80a4960d13fccf08e77f1a874807b817a

data/bin/aws_cleaner.rb

@@ -1,4 +1,6 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
+
 #
 # Listen for AWS CloudWatch Events EC2 termination events delivered via SQS
 # and remove the node from Chef and Sensu and send a notification
@@ -12,11 +14,11 @@
 begin
   require 'json'
   require 'yaml'
-  require 'aws-sdk-core'
+  require 'aws-sdk-sqs'
   require 'chef-api'
   require 'hipchat'
   require 'rest-client'
-  require 'trollop'
+  require 'optimist'
   require 'slack/poster'
   require 'logger'
 rescue LoadError => e
@@ -90,6 +92,7 @@ end
 
 def sensu(id, instance_id, chef_node)
   return unless @config[:sensu][:enable]
+
   if AwsCleaner::Sensu.in_sensu?(chef_node, @config)
     if AwsCleaner::Sensu.remove_from_sensu(chef_node, @config)
       @logger.info("Removed #{chef_node} from Sensu")
@@ -106,7 +109,7 @@ def closelog(message)
 end
 
 # get options
-opts = Trollop.options do
+opts = Optimist.options do
   opt :config, 'Path to config file', type: :string, default: 'config.yml'
 end
 

data/lib/aws-cleaner.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # main aws_cleaner lib
 class AwsCleaner
   # SQS related stuff
@@ -32,6 +34,7 @@ class AwsCleaner
       chef = client(config)
       results = chef.search.query(:node, "ec2_instance_id:#{instance_id} OR chef_provisioning_reference_server_id:#{instance_id}")
       return false if results.rows.empty?
+
       results.rows.first['name']
     end
 
@@ -40,6 +43,7 @@ class AwsCleaner
       chef = client(config)
       results = chef.search.query(:node, "ec2_instance_id:#{instance_id} OR chef_provisioning_reference_server_id:#{instance_id}")
       return false if results.rows.empty?
+
       results.rows.first['automatic']['fqdn']
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-cleaner
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Eric Heydrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-28 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.73.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.1
+        version: 0.73.0
 - !ruby/object:Gem::Dependency
-  name: aws-sdk-core
+  name: aws-sdk-sqs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: chef-api
   requirement: !ruby/object:Gem::Requirement
@@ -109,47 +109,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: slack-poster
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: trollop
+  name: slack-poster
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.2'
 description: AWS Cleaner cleans up after EC2 instances are terminated
 email: eheydrick@gmail.com
 executables:
@@ -178,8 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: AWS Cleaner cleans up after EC2 instances are terminated