sport_ngin_aws_auditor 3.11.1 → 3.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a87a5662cac1e058dc24bd10461c438d7d67681a
-  data.tar.gz: 66e2e758d04513a1ea34f448a61837c11a0fc4eb
+  metadata.gz: 9b78fd1868472a038023d6d6ff2e308514871566
+  data.tar.gz: 542d43dc284773ad7a2c7392faeae7c8211ab384
 SHA512:
-  metadata.gz: 8eaa4a8aab67724614ef8e44698982387b358b82881c489e2928d6a70f6db204dfdc7ef99aefb0d9405e55ed86bd400f0b35d57956a01f143ed44193e154dd57
-  data.tar.gz: 9ba84bb48f74f5ad69875ede9004696033afecb739113f49090c3b585d8f8558b458d55834e6c79ba88e800c471bd6ef7a8e2ae46c453240ee1a907677144c86
+  metadata.gz: 7f6705c31e48c9fbfcd38282ecf6e6a2fbbddd522150b6d8b3c007c0e2219e8f49b5f34b34fcfbd4b6bf0fe1ec9ae913c72ee82948dfb26b8ff346c52b6eef50
+  data.tar.gz: 5bf312a33b03a9fe3fe0e0bccb8965eddac50f48e3da5f08ee9bfddda08a52d1157ea38e12c4d85c3a1b28ea85fc66e984b72d29df8e26e20797012afa4b2726

data/CHANGELOG.markdown

@@ -1,3 +1,8 @@
+#### 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
 

data/lib/sport_ngin_aws_auditor/cache_instance.rb

@@ -7,40 +7,36 @@ module SportNginAwsAuditor
     extend AWSWrapper
 
     class << self
-      attr_accessor :instances, :reserved_instances, :retired_reserved_instances
-
       def get_instances(tag_name=nil)
-        return @instances if @instances
         account_id = get_account_id
-        @instances = cache.describe_cache_clusters.cache_clusters.map do |instance|
+        cache.describe_cache_clusters.cache_clusters.map do |instance|
           next unless instance.cache_cluster_status.to_s == 'available'
           new(instance, account_id, tag_name, cache)
         end.compact
       end
 
       def get_reserved_instances
-        return @reserved_instances if @reserved_instances
-        @reserved_instances = cache.describe_reserved_cache_nodes.reserved_cache_nodes.map do |instance|
+        cache.describe_reserved_cache_nodes.reserved_cache_nodes.map do |instance|
           next unless instance.state.to_s == 'active'
           new(instance)
         end.compact
       end
 
       def get_retired_reserved_instances
-        return @retired_reserved_instances if @retired_reserved_instances
-        @retired_reserved_instances = cache.describe_reserved_cache_nodes.reserved_cache_nodes.map do |instance|
+        cache.describe_reserved_cache_nodes.reserved_cache_nodes.map do |instance|
           next unless instance.state == 'retired'
           new(instance)
         end.compact
       end
     end
 
-    attr_accessor :id, :name, :instance_type, :scope, :engine, :count, :tag_value, :tag_reason, :expiration_date
+    attr_accessor :id, :name, :instance_type, :scope, :engine, :count, :tag_value, :tag_reason, :expiration_date, :availability_zone
     def initialize(cache_instance, account_id=nil, tag_name=nil, cache=nil)
       if cache_instance.class.to_s == "Aws::ElastiCache::Types::ReservedCacheNode"
         self.id = cache_instance.reserved_cache_node_id
         self.name = cache_instance.reserved_cache_node_id
         self.scope = nil
+        self.availability_zone = nil
         self.instance_type = cache_instance.cache_node_type
         self.engine = cache_instance.product_description
         self.count = cache_instance.cache_node_count
@@ -49,6 +45,7 @@ module SportNginAwsAuditor
         self.id = cache_instance.cache_cluster_id
         self.name = cache_instance.cache_cluster_id
         self.scope = nil
+        self.availability_zone = nil
         self.instance_type = cache_instance.cache_node_type
         self.engine = cache_instance.engine
         self.count = cache_instance.num_cache_nodes

data/lib/sport_ngin_aws_auditor/ec2_instance.rb

@@ -6,30 +6,25 @@ module SportNginAwsAuditor
     extend EC2Wrapper
 
     class << self
-      attr_accessor :instances, :reserved_instances, :retired_reserved_instances
-
       def get_instances(tag_name=nil)
-        return @instances if @instances
-        @instances = ec2.describe_instances.reservations.map do |reservation|
+        instances = ec2.describe_instances.reservations.map do |reservation|
           reservation.instances.map do |instance|
             next unless instance.state.name == 'running'
             new(instance, tag_name)
           end.compact
         end.flatten.compact
-        get_more_info
+        get_more_info(instances)
       end
 
       def get_reserved_instances
-        return @reserved_instances if @reserved_instances
-        @reserved_instances = ec2.describe_reserved_instances.reserved_instances.map do |instance|
+        ec2.describe_reserved_instances.reserved_instances.map do |instance|
           next unless instance.state == 'active'
           new(instance, nil, instance.instance_count)
         end.compact
       end
 
       def get_retired_reserved_instances
-        return @retired_reserved_instances if @retired_reserved_instances
-        @retired_reserved_instances = ec2.describe_reserved_instances.reserved_instances.map do |instance|
+        ec2.describe_reserved_instances.reserved_instances.map do |instance|
           next unless instance.state == 'retired'
           new(instance, nil, instance.instance_count)
         end.compact
@@ -49,8 +44,8 @@ module SportNginAwsAuditor
         buckets.sort_by{|k,v| k }
       end
 
-      def get_more_info
-        get_instances.each do |instance|
+      def get_more_info(instances)
+        instances.each do |instance|
           tags = ec2.describe_tags(:filters => [{:name => "resource-id", :values => [instance.id]}]).tags
           tags = Hash[tags.map { |tag| [tag[:key], tag[:value]]}.compact]
           instance.name = tags["Name"]

data/lib/sport_ngin_aws_auditor/rds_instance.rb

@@ -7,28 +7,23 @@ module SportNginAwsAuditor
     extend AWSWrapper
 
     class << self
-      attr_accessor :instances, :reserved_instances, :retired_reserved_instances
-
       def get_instances(tag_name=nil)
-        return @instances if @instances
         account_id = get_account_id
-        @instances = rds.describe_db_instances.db_instances.map do |instance|
+        rds.describe_db_instances.db_instances.map do |instance|
           next unless instance.db_instance_status.to_s == 'available'
           new(instance, account_id, tag_name, rds)
         end.compact
       end
 
       def get_reserved_instances
-        return @reserved_instances if @reserved_instances
-        @reserved_instances = rds.describe_reserved_db_instances.reserved_db_instances.map do |instance|
+        rds.describe_reserved_db_instances.reserved_db_instances.map do |instance|
           next unless instance.state.to_s == 'active'
           new(instance)
         end.compact
       end
 
       def get_retired_reserved_instances
-        return @retired_reserved_instances if @retired_reserved_instances
-        @retired_reserved_instances = rds.describe_reserved_db_instances.reserved_db_instances.map do |instance|
+        rds.describe_reserved_db_instances.reserved_db_instances.map do |instance|
           next unless instance.state == 'retired'
           new(instance)
         end.compact

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -85,7 +85,7 @@ module SportNginAwsAuditor
             # and size = 't2.small'
             size = my_match[2] if my_match
 
-            n = platform << audit_results.region << ' ' << size
+            n = (platform || "") << (audit_results.region || "") << ' ' << size
             say "#{n} (#{ri.count}) on #{ri.expiration_date}"
           else
             say "#{ri.to_s} (#{ri.count}) on #{ri.expiration_date}"
@@ -98,7 +98,7 @@ module SportNginAwsAuditor
         say "The following #{output_options[:class_type]}Instance tags have recently expired in #{output_options[:environment]}:"
         retired_tags.each do |tag|
           if tag.reason
-            say "#{tag.instance_name} (#{tag.instance_type}) retired on #{tag.value} because of #{tag.reason}"
+            say "#{tag.instance_name} (#{tag.instance_type}) retired on #{tag.value} because #{tag.reason}"
           else
             say "#{tag.instance_name} (#{tag.instance_type}) retired on #{tag.value}"
           end
@@ -112,7 +112,7 @@ module SportNginAwsAuditor
         
         if instance.tagged?
           if instance.reason
-            puts "#{prefix} #{name}: (expiring on #{instance.tag_value} because of #{instance.reason})".blue
+            puts "#{prefix} #{name}: (expiring on #{instance.tag_value} because #{instance.reason})".blue
           else
             say "<%= color('#{prefix} #{name}: (expiring on #{instance.tag_value})', :#{color}) %>"
           end
@@ -170,7 +170,7 @@ module SportNginAwsAuditor
       end
 
       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"
+        title = "There are currently some tagged or ignored #{output_options[:class_type]}s in #{output_options[:environment]}:\n"
         slack_instances = NotifySlack.new(title, options[:config_json])
 
         tagged_ignored_array.each do |tagged_or_ignored|
@@ -180,7 +180,7 @@ module SportNginAwsAuditor
           
           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})"
+              text = "#{prefix} #{tagged_or_ignored.name}: (expiring on #{tagged_or_ignored.tag_value} because #{tagged_or_ignored.reason})"
             else
               text = "#{prefix} #{tagged_or_ignored.name}: (expiring on #{tagged_or_ignored.tag_value})"
             end
@@ -229,7 +229,7 @@ module SportNginAwsAuditor
 
         retired_tags.each do |tag|
           if tag.reason
-            message << "*#{tag.instance_name}* (#{tag.instance_type}) retired on *#{tag.value}* because of #{tag.reason}\n"
+            message << "*#{tag.instance_name}* (#{tag.instance_type}) retired on *#{tag.value}* because #{tag.reason}\n"
           else
             message << "*#{tag.instance_name}* (#{tag.instance_type}) retired on *#{tag.value}*\n"
           end

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "3.11.1"
+  VERSION = "3.11.2"
 end

metadata

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