sport_ngin_aws_auditor 3.8.2 → 3.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b8658e2851778a2cb51a97a24abff4b3f7aaf0
-  data.tar.gz: efbb6954e3bd4a5db327e65b995a59880380389d
+  metadata.gz: 61c18acb4a0425eecc7d1c34475b6f9e4782a591
+  data.tar.gz: b64e797ac47c77b29c8572336f0a096e293f785d
 SHA512:
-  metadata.gz: ebceaccabab56682e8a33cc8c5c54d451227b8962740369b11db2c3bff689b3254c235d49066255d103dc99eee2078942b5e406e8d1157bf9b569784351dae94
-  data.tar.gz: bc246c946109b27e7db5a0655e5ea6f3c13937d9773287e3ac35c1efd1a4a060d9f4a795325c9fa7151be878260a15df01b6a46c21da7610ff234091700678b9
+  metadata.gz: 65a9c6b87a00aa2b941b40876a2e2ff96c42ad0a2719fc05e8ebe57a21aa576ef99f1640e99adf81f5e95d48c0414e6cc409e7727759cacefee2f69e30787c39
+  data.tar.gz: be320dedfbd0384a24f185067e8b870e11c1566cf4aeb21aa2245821cdd6835ef6d2bd308fc84420cb35bf3def5161f1da704ebf65674e28365f623e19ddc24d

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### v3.8.3
+* Fixing bugs with outputs and counts
+
+  > Emma Sax: Tim Sandquist, Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/23
+
 #### v3.8.2
 * Fixing bugs so that counts are accurate again
 

data/lib/sport_ngin_aws_auditor/instance_helper.rb

@@ -28,18 +28,28 @@ module SportNginAwsAuditor
     def add_instances_with_tag_to_hash(instances_to_add, instance_hash)
       instances_to_add.each do |instance|
         next if instance.nil?
-        key = instance.to_s << " with tag"
+        key = instance.to_s.dup << " with tag (" << instance.name << ")"
         instance_result = []
-        if instance_hash.has_key?(key)
-          instance_result << instance_hash[key][0] + instance.count
+        
+        if instance_hash.has_key?(instance.to_s) && instance_hash[instance.to_s][0] > 0
+          current_val = instance_hash[instance.to_s][0]
+          val = current_val - instance.count
+          new_val = val >= 0 ? val : 0
+          instance_hash[instance.to_s][0] = new_val
+
+          val = instance.count - current_val
+          new_val = val >= 0 ? val : 0
+          instance_result << new_val
         else
           instance_result << instance.count
         end
+
         instance_result << instance.name
         instance_result << instance.tag_reason
         instance_result << instance.tag_value
         instance_hash[key] = instance_result
       end if instances_to_add
+
       instance_hash
     end
 
@@ -91,7 +101,7 @@ module SportNginAwsAuditor
       instances.select do |instance|
         value = gather_instance_tag_date(instance)
         one_week_ago = (Date.today - 7).to_s
-        if (value && (one_week_ago < value.to_s) && (value.to_s < Date.today.to_s))
+        if (value && (one_week_ago < value.to_s) && (value.to_s <= Date.today.to_s))
           return_array << RecentlyRetiredTag.new(value.to_s, instance.to_s, instance.name, instance.tag_reason)
         end
       end

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -84,9 +84,9 @@ module SportNginAwsAuditor
         color, rgb, prefix = color_chooser(instance)
         if instance.tagged?
           if instance.reason
-            puts "#{prefix} #{name}: #{count} (expiring on #{instance.tag_value} because of #{instance.reason})".blue
+            puts "#{prefix} #{name}: (expiring on #{instance.tag_value} because of #{instance.reason})".blue
           else
-            say "<%= color('#{prefix} #{name}: #{count} (expiring on #{instance.tag_value})', :#{color}) %>"
+            say "<%= color('#{prefix} #{name}: (expiring on #{instance.tag_value})', :#{color}) %>"
           end
         else
           say "<%= color('#{prefix} #{name}: #{count}', :#{color}) %>"
@@ -152,9 +152,9 @@ module SportNginAwsAuditor
           color, rgb, prefix = color_chooser(tagged)
           
           if tagged.reason
-            text = "#{prefix} #{type}: #{count} (expiring on #{tagged.tag_value} because of #{tagged.reason})"
+            text = "#{prefix} #{type}: (expiring on #{tagged.tag_value} because of #{tagged.reason})"
           else
-            text = "#{prefix} #{type}: #{count} (expiring on #{tagged.tag_value})"
+            text = "#{prefix} #{type}: (expiring on #{tagged.tag_value})"
           end
 
           slack_instances.attachments.push({"color" => rgb, "text" => text, "mrkdwn_in" => ["text"]})

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "3.8.2"
+  VERSION = "3.8.3"
 end

metadata

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