sport_ngin_aws_auditor 4.3.1 → 4.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 272236aaef0f07666be8ffc21084d25f1a3dfebb0cd8e45c7561ac39cb29287c
-  data.tar.gz: bc5d6bc2324288813bed74beb87aba0bd1de7950282425efff7a42aab2b5c26d
+SHA1:
+  metadata.gz: 8749be5c2a1fd6c12d3578215ce3c8bae4f5e223
+  data.tar.gz: 38356de4c0dfa296977b9aa8fa0b63bcec51e182
 SHA512:
-  metadata.gz: a5546d693f3454601d91584d63e76de0f9e9843bfc45c87976164c1ed27b5e6404c2700b56f93e6ca5bb0d6e126f0d2b773a3df080482eab0bac498e9c7358a0
-  data.tar.gz: b286a24a59db4dc48fe8a61c508ed4f759c0cead17d051b72d4bdf0f0c5a366b38e09e3b23405e36abd56ff8b30a8bc5a62e702838b878239e6c0c58c8483e68
+  metadata.gz: 0566cda91b09fc46124367b4de7fe033b01ee2d3d7ffc16457cfa2e7cee6ef703b985fd1520c3279ce7e6a1b2558e45ce784889ca5e08eba7dd066bdfdc913b0
+  data.tar.gz: 28c45d84a058af478ddf9dcbff170fd92e6e1e3989c9fb8049ad92c5f416a1acf382cdbed59b54fa51ff6c58dd03e6296ac08cca8edcf5824d6c5c080eedf5d8

data/lib/sport_ngin_aws_auditor/instance_helper.rb

@@ -24,42 +24,12 @@ module SportNginAwsAuditor
       instance_hash
     end
 
-    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'...
-          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 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
-            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}#{extra_string}#{instance.name})"
         instance_result = {}
-        
+
         if instance_hash.has_key?(instance.to_s) && instance_hash[instance.to_s][:count] > 0
           current_val = instance_hash[instance.to_s][:count]
           val = current_val - instance.count
@@ -109,18 +79,86 @@ module SportNginAwsAuditor
       return ris_region, ris_hash
     end
 
-    def measure_differences(instance_hash, ris_hash)
+    def measure_differences(instance_hash, ris_hash, ris_region, klass)
       differences = Hash.new()
+
+      # Setup and zone-based RI calculation
       instance_hash.keys.concat(ris_hash.keys).uniq.each do |key|
         instance_count = instance_hash.has_key?(key) ? instance_hash[key][:count] : 0
         ris_count = ris_hash.has_key?(key) ? ris_hash[key][:count] : 0
-        differences[key] = {:count => ris_count - instance_count, :region_based => false}
+        # positive count => more ris, negative count => more instances
+        differences[key] = { count: ris_count - instance_count, region_based: false }
       end
+
+      # Region-based RI calculation
+      ris_region_processor(differences, ris_region) unless ris_region.empty?
+
       differences
     end
 
+    # Assuming zone based information is already added and differences hash is initialized
+    private def ris_region_processor(differences, ris_region)
+      # Group all the same size RIs
+      # Ex: ri_group_arr = [{ instance_type: "t2.medium", platform: "Linux VPC", count: 7 }, ...]
+      ri_group_arr = group_ris_region(ris_region)
+
+      # Process each ri_group determined by instance_type and platform
+      ri_group_arr.each do |ri_group|
+        target_instance_type = ri_group[:instance_type]
+        target_platform = ri_group[:platform]
+        ri_count = ri_group[:count]
+        instances_left = differences.select do |k,v|
+          # Ex: k,v = "Linux VPC us-east-1d t2.small", {:count=>-15, :region_based=>false}
+          Regexp.new("^#{target_platform}.*#{target_instance_type}$") =~ k
+        end
+
+        instances_left_count = - instances_left.reduce(0) do | previous_count, actual_instance |
+          previous_count += actual_instance[1][:count]
+        end
+
+        if instances_left_count > 0
+          # Actual instances left > zone RIs
+          # Use regional instances
+          instances_left.each_value do |v|
+            if ri_count >= -v[:count]
+              ri_count += v[:count]
+              v[:count] = 0
+            else
+              # No more RIs left
+              v[:count] = ri_count + v[:count]
+              ri_count = 0
+              break;
+            end
+          end
+        end
+        differences["#{target_platform} #{target_instance_type}"] = { count: ri_count, region_based: true }
+      end
+    end
+
+    private def group_ris_region(ris_region)
+      ri_group_arr = []
+      ris_region.each do |ec2_ri_obj|
+        selected_ri_group = ri_group_arr.select do |ri_group|
+          ri_group[:instance_type] == ec2_ri_obj.instance_type && ri_group[:platform] == ec2_ri_obj.platform
+        end
+        if selected_ri_group.count == 1
+          selected_ri_group = selected_ri_group.first
+          selected_ri_group[:count] += ec2_ri_obj.count
+        elsif selected_ri_group.empty?
+          selected_ri_group = {
+                                instance_type: ec2_ri_obj.instance_type,
+                                platform: ec2_ri_obj.platform,
+                                count: ec2_ri_obj.count
+                              }
+          ri_group_arr << selected_ri_group
+        else
+          raise "More than one group with the same instance size and platform detected: #{selected_ri_group}"
+        end
+      end
+      ri_group_arr
+    end
+
     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
@@ -129,7 +167,8 @@ module SportNginAwsAuditor
     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)
+      # ris_region is empty for rds and cache, and ris_hash is empty for ec2 (by default)
+      differences = measure_differences(instance_hash, ris_hash, ris_region, klass)
       add_additional_data(ris_region, instances_with_tag, ignored_instances, differences, klass)
       differences
     end
@@ -152,12 +191,12 @@ module SportNginAwsAuditor
       end
     end
 
-    # this gathers all RIs except the region-based RIs
+    # this gathers all RIs except the region-based RIs (For RDS and cache)
     def filter_ris_availability_zone(ris)
       ris.reject { |ri| ri.scope == 'Region' }
     end
 
-    # this filters all of the region-based RIs
+    # this filters all of the region-based RIs (For EC2 by default)
     def filter_ris_region_based(ris)
       ris.select { |ri| ri.scope == 'Region' }
     end
@@ -185,7 +224,7 @@ module SportNginAwsAuditor
     # this returns a hash of all instances that have retired between 1 week ago and today
     def get_retired_tags(instances)
       return_array = []
-      
+
       instances.select do |instance|
         value = gather_instance_tag_date(instance)
         one_week_ago = (Date.today - 7).to_s
@@ -193,7 +232,7 @@ module SportNginAwsAuditor
           return_array << RecentlyRetiredTag.new(value.to_s, instance.to_s, instance.name, instance.tag_reason)
         end
       end
-      
+
       return_array
     end
 
@@ -208,8 +247,8 @@ module SportNginAwsAuditor
 
     #################### 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. 
+    # 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?
     # ----------|-----------|------

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "4.3.1"
+  VERSION = "4.3.2"
 end

data/spec/sport_ngin_aws_auditor/instance_helper_spec.rb

@@ -79,7 +79,7 @@ module SportNginAwsAuditor
       allow(@ec2_instance1).to receive(:tag_value).and_return(nil)
       allow(@ec2_instance2).to receive(:tag_value).and_return(nil)
       allow(@reserved_ec2_instance1).to receive(:count).and_return(2)
-      allow(@reserved_ec2_instance2).to receive(:count).and_return(2)
+      allow(@reserved_ec2_instance2).to receive(:count).and_return(4)
       allow(@reserved_ec2_instance1).to receive(:to_s).and_return('Linux VPC us-east-1b t2.small')
       allow(@reserved_ec2_instance2).to receive(:to_s).and_return('Windows us-east-1b t2.medium')
       allow(@region_reserved_ec2_instance1).to receive(:platform).and_return('Linux VPC')
@@ -88,8 +88,8 @@ module SportNginAwsAuditor
       allow(@region_reserved_ec2_instance2).to receive(:platform).and_return('Windows')
       allow(@region_reserved_ec2_instance2).to receive(:instance_type).and_return('t2.medium')
       allow(@region_reserved_ec2_instance2).to receive(:count).and_return(4)
-      allow(@region_reserved_ec2_instance1).to receive(:to_s).and_return('Linux VPC  t2.small')
-      allow(@region_reserved_ec2_instance2).to receive(:to_s).and_return('Windows  t2.medium')
+      allow(@region_reserved_ec2_instance1).to receive(:to_s).and_return('Linux VPC t2.small')
+      allow(@region_reserved_ec2_instance2).to receive(:to_s).and_return('Windows t2.medium')
       allow(@region_reserved_ec2_instance1).to receive(:count_remaining).and_return(2)
       allow(@region_reserved_ec2_instance2).to receive(:count_remaining).and_return(2)
       allow(@region_reserved_ec2_instance1).to receive(:count_remaining=).and_return(2)
@@ -129,27 +129,21 @@ module SportNginAwsAuditor
         allow(@region_reserved_ec2_instance2).to receive(:count=)
         instance_hash = klass.instance_count_hash(@ec2_instances)
         ris = klass.instance_count_hash(@reserved_instances)
-        differences = Hash.new()
-        instance_hash.keys.concat(ris.keys).uniq.each do |key|
-          instance_count = instance_hash.has_key?(key) ? instance_hash[key][:count] : 0
-          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, "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}})
+        result = klass.measure_differences(instance_hash, ris, @region_reserved_instances, klass)
+        expect(result).to eq({"Linux VPC us-east-1b t2.small"=>{count: -1, region_based: false}, "Windows us-east-1b t2.medium"=>{count: 0, region_based: false},
+                              "Linux VPC t2.small" => {count: 0, region_based: true}, "Windows t2.medium" => {count: 3, region_based: true}})
       end
 
       it 'should factor in the region based RIs into the counting when there are no zone specific RIs' do
         klass = SportNginAwsAuditor::EC2Instance
-        allow(@ec2_instance1).to receive(:count).and_return(-2)
+        allow(@ec2_instance1).to receive(:count).and_return(2)
         allow(@ec2_instance2).to receive(:count).and_return(5)
         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, "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}})
+        result = klass.measure_differences(instance_hash, {}, @region_reserved_instances, klass)
+        expect(result).to eq({"Linux VPC us-east-1b t2.small"=>{count: 0, region_based: false}, "Windows us-east-1b t2.medium"=>{count: -1, region_based: false},
+                              "Linux VPC t2.small" => {count: 0, region_based: true}, "Windows t2.medium" => {count: 0, 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: 4.3.1
+  version: 4.3.2
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-19 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: AWS configuration as code