aws-watcher 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bf8eeafa65fe3b5e1c3be1c34c3d6a5bb012379
-  data.tar.gz: 4c71a451b443e2da69140601bc10f9aac7eb5208
+  metadata.gz: cafd8ceb3eba8271b24c78e5258d615683f29737
+  data.tar.gz: c8a16fcc14a07faff6367507f6fb6d51ec2ed729
 SHA512:
-  metadata.gz: 4b0839c4435fa5cbb5012030fbc1bb99ec8c060ebfc0118fbdd6fe6aa5457de4a783a41b438da2f55cb235356e4f5163cdecb8f33155cf9c4970051093d05723
-  data.tar.gz: b9cefb0f11336db142c711e6023f4229894318620adaf2d9d0f542d883f8788766e4aae051d7d0f062a3aa73307eeb12e991cf67f1f1a48fb2489c3754be04b1
+  metadata.gz: f5eb282580bc31b65af2cdad4ae7f501da13c53357fea8a9058d2f02325182f9499ac44add697c8e851fad02e032945072e63dca0ecf9747fe31f451524818be
+  data.tar.gz: 86cfbc76b19e301256e1b6beec42a1dbd721825607c2711194c0c2df227c9a0402aa105eef0c82423f6c510fa088002f686f2cbf7c4b25c7ddf948d037d267ee

data/bin/aws_watcher.rb

@@ -37,6 +37,7 @@ end
 # get options
 opts = Trollop.options do
   opt :config, 'Path to config file', type: :string, default: 'config.yml'
+  opt :tag, 'tagName:tagValue1,tagValue2', type: String, required: true
 end
 
 @config = config(opts[:config])
@@ -45,6 +46,20 @@ end
 @sqs_client = AwsCleaner::SQS.client(@config)
 @chef_client = AwsCleaner::Chef.client(@config)
 
+# get tags
+begin
+  @tag_name = opts[:tag].split(':')[0].strip
+  @tag_values = opts[:tag].split(':')[1].split(',').strip
+  p "#{@tag_name}, #{@tag_values}"
+rescue
+  msg = "You passed be a tag of #{ops[:tag]} which is not valid "
+  msg += 'tags must look like this: -t tag:value you can'
+  msg += 'optionally pass multiple values for the same tag like '
+  msg += 'this -t tag:value1,value2'
+  p msg
+  exit 1
+end
+
 # start program in infinate loop
 loop do
   messages = @sqs_client.receive_message(
@@ -53,9 +68,9 @@ loop do
     visibility_timeout: 3
   ).messages
 
-  puts "Got #{messages.size} message(s)"
+  puts "Got #{messages.size} message(s)" # unless messages.size.zero?
   messages.each_with_index do |message, index|
-    puts "Looking at message number #{index}" unless messages.size.zero?
+    puts "Looking at message number #{index}" # unless messages.size.zero?
     body = AwsCleaner.new.parse(message.body)
     id = message.receipt_handle
     now = Time.now.utc
@@ -80,6 +95,11 @@ loop do
     elsif AwsWatcher::Chef.registered?(@instance_id, @config)
       p "instance: #{@instance_id} has bootstrapped, removing message from queue"
       AwsCleaner.new.delete_message(id, @config)
+      next
+    elsif !AwsWatcher::EC2.tag_matches?(@instance_id, @tag_name, @tag_values, @config)
+      p "instance: #{@instance_id} has not bootstrap and was deleted because it did not have a tag of: #{@tag_name} matching one of these values: #{@tag_values}"
+      AwsCleaner.new.delete_message(id, @config)
+      next
     else
       p "instance: #{@instance_id}, launched: #{launch_time}, elapsed: #{elapsed_time} seconds"
     end

data/lib/aws-watcher.rb

@@ -36,6 +36,23 @@ class AwsWatcher
       end
       false
     end
+
+    def self.tag_matches?(id, tag, values, config)
+      instances = AwsWatcher::EC2.client(config).describe_instances(
+        instance_ids: [id],
+        filters: [
+          {
+            name: "tag:#{tag}",
+            values: values.to_a
+          }
+        ]
+      )
+      if instances.reservations.empty?
+        false
+      else
+        true
+      end
+    end
   end
 
   module Notify

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-watcher
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ben Abrams