sport_ngin_aws_auditor 4.2.1 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 097d2b8ebf92bd8bebefe7e88ea6488d79027fcc
-  data.tar.gz: 81c8048fa5698dfe4c67701ca0358052d8e2b15a
+SHA256:
+  metadata.gz: 77f4a4a6712086ccf4206ba4477e49aa2723b099031b33f94b3f9b7e4e043575
+  data.tar.gz: 52c30f9db578a364389d5f7890a8733e9f813f96db844cec0ce6f354bee43dcd
 SHA512:
-  metadata.gz: e1420329217ae71010ee6c21930928f35b71bbbe76622dbf5a972fe487f3cd0ba764dbc6760598fecca72a22a548c86bd61cf9dd35ffe788dcffc03b3e551728
-  data.tar.gz: c85e78bba0677e337a9c79078dcf378b1895ebcb85875e61f62d12908fc4213c5a44e04041f71fa39af5dbf0efd303ddf09efb4eebef9f513e940bfb412fbd2a
+  metadata.gz: 0e9b82ba9bde5c9d3c4accb58016ad85903e0cca91fb746f17db2edf5b21aeeb9f4ce7776c70ee49f5b3a201f8626266e9a51506cf1b45e8c0ca97687dc4a103
+  data.tar.gz: 54371f74e22edb4e546df3b79cb886b625a5fd18e7aafcff0741f0192621f9c1c59532f26badb99150c56d2bfdb9695242e6991990a257f25cdde5a3926bc884

data/.ruby-version

@@ -1 +1 @@
-ruby-2.2.5
+ruby-2.2.7

data/CHANGELOG.markdown

@@ -1,3 +1,12 @@
+#### v4.3.0
+* Compare platforms of RDS and EC2 instances correctly
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/43
+
+* Have auditor check all regions, not just U.S. regions
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/42
+
 #### v4.2.1
 * Only give the name 'VPC' to an instance if the account supports EC2 Classic
 

data/lib/sport_ngin_aws_auditor/audit_data.rb

@@ -65,7 +65,7 @@ module SportNginAwsAuditor
     def gather_all_data
       instances = self.klass.get_instances(self.client, tag_name)
       retired_tags = self.klass.get_retired_tags(instances)
-      instance_hash = self.klass.compare(instances, ignore_instances_regexes, self.client)
+      instance_hash = self.klass.compare(instances, ignore_instances_regexes, self.client, self.klass)
       retired_ris = self.klass.get_recent_retired_reserved_instances(self.client)
 
       return instance_hash, retired_tags, retired_ris

data/lib/sport_ngin_aws_auditor/instance_helper.rb

@@ -24,7 +24,7 @@ module SportNginAwsAuditor
       instance_hash
     end
 
-    def add_region_ris_to_hash(ris_region, differences)
+    def add_region_ris_to_hash(ris_region, differences, klass)
       ris_region.each do |ri|
         differences.each do |key, value|
           # if key = 'Linux VPC us-east-1a t2.medium'...
@@ -38,7 +38,9 @@ module SportNginAwsAuditor
           size = my_match[2] if my_match
           size[0] = ''
 
-          if (platform == ri.platform) && (size == ri.instance_type) && (value[:count] < 0)
+          if compare_platforms_based_on_klass(klass, 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
@@ -117,18 +119,18 @@ module SportNginAwsAuditor
       differences
     end
 
-    def add_additional_data(ris_region, instances_with_tag, ignored_instances, differences)
-      add_region_ris_to_hash(ris_region, differences)
+    def add_additional_data(ris_region, instances_with_tag, ignored_instances, differences, klass)
+      add_region_ris_to_hash(ris_region, differences, klass)
       add_additional_instances_to_hash(instances_with_tag, differences, " with tag (")
       add_additional_instances_to_hash(ignored_instances, differences, " ignored (")
       return differences
     end
 
-    def compare(instances, ignore_instances_regexes, client)
+    def compare(instances, ignore_instances_regexes, client, klass)
       ignored_instances, instances_with_tag, instance_hash = sort_through_instances(instances, ignore_instances_regexes)
       ris_region, ris_hash = sort_through_RIs(client)
       differences = measure_differences(instance_hash, ris_hash)
-      add_additional_data(ris_region, instances_with_tag, ignored_instances, differences)
+      add_additional_data(ris_region, instances_with_tag, ignored_instances, differences, klass)
       differences
     end
 
@@ -203,5 +205,26 @@ module SportNginAwsAuditor
       end
       value
     end
+
+    #################### HELPER METHODS ####################
+
+    # If the klass is EC2, then just make sure the instance platform includes the RI platform because 
+    # classic RIs (non-VPC) are used on any instance. 
+    #
+    # Instance  | RI        | Used?
+    # ----------|-----------|------
+    # Linux     | Linux     | Yes
+    # Linux     | Linux VPC | No
+    # Linux VPC | Linux     | Yes
+    # Linux VPC | Linux VPC | Yes
+    #
+    # If the klass is not EC2, then the platforms must match as normal.
+    def compare_platforms_based_on_klass(klass, platform, ri_platform)
+      if klass =~ /EC2/
+        platform.include?(ri_platform)
+      else
+        platform == ri_platform
+      end
+    end
   end
 end

data/lib/sport_ngin_aws_auditor/rds_instance.rb

@@ -74,30 +74,30 @@ module SportNginAwsAuditor
 
     # Generates a name based on the RDS engine or product description
     def engine_helper(engine)
-      case engine.downcase
-      when 'aurora'
+      case
+      when engine.downcase.include?('aurora')
         'Aurora'
-      when 'mariadb'
+      when engine.downcase.include?('mariadb')
         'MariaDB'
-      when 'mysql'
+      when engine.downcase.include?('mysql')
         'MySQL'
-      when 'oracle-ee',     'oracle-ee(byol)'
+      when engine.downcase.include?('oracle-ee')
         'Oracle EE'
-      when 'oracle-se',     'oracle-se(byol)'
-        'Oracle SE'
-      when 'oracle-se1',    'oracle-se1(li)'
+      when engine.downcase.include?('oracle-se1')
         'Oracle SE One'
-      when 'oracle-se2',    'oracle-se2 (byol)' # extra space required
+      when engine.downcase.include?('oracle-se2')
         'Oracle SE Two'
-      when 'postgres',      'postgresql'
+      when engine.downcase.include?('oracle-se')
+        'Oracle SE'
+      when engine.downcase.include?('postgres')
         'PostgreSQL'
-      when 'sqlserver-ee',  'sqlserver-ee(li)'
+      when engine.downcase.include?('sqlserver-ee')
         'SQL Server EE'
-      when 'sqlserver-ex',  'sqlserver-ex(li)'
+      when engine.downcase.include?('sqlserver-ex')
         'SQL Server EX'
-      when 'sqlserver-se',  'sqlserver-se(byol)'
+      when engine.downcase.include?('sqlserver-se')
         'SQL Server SE'
-      when 'sqlserver-web', 'sqlserver-web(li)'
+      when engine.downcase.include?('sqlserver-web')
         'SQL Server Web'
       else
         'Unknown DB Engine'

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -78,20 +78,20 @@ module SportNginAwsAuditor
 
       def self.say_instances
         @audit_results.data.each do |instance|
-          name = instance.type
+          name_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
-              description = "#{prefix} #{name}: (expiring on #{instance.tag_value} because #{instance.reason})\n"
+              description = "#{prefix} #{name_type}: (expiring on #{instance.tag_value} because #{instance.reason})\n"
             else
-              description = "#{prefix} #{name}: (expiring on #{instance.tag_value})\n"
+              description = "#{prefix} #{name_type}: (expiring on #{instance.tag_value})\n"
             end
           elsif instance.ignored?
-            description = "#{prefix} #{name}\n"
+            description = "#{prefix} #{name_type}\n"
           else
-            description = "#{prefix} #{name}: #{count}\n"
+            description = "#{prefix} #{name_type}: #{count}\n"
           end
 
           @message << description.colorize(:color => color)
@@ -159,20 +159,20 @@ module SportNginAwsAuditor
           @slack_message.attachments.push({"color" => "#32CD32", "text" => "All RIs are properly matched here!", "mrkdwn_in" => ["text"]})
         else
           data_array.each do |instance|
-            type = instance.type
+            name_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})"
+                text = "#{prefix} #{name_type}: (expiring on #{instance.tag_value} because #{instance.reason})"
               else
-                text = "#{prefix} #{instance.name}: (expiring on #{instance.tag_value})"
+                text = "#{prefix} #{name_type}: (expiring on #{instance.tag_value})"
               end
             elsif instance.ignored?
-              text = "#{prefix} #{instance.name}"
+              text = "#{prefix} #{name_type}"
             else
-              text = "#{prefix} #{type}: #{count}"
+              text = "#{prefix} #{name_type}: #{count}"
             end
 
             @slack_message.attachments.push({"color" => rgb, "text" => text, "mrkdwn_in" => ["text"]})
@@ -228,8 +228,7 @@ module SportNginAwsAuditor
 
       def self.gather_regions
         regions = AWS.ec2.describe_regions[:regions]
-        us_regions = regions.select { |region| region.region_name.include?("us") }
-        us_regions.collect { |r| r.region_name }
+        regions.collect { |r| r.region_name }
       end
 
       def self.collect_options(environment, options, global_options)

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "4.2.1"
+  VERSION = "4.3.0"
 end

data/spec/sport_ngin_aws_auditor/instance_helper_spec.rb

@@ -135,7 +135,7 @@ 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.add_region_ris_to_hash(@region_reserved_instances, differences)
+        result = klass.add_region_ris_to_hash(@region_reserved_instances, differences, "EC2")
         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: 4, region_based: true}})
       end
@@ -147,7 +147,7 @@ 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.add_region_ris_to_hash(@region_reserved_instances, instance_hash)
+        result = klass.add_region_ris_to_hash(@region_reserved_instances, instance_hash, "EC2")
         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: 4, region_based: true}})
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sport_ngin_aws_auditor
 version: !ruby/object:Gem::Version
-  version: 4.2.1
+  version: 4.3.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-31 00:00:00.000000000 Z
+date: 2018-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -271,7 +271,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.5
 signing_key: 
 specification_version: 4
 summary: AWS configuration as code