sport_ngin_aws_auditor 4.0.0 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 426f863fd847de5399249f6e81575fcdef99ae29
-  data.tar.gz: 8ad69c1ef79d4e0b3b92c59264655c28b719c001
+  metadata.gz: 33ff924df614bb4d8e056200750c9775c0fcc315
+  data.tar.gz: 10a1994780b54551f47de7e4694578ae5a2e24e6
 SHA512:
-  metadata.gz: 52a07a51a83b4229dc3df8ce7bac6685f0b19b369ea01f100a637ae35876c06e2b4a1044a69f4d15bf7913c6114519db72144a420790bf8efa32a396cdb5a81b
-  data.tar.gz: bb2bbf9806d201085f611f18c6cff3439b71dcb32a6397d2bb8a059a6fca3925442b2aa522d0f1f5f74b81b3f96ee36e93207ee233648c33e70cb6a53160fa0a
+  metadata.gz: a0e52ae4fb44a5f22b05b328f3e672ce28398546a332d743df5eeaa6f093297e698e97484091976b547faa0f472f8d99ed299491ad934ba92cd552ef5ab6a5e0
+  data.tar.gz: ded631320ab25cb82105342458693a3bef36c2c0fe6d2aaede106ffbc92233c9c2ef3a7c36c29561843f4d822961d50ff84c654027c29011b27b8a6f5a2e12d1

data/CHANGELOG.markdown

@@ -0,0 +1,132 @@
+#### v4.0.1
+* Concat all of the similar values into one value right before printing
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/27
+
+#### v4.0.0
+* Adding abilities to audit cross account
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/31
+
+#### v3.11.3
+* Missed this bug because I did not test previous bug's fix in Slack
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/30
+
+#### v3.11.2
+* We actually do not want to cache the counts of instances and reserved instances between multiple runs
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/29
+
+#### v3.11.1
+* Must merge this PR in to run the audit command correctly
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/28
+
+#### 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
+
+  > Emma Sax: Andy Fleener, Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/25
+
+#### v3.10.0
+* Handling region-based RIs
+
+  > Emma Sax: Andy Fleener, Luke Ludwig, Tim Sandquist, Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/21
+
+#### v3.9.0
+* Add the ability to pass config data in as a flag
+
+  > Emma Sax: Andy Fleener, Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/24
+
+#### 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
+
+  > Emma Sax: : https://github.com/sportngin/sport_ngin_aws_auditor/pull/20
+
+#### v3.8.1
+#### v3.8.0
+* Clarifying printout of audit command
+
+  > Emma Sax: : https://github.com/sportngin/sport_ngin_aws_auditor/pull/18
+
+#### v3.7.0
+* Print retired tags into slack/terminal on audit
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/sport_ngin_aws_auditor/pull/17
+
+#### v3.6.0
+* Print reserved instances that have retired in past week
+
+  > Emma Sax: Andy Fleener: https://github.com/sportngin/sport_ngin_aws_auditor/pull/16
+
+#### v3.5.0
+* Cleaning up slack printouts with the audit command
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/sport_ngin_aws_auditor/pull/15
+
+#### v3.4.1
+#### v3.4.0
+* Add other RDS engine types
+
+  > matl33t: Emma Sax, Brian Bergstrom: https://github.com/sportngin/sport_ngin_aws_auditor/pull/11
+
+#### v3.3.1
+* Fixing bug where Slack will print discrepancies if there are *only* tagged instances
+
+  > Emma Sax: : https://github.com/sportngin/sport_ngin_aws_auditor/pull/13
+
+#### v3.3.0
+* Slack should print instances that have tags
+
+  > Emma Sax: Andy Fleener: https://github.com/sportngin/sport_ngin_aws_auditor/pull/12
+
+#### v3.2.0
+* Proper recognition of windows/linux/vpc instances
+
+  > Emma Sax: Andy Fleener: https://github.com/sportngin/sport_ngin_aws_auditor/pull/8
+
+#### v3.1.2
+#### v3.1.0
+* Authentication with AWS roles instead of credentials file
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/sport_ngin_aws_auditor/pull/7
+
+#### v3.0.2
+#### v3.0.1
+#### v3.0.0
+* Rename gem directories and modules
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/sport_ngin_aws_auditor/pull/6
+
+#### v2.1.0
+* Adding option to print audit results to Slack channel
+
+  > Emma Sax, Matt Krieger: Brian Bergstrom: https://github.com/sportngin/aws_auditor/pull/4
+
+* Adding option to print audit results to Slack channel
+
+  > Emma Sax, Matt Krieger: Brian Bergstrom: https://github.com/sportngin/aws_auditor/pull/4
+
+#### v2.0.0
+* Adding enhancements for taking no-reserved-instance tag into consideration during audit
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/aws_auditor/pull/2
+
+#### v1.0.0
+* Upgrading aws-sdk version from v1 to v2
+
+  > Emma Sax: Brian Bergstrom: https://github.com/sportngin/aws_auditor/pull/3
+
+* First tests, Travis CI, MFA support, and fog file compatibility
+
+  > Brian Bergstrom: Emma Sax: https://github.com/sportngin/aws_auditor/pull/1

data/lib/sport_ngin_aws_auditor/instance.rb

@@ -4,17 +4,24 @@ module SportNginAwsAuditor
   class Instance
     extend InstanceHelper
 
-    attr_accessor :type, :count, :category, :tag_value, :reason, :name, :region_based
-    def initialize(type, data_hash, region)
-      if type.include?(" with tag")
-        gather_tagged_data(type, data_hash, region)
-      elsif type.include?(" ignored")
-        gather_ignored_data(type, data_hash, region)
+    attr_accessor :type, :count, :category, :tag_value, :reason, :name, :region_based, :replaced
+    def initialize(type, data_hash, region, category=nil, count=nil)
+      if category && count
+        self.type = type
+        self.category = category
+        self.count = count
       else
-        gather_normal_data(type, data_hash, region)
+        if type.include?(" with tag")
+          gather_tagged_data(type, data_hash, region)
+        elsif type.include?(" ignored")
+          gather_ignored_data(type, data_hash, region)
+        else
+          gather_normal_data(type, data_hash, region)
+        end
+
+        self.count = data_hash[:count].abs
+        self.replaced = false
       end
-
-      self.count = data_hash[:count].abs
     end
 
     def gather_tagged_data(type, data_hash, region)

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -46,6 +46,11 @@ module SportNginAwsAuditor
       end
 
       def self.print_audit_results(region)
+        @audit_results.data.each do |instance|
+          instance.type = !@zone_output && (instance.tagged? || instance.running?) ? print_without_zone(instance.type) : instance.type
+        end
+
+        @audit_results.data = merge_similar_keys(@audit_results.data)
         @audit_results.data.sort_by! { |instance| [instance.category, instance.type] }
 
         if @slack
@@ -67,7 +72,7 @@ module SportNginAwsAuditor
 
       def self.say_instances
         @audit_results.data.each do |instance|
-          name = !@zone_output && (instance.tagged? || instance.running?) ? print_without_zone(instance.type) : instance.type
+          name = instance.type
           count = instance.count
           color, rgb, prefix = color_chooser({:instance => instance, :retired_ri => false, :retired_tag => false})
           
@@ -142,24 +147,24 @@ module SportNginAwsAuditor
       end
 
       def self.print_instances
-        data_array = @audit_results.data.reject { |data| data.matched? }
+        data_array = @audit_results.data.reject { |instance| instance.matched? }
 
         if data_array.empty?
           @slack_message.attachments.push({"color" => "#32CD32", "text" => "All RIs are properly matched here!", "mrkdwn_in" => ["text"]})
         else
-          data_array.each do |data|
-            type = !@zone_output && (data.tagged? || data.running?) ? print_without_zone(data.type) : data.type
-            count = data.count
-            color, rgb, prefix = color_chooser({:instance => data, :retired_ri => false, :retired_tag => false})
-
-            if data.tagged?
-              if data.reason
-                text = "#{prefix} #{data.name}: (expiring on #{data.tag_value} because #{data.reason})"
+          data_array.each do |instance|
+            type = instance.type
+            count = instance.count
+            color, rgb, prefix = color_chooser({:instance => instance, :retired_ri => false, :retired_tag => false})
+
+            if instance.tagged?
+              if instance.reason
+                text = "#{prefix} #{instance.name}: (expiring on #{instance.tag_value} because #{instance.reason})"
               else
-                text = "#{prefix} #{data.name}: (expiring on #{data.tag_value})"
+                text = "#{prefix} #{instance.name}: (expiring on #{instance.tag_value})"
               end
-            elsif data.ignored?
-              text = "#{prefix} #{data.name}"
+            elsif instance.ignored?
+              text = "#{prefix} #{instance.name}"
             else
               text = "#{prefix} #{type}: #{count}"
             end
@@ -289,6 +294,32 @@ module SportNginAwsAuditor
         type.sub(/(-\d\w)/, '')
       end
 
+      def self.merge_similar_keys(original_data)
+        combined_data = []
+
+        original_data.each_with_index do |instance, index|
+          new_count = instance.count
+
+          unless instance.replaced
+            for i in index+1..original_data.length-1
+              if (original_data[i].type == instance.type) && ((original_data[i].running? && instance.running?) ||
+                                                              (original_data[i].reserved? && instance.reserved?) ||
+                                                              (original_data[i].matched? && instance.matched?))
+                new_count = new_count + original_data[i].count
+                original_data[i].replaced = true
+              end
+            end
+
+            if new_count != instance.count
+              combined_data.push(Instance.new(instance.type, nil, nil, instance.category, new_count))
+              instance.replaced = true
+            end
+          end
+        end
+
+        original_data.reject { |instance| instance.replaced }.concat(combined_data)
+      end
+
       def self.color_chooser(data)
         if data[:retired_ri]
           return :light_black, "#595959", "RETIRED RI -"

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "4.0.0"
+  VERSION = "4.0.1"
 end

metadata

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