sport_ngin_aws_auditor 3.10.1 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5240cf6426681a9d75f9a357c7912adb58b00d81
-  data.tar.gz: 09c2971243df4a8bb6998d65a9c101bf3eeb7566
+  metadata.gz: 371951220694aabe393ce1d64bd750ead6323bbe
+  data.tar.gz: fa9cfd373c5ede8e321522359d3227e9df72de56
 SHA512:
-  metadata.gz: 82c3810457541106a45e05f874227eff17b6d5ea4b8421aad5c1a0baa40a3c2768ca3eeecd584e4248c126a026f12d5d41187ae137ec7b6fa79f9d1c896bef91
-  data.tar.gz: 246ff9987a1af7b769ad8df4dcb7e19ad13b020143532872593a11b95620eefcfe21d9ca20fe0a8f829a1525d9bf27f5816b2a9bff0cb4c97a3863cfded4f41c
+  metadata.gz: 4332d0f1a87ba742df5a3d17e62622fc286aff652859939cca4e9f0fc77cbd293a08154b8bb7b3e44856f8d577ab19b16bce901a5251fa4bead7f22c3b3b4b34
+  data.tar.gz: f8593e6acbf8963b9554471feba300618882ad5c64b9b800760d0cb81b394e5d4d8fd06c91c9f880e58ce259c192b890a6523584e37619a0172470801f42251c

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v3.11.0
+* Automatically ignore instances based on a regex string
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/26
+
 #### v3.10.1
 * Caching should not affect RI counts between runs
 

data/lib/sport_ngin_aws_auditor/audit_data.rb

@@ -3,11 +3,12 @@ require_relative './instance_helper'
 module SportNginAwsAuditor
   class AuditData
 
-    attr_accessor :data, :retired_tags, :retired_ris, :selected_audit_type, :klass, :tag_name, :region
-    def initialize(instances, reserved, class_type, tag_name)
+    attr_accessor :data, :retired_tags, :retired_ris, :selected_audit_type, :klass, :tag_name, :region, :ignore_instances_regexes
+    def initialize(instances, reserved, class_type, tag_name, ignore_instances_regexes)
       self.selected_audit_type = (!instances && !reserved) ? "all" : (instances ? "instances" : "reserved")
       self.klass = SportNginAwsAuditor.const_get(class_type)
       self.tag_name = tag_name
+      self.ignore_instances_regexes = ignore_instances_regexes
     end
 
     def instances?
@@ -50,7 +51,7 @@ module SportNginAwsAuditor
       instances_with_tag = self.klass.filter_instances_with_tags(instances)
       instances_without_tag = self.klass.filter_instances_without_tags(instances)
       instance_hash = self.klass.instance_count_hash(instances_without_tag)
-      self.klass.apply_tagged_instances(instances_with_tag, instance_hash)
+      self.klass.add_additional_instances_to_hash(instances_with_tag, instance_hash, " with tag (")
 
       return instance_hash, retired_tags
     end
@@ -59,7 +60,7 @@ module SportNginAwsAuditor
       instances = self.klass.get_instances(tag_name)
       gather_region(instances)
       retired_tags = self.klass.get_retired_tags(instances)
-      instance_hash = self.klass.compare(instances)
+      instance_hash = self.klass.compare(instances, ignore_instances_regexes)
       retired_ris = self.klass.get_recent_retired_reserved_instances
 
       return instance_hash, retired_tags, retired_ris

data/lib/sport_ngin_aws_auditor/commands/audit.rb

@@ -11,6 +11,9 @@ command 'audit' do |c|
   c.switch [:n, :no_tag], :desc => "Ignore all tags during audit"
   c.switch [:s, :slack], :desc => "Will print condensed version of audit to a Slack channel"
   c.switch [:z, :zone_output], :desc => "Will print the Missing RIs and Tagged instances with zones"
+  c.flag [:g, :ignore_instances_patterns], :default_value => "kitchen, auto", :desc => "Ignore instances if an instance contains
+                                                                                one of these strings in the name,
+                                                                                pass in like: string1, string2, string3"
   c.action do |global_options, options, args|
     require_relative '../scripts/audit'
     raise ArgumentError, 'You must specify an AWS account' unless args.first

data/lib/sport_ngin_aws_auditor/instance.rb

@@ -7,44 +7,63 @@ module SportNginAwsAuditor
     attr_accessor :type, :count, :category, :tag_value, :reason, :name, :region_based
     def initialize(type, data_hash, region)
       if type.include?(" with tag")
-        type = type.dup # because type is a frozen string right now
-        type.slice!(" with tag")
-        self.type = type
-        self.category = "tagged"
-        self.name = data_hash[:name] || nil
-        self.reason = data_hash[:tag_reason] || nil
-        self.tag_value = data_hash[:tag_value] || nil
-        self.region_based = data_hash[:region_based] || nil
+        gather_tagged_data(type, data_hash, region)
+      elsif type.include?(" ignored")
+        gather_ignored_data(type, data_hash, region)
       else
-        self.region_based = data_hash[:region_based] || nil
-
-        if data_hash[:count] < 0
-          self.category = "running"
-        elsif data_hash[:count] == 0
-          self.category = "matched"
-        elsif data_hash[:count] > 0
-          self.category = "reserved"
-        end
-
-        if region_based?
-          # if type = 'Linux VPC  t2.small'...
-          my_match = type.match(/(\w*\s*\w*\s{1})\s*(\s*\S*)/)
-
-          # then platform = 'Linux VPC '...
-          platform = my_match[1] if my_match
-
-          # and size = 't2.small'
-          size = my_match[2] if my_match
-
-          self.type = platform << region << ' ' << size
-        else
-          self.type = type
-        end
+        gather_normal_data(type, data_hash, region)
       end
 
       self.count = data_hash[:count].abs
     end
 
+    def gather_tagged_data(type, data_hash, region)
+      type = type.dup # because type is a frozen string right now
+      type.slice!(" with tag")
+      self.type = type
+      self.category = "tagged"
+      self.name = data_hash[:name] || nil
+      self.reason = data_hash[:tag_reason] || nil
+      self.tag_value = data_hash[:tag_value] || nil
+      self.region_based = data_hash[:region_based] || nil
+    end
+
+    def gather_ignored_data(type, data_hash, region)
+      type = type.dup
+      type.slice!(" ignored")
+      self.type = type
+      self.category = "ignored"
+      self.name = data_hash[:name] || nil
+      self.region_based = data_hash[:region_based] || nil
+    end
+
+    def gather_normal_data(type, data_hash, region)
+      self.region_based = data_hash[:region_based] || nil
+
+      if data_hash[:count] < 0
+        self.category = "running"
+      elsif data_hash[:count] == 0
+        self.category = "matched"
+      elsif data_hash[:count] > 0
+        self.category = "reserved"
+      end
+
+      if region_based?
+        # if type = 'Linux VPC  t2.small'...
+        my_match = type.match(/(\w*\s*\w*\s{1})\s*(\s*\S*)/)
+
+        # then platform = 'Linux VPC '...
+        platform = my_match[1] if my_match
+
+        # and size = 't2.small'
+        size = my_match[2] if my_match
+
+        self.type = platform << region << ' ' << size
+      else
+        self.type = type
+      end
+    end
+
     def region_based?
       self.region_based
     end
@@ -53,6 +72,10 @@ module SportNginAwsAuditor
       self.category == "tagged"
     end
 
+    def ignored?
+      self.category == "ignored"
+    end
+
     def reserved?
       self.category == "reserved"
     end

data/lib/sport_ngin_aws_auditor/instance_helper.rb

@@ -12,6 +12,8 @@ module SportNginAwsAuditor
       Hash[get_reserved_instances.map { |instance| instance.nil? ? next : [instance.id, instance]}.compact]
     end
 
+    #################### ADDING DATA TO HASH ####################
+
     def instance_count_hash(instances)
       instance_hash = Hash.new()
       instances.each do |instance|
@@ -25,10 +27,38 @@ module SportNginAwsAuditor
       instance_hash
     end
 
-    def apply_tagged_instances(instances_to_add, instance_hash)
+    def add_region_ris_to_hash(ris_region, differences)
+      ris_region.each do |ri|
+        differences.each do |key, value|
+          # if key = 'Linux VPC us-east-1a t2.medium'...
+          my_match = key.match(/(\w*\s*\w*\s*)\w{2}-\w{2,}-\w{2}(\s*\S*)/)
+
+          # then platform = 'Linux VPC'...
+          platform = my_match[1] if my_match
+          platform[platform.length - 1] = ''
+
+          # and size = 't2.medium'
+          size = my_match[2] if my_match
+          size[0] = ''
+
+          if (platform == ri.platform) && (size == ri.instance_type) && (value[:count] < 0)
+            until (ri.count == 0) || (value[:count] == 0)
+              value[:count] = value[:count] + 1
+              ri.count = ri.count - 1
+            end
+          end
+        end
+      end
+
+      ris_region.each do |ri|
+        differences[ri.to_s] = {:count => ri.count, :region_based => true}
+      end
+    end
+
+    def add_additional_instances_to_hash(instances_to_add, instance_hash, extra_string)
       instances_to_add.each do |instance|
         next if instance.nil?
-        key = instance.to_s.dup << " with tag (" << instance.name << ")"
+        key = instance.to_s.dup << extra_string << instance.name << ")"
         instance_result = {}
         
         if instance_hash.has_key?(instance.to_s) && instance_hash[instance.to_s][:count] > 0
@@ -44,8 +74,8 @@ module SportNginAwsAuditor
           instance_result[:count] = instance.count
         end
 
-        instance_result.merge!({:name => instance.name, :tag_reason => instance.tag_reason,
-                                :tag_value => instance.tag_value, :region_based => false})
+        merged_hash = gather_hash(extra_string, instance)
+        instance_result.merge!(merged_hash)
 
         instance_hash[key] = instance_result
       end if instances_to_add
@@ -53,35 +83,31 @@ module SportNginAwsAuditor
       instance_hash
     end
 
-    def apply_region_ris(ris_region, differences)
-      ris_region.each do |ri|
-        ri.count_remaining = ri.count
-
-        differences.each do |key, value|
-          # if key = 'Linux VPC us-east-1a t2.medium'...
-          my_match = key.match(/(\w*\s*\w*\s*)\w{2}-\w{2,}-\w{2}(\s*\S*)/)
-
-          # then platform = 'Linux VPC'...
-          platform = my_match[1] if my_match
-          platform[platform.length - 1] = ''
+    def gather_hash(extra_string, instance)
+      if extra_string.include?("tag")
+        {:name => instance.name, :tag_reason => instance.tag_reason,
+         :tag_value => instance.tag_value, :region_based => false}
+      elsif extra_string.include?("ignore")
+        {:name => instance.name, :region_based => false}
+      end
+    end
 
-          # and size = 't2.medium'
-          size = my_match[2] if my_match
-          size[0] = ''
+    #################### PARSING AND COMPARING DATA ####################
 
-          if (platform == ri.platform) && (size == ri.instance_type) && (value[:count] < 0)
-            until (ri.count_remaining == 0) || (value[:count] == 0)
-              value[:count] = value[:count] + 1
-              ri.count_remaining = ri.count_remaining - 1
-            end
-          end
-        end
-      end
+    def sort_through_instances(instances, ignore_instances_regexes)
+      ignored_instances, not_ignored_instances = filter_ignored_instances(instances, ignore_instances_regexes)
+      instances_with_tag = filter_instances_with_tags(not_ignored_instances)
+      instances_without_tag = filter_instances_without_tags(not_ignored_instances)
+      instance_hash = instance_count_hash(instances_without_tag)
+      return ignored_instances, instances_with_tag, instance_hash
+    end
 
-      ris_region.each do |ri|
-        differences[ri.to_s] = {:count => ri.count_remaining, :region_based => true}
-        ri.count_remaining = nil
-      end
+    def sort_through_RIs
+      ris = get_reserved_instances
+      ris_availability = filter_ris_availability_zone(ris)
+      ris_region = filter_ris_region_based(ris)
+      ris_hash = instance_count_hash(ris_availability)
+      return ris_region, ris_hash
     end
 
     def measure_differences(instance_hash, ris_hash)
@@ -94,29 +120,22 @@ module SportNginAwsAuditor
       differences
     end
 
-    def compare(instances)
-      instances_with_tag = filter_instances_with_tags(instances)
-      instances_without_tag = filter_instances_without_tags(instances)
-      instance_hash = instance_count_hash(instances_without_tag)
+    def add_additional_data(ris_region, instances_with_tag, ignored_instances, differences)
+      add_region_ris_to_hash(ris_region, differences)
+      add_additional_instances_to_hash(instances_with_tag, differences, " with tag (")
+      add_additional_instances_to_hash(ignored_instances, differences, " ignored (")
+      return differences
+    end
 
-      ris = get_reserved_instances
-      ris_availability = filter_ris_availability_zone(ris)
-      ris_region = filter_ris_region_based(ris)
-      ris_hash = instance_count_hash(ris_availability)
-      
+    def compare(instances, ignore_instances_regexes)
+      ignored_instances, instances_with_tag, instance_hash = sort_through_instances(instances, ignore_instances_regexes)
+      ris_region, ris_hash = sort_through_RIs
       differences = measure_differences(instance_hash, ris_hash)
-      apply_region_ris(ris_region, differences)
-      apply_tagged_instances(instances_with_tag, differences)
+      add_additional_data(ris_region, instances_with_tag, ignored_instances, differences)
       differences
     end
 
-    # this gets all retired reserved instances and filters out only the ones that have expired
-    # within the past week
-    def get_recent_retired_reserved_instances
-      get_retired_reserved_instances.select do |ri|
-        ri.expiration_date > (Time.now - 604800)
-      end
-    end
+    #################### FILTERING ACTIVE DATA ####################
 
     # assuming the value of the tag is in the form: 01/01/2000 like a date
     def filter_instances_with_tags(instances)
@@ -144,6 +163,26 @@ module SportNginAwsAuditor
       ris.select { |ri| ri.scope == 'Region' }
     end
 
+    # this breaks up the instances array into instances with any of the strings in the ignore_instances_regexes and
+    # instances without
+    def filter_ignored_instances(instances, ignore_instances_regexes)
+      instances.partition { |instance|
+        ignore_instances_regexes.any? { |regex|
+          instance.name ? instance.name.match(regex) != nil : false
+        }
+      }
+    end
+
+    #################### GATHERING RETIRED DATA ####################
+
+    # this gets all retired reserved instances and filters out only the ones that have expired
+    # within the past week
+    def get_recent_retired_reserved_instances
+      get_retired_reserved_instances.select do |ri|
+        ri.expiration_date > (Time.now - 604800)
+      end
+    end
+
     # this returns a hash of all instances that have retired between 1 week ago and today
     def get_retired_tags(instances)
       return_array = []

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -25,11 +25,16 @@ module SportNginAwsAuditor
           tag_name = options[:tag]
         end
 
+        ignore_instances_patterns = options[:ignore_instances_patterns].split(', ') if options[:ignore_instances_patterns]
+        ignore_instances_regexes = []
+        ignore_instances_patterns.each do |r|
+          ignore_instances_regexes << Regexp.new(r)
+        end
         zone_output = options[:zone_output]
 
         cycle = [["EC2Instance", options[:ec2]],
-                 ["RDSInstance", options[:rds]],
-                 ["CacheInstance", options[:cache]]]
+                ["RDSInstance", options[:rds]],
+                ["CacheInstance", options[:cache]]]
 
         if !slack
           print "Gathering info, please wait..."; print "\r"
@@ -38,7 +43,7 @@ module SportNginAwsAuditor
         end
 
         cycle.each do |c|
-          audit_results = AuditData.new(options[:instances], options[:reserved], c.first, tag_name)
+          audit_results = AuditData.new(options[:instances], options[:reserved], c.first, tag_name, ignore_instances_regexes)
           audit_results.gather_data
           output_options = {:slack => slack, :class_type => c.first,
                             :environment => environment, :zone_output => zone_output}
@@ -108,6 +113,8 @@ module SportNginAwsAuditor
           else
             say "<%= color('#{prefix} #{name}: (expiring on #{instance.tag_value})', :#{color}) %>"
           end
+        elsif instance.ignored?
+          say "<%= color('#{prefix} #{name}', :#{color}) %>"
         else
           say "<%= color('#{prefix} #{name}: #{count}', :#{color}) %>"
         end
@@ -115,10 +122,10 @@ module SportNginAwsAuditor
 
       def self.print_to_slack(audit_results, output_options)
         discrepancy_array = []
-        tagged_array = []
+        tagged_ignored_array = []
 
         audit_results.data.each do |instance|
-          unless instance.matched? || instance.tagged?
+          unless instance.matched? || instance.tagged? || instance.ignored?
             discrepancy_array.push(instance)
           end
         end
@@ -128,13 +135,13 @@ module SportNginAwsAuditor
         end
 
        audit_results.data.each do |instance|
-          if instance.tagged?
-            tagged_array.push(instance)
+          if instance.tagged? || instance.ignored?
+            tagged_ignored_array.push(instance)
           end
         end
 
-        unless tagged_array.empty?
-          print_tagged(tagged_array, output_options)
+        unless tagged_ignored_array.empty?
+          print_tagged(tagged_ignored_array, output_options)
         end
 
         print_retired_ris(audit_results, output_options) unless audit_results.retired_ris.empty?
@@ -159,19 +166,23 @@ module SportNginAwsAuditor
         slack_instances.perform        
       end
 
-      def self.print_tagged(tagged_array, output_options)
+      def self.print_tagged(tagged_ignored_array, output_options)
         title = "There are currently some tagged #{output_options[:class_type]}s in #{output_options[:environment]}:\n"
         slack_instances = NotifySlack.new(title, options[:config_json])
 
-        tagged_array.each do |tagged|
-          type = output_options[:zone_output] ? tagged.type : print_without_zone(tagged.type)
-          count = tagged.count
-          color, rgb, prefix = color_chooser(tagged)
+        tagged_ignored_array.each do |tagged_or_ignored|
+          type = output_options[:zone_output] ? tagged_or_ignored.type : print_without_zone(tagged_or_ignored.type)
+          count = tagged_or_ignored.count
+          color, rgb, prefix = color_chooser(tagged_or_ignored)
           
-          if tagged.reason
-            text = "#{prefix} #{type}: (expiring on #{tagged.tag_value} because of #{tagged.reason})"
-          else
-            text = "#{prefix} #{type}: (expiring on #{tagged.tag_value})"
+          if tagged_or_ignored.tagged?
+            if tagged_or_ignored.reason
+              text = "#{prefix} #{tagged_or_ignored.name}: (expiring on #{tagged_or_ignored.tag_value} because of #{tagged_or_ignored.reason})"
+            else
+              text = "#{prefix} #{tagged_or_ignored.name}: (expiring on #{tagged_or_ignored.tag_value})"
+            end
+          elsif tagged_or_ignored.ignored?
+            text = "#{prefix} #{tagged_or_ignored.name}"
           end
 
           slack_instances.attachments.push({"color" => rgb, "text" => text, "mrkdwn_in" => ["text"]})
@@ -232,6 +243,8 @@ module SportNginAwsAuditor
       def self.color_chooser(instance)
         if instance.tagged?
           return "blue", "#0000CC", "TAGGED -"
+        elsif instance.ignored?
+          return "blue", "#0000CC", "IGNORED -"
         elsif instance.running?
           return "yellow", "#FFD700", "MISSING RI -"
         elsif instance.matched?

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "3.10.1"
+  VERSION = "3.11.0"
 end

data/spec/sport_ngin_aws_auditor/audit_data_spec.rb

@@ -10,6 +10,7 @@ module SportNginAwsAuditor
       @instance4 = double('ec2_instance4')
       @ec2_instances = [@instance1, @instance2]
       @retired_ris = [@instance3, @instance4]
+      @ignore_instances_regexes = ["kitchen", "auto"]
       allow(SportNginAwsAuditor::EC2Instance).to receive(:get_instances).and_return(@ec2_instances)
       allow(SportNginAwsAuditor::EC2Instance).to receive(:get_reserved_instances).and_return(@ec2_instances)
       allow(SportNginAwsAuditor::EC2Instance).to receive(:get_retired_tags).and_return([])
@@ -17,8 +18,8 @@ module SportNginAwsAuditor
       allow(SportNginAwsAuditor::EC2Instance).to receive(:filter_instances_without_tags).and_return(@ec2_instances)
       allow(SportNginAwsAuditor::EC2Instance).to receive(:instance_count_hash).and_return({'instance1' => 1,
                                                                                            'instance2' => 1})
-      allow(SportNginAwsAuditor::EC2Instance).to receive(:apply_tagged_instances).and_return({'instance1' => 1,
-                                                                                                      'instance2' => 1})
+      allow(SportNginAwsAuditor::EC2Instance).to receive(:add_additional_instances_to_hash).and_return({'instance1' => 1,
+                                                                                                        'instance2' => 1})
       allow(SportNginAwsAuditor::EC2Instance).to receive(:compare).and_return({'instance1' => 1,
                                                                                'instance2' => 1})
       allow(SportNginAwsAuditor::EC2Instance).to receive(:get_recent_retired_reserved_instances).and_return(@retired_ris)
@@ -27,75 +28,75 @@ module SportNginAwsAuditor
 
     context '#initialization' do
       it 'should gather instance data' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.selected_audit_type).to eq("instances")
       end
 
       it 'should gather reserved instance data' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.selected_audit_type).to eq("reserved")
       end
 
       it 'should by default gather instance data' do
-        audit_results = AuditData.new(true, true, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(true, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.selected_audit_type).to eq("instances")
       end
 
       it 'should gather all data to compare' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.selected_audit_type).to eq("all")
       end
 
       it 'should use EC2Instance class' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.klass).to eq(SportNginAwsAuditor::EC2Instance)
       end
 
       it 'should use EC2Instance class' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.tag_name).to eq("no-reserved-instance")
       end
     end
 
     context '#instances?' do
       it 'should return true' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.instances?).to eq(true)
       end
 
       it 'should return true' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.instances?).to eq(false)
       end
     end
 
     context '#reserved?' do
       it 'should return true' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.reserved?).to eq(false)
       end
 
       it 'should return true' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.reserved?).to eq(true)
       end
     end
 
     context '#all?' do
       it 'should return true' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.all?).to eq(false)
       end
 
       it 'should return true' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         expect(audit_results.all?).to eq(true)
       end
     end
 
     context '#gather_data' do
       it 'should gather some empty results by comparison' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         audit_results.gather_data
         expect(audit_results.data).to eq([@instance, @instance])
         expect(audit_results.retired_tags).to eq([])
@@ -103,7 +104,7 @@ module SportNginAwsAuditor
       end
 
       it 'should gather some empty results from just instances' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         audit_results.gather_data
         expect(audit_results.data).to eq([@instance, @instance])
         expect(audit_results.retired_tags).to eq([])
@@ -111,7 +112,7 @@ module SportNginAwsAuditor
       end
 
       it 'should gather some empty results from just reserved' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         audit_results.gather_data
         expect(audit_results.data).to eq([@instance, @instance])
         expect(audit_results.retired_tags).to eq(nil)
@@ -121,7 +122,7 @@ module SportNginAwsAuditor
 
     context '#gather_instances_data' do
       it 'should gather some instances data but not convert' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         result1, result2 = audit_results.gather_instances_data
         expect(result1).to eq({'instance1' => 1, 'instance2' => 1})
         expect(result2).to eq([])
@@ -130,7 +131,7 @@ module SportNginAwsAuditor
 
     context '#gather_all_data' do
       it 'should gather some comparison data but not convert' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         result1, result2, result3 = audit_results.gather_all_data
         expect(result1).to eq({'instance1' => 1, 'instance2' => 1})
         expect(result2).to eq([])
@@ -140,7 +141,7 @@ module SportNginAwsAuditor
 
     context '#gather_region' do
       it 'should gather the region from an instance' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance")
+        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
         audit_results.gather_region(@ec2_instances)
         expect(audit_results.region).to eq('us-east')
       end

data/spec/sport_ngin_aws_auditor/instance_helper_spec.rb

@@ -104,16 +104,23 @@ module SportNginAwsAuditor
       end
     end
 
-    context '#apply_tagged_instances' do
+    context '#add_additional_instances_to_hash' do
       it 'should add the instances to the hash of differences' do
         klass = SportNginAwsAuditor::EC2Instance
-        result = klass.apply_tagged_instances(@ec2_instances, {})
+        result = klass.add_additional_instances_to_hash(@ec2_instances, {}, " with tag (")
         expect(result).to eq({'Linux VPC us-east-1b t2.small with tag (Example-instance-01)' => {count: 1, name: @ec2_instance1.key_name, tag_reason: nil, tag_value: nil, region_based: false},
                               'Windows us-east-1b t2.medium with tag (Example-instance-02)' => {count: 1, name: @ec2_instance2.key_name, tag_reason: nil, tag_value: nil, region_based: false}})
       end
+
+      it 'should add the ignored instances to the hash of differences' do
+        klass = SportNginAwsAuditor::EC2Instance
+        result = klass.add_additional_instances_to_hash(@ec2_instances, {}, " ignored (")
+        expect(result).to eq({'Linux VPC us-east-1b t2.small ignored (Example-instance-01)' => {count: 1, name: @ec2_instance1.key_name, region_based: false},
+                              'Windows us-east-1b t2.medium ignored (Example-instance-02)' => {count: 1, name: @ec2_instance2.key_name, region_based: false}})
+      end
     end
 
-    context '#apply_region_ris' do
+    context '#add_region_ris_to_hash' do
       it 'should factor in the region based RIs into the counting when there is a mixture of region based and non region based' do
         klass = SportNginAwsAuditor::EC2Instance
         allow(@ec2_instance1).to receive(:count).and_return(5)
@@ -128,9 +135,9 @@ module SportNginAwsAuditor
           ris_count = ris.has_key?(key) ? ris[key][:count] : 0
           differences[key] = {count: ris_count - instance_count, region_based: false}
         end
-        result = klass.apply_region_ris(@region_reserved_instances, differences)
+        result = klass.add_region_ris_to_hash(@region_reserved_instances, differences)
         expect(differences).to eq({"Linux VPC us-east-1b t2.small"=>{count: 0, region_based: false}, "Windows us-east-1b t2.medium"=>{count: 0, region_based: false},
-                                   "Linux VPC  t2.small" => {count: 2, region_based: true}, "Windows  t2.medium" => {count: 2, region_based: true}})
+                                   "Linux VPC  t2.small" => {count: 2, region_based: true}, "Windows  t2.medium" => {count: 4, region_based: true}})
       end
 
       it 'should factor in the region based RIs into the counting when there are no zone specific RIs' do
@@ -140,9 +147,9 @@ module SportNginAwsAuditor
         allow(@region_reserved_ec2_instance1).to receive(:count=)
         allow(@region_reserved_ec2_instance2).to receive(:count=)
         instance_hash = klass.instance_count_hash(@ec2_instances)
-        result = klass.apply_region_ris(@region_reserved_instances, instance_hash)
+        result = klass.add_region_ris_to_hash(@region_reserved_instances, instance_hash)
         expect(instance_hash).to eq({"Linux VPC us-east-1b t2.small"=>{count: 0, region_based: false}, "Windows us-east-1b t2.medium"=>{count: 5, region_based: false},
-                                     "Linux VPC  t2.small" => {count: 2, region_based: true}, "Windows  t2.medium" => {count: 2, region_based: true}})
+                                     "Linux VPC  t2.small" => {count: 2, region_based: true}, "Windows  t2.medium" => {count: 4, region_based: true}})
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sport_ngin_aws_auditor
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.11.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-02 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk