sport_ngin_aws_auditor 3.4.1 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d049590c2efaa67e2070d04f7882d6a615040e91
-  data.tar.gz: 6107c00771383ba9886aef453c96e5f823057c14
+  metadata.gz: 49a159bfcd78d9a4084f11225a8a8eabf9161d5f
+  data.tar.gz: 8fdabe907c57537bb552cbfc974b0e6305da54f2
 SHA512:
-  metadata.gz: 9d503ffdeb1338db137c930e9cdfb2e8b73e17f7be293134c22bdfdb9528e10d8af6119a4217f4ced95978fcb2a61c00011ca0755d17995231de1a0c33d7aadf
-  data.tar.gz: 27f60395d9b9e72bd4abd51ce19e45e2cb90edbfb163bab1e81b3d21e55242a73ebc9e35d113a97fb8715b35693ea123ad107234617197e1654924c951953a91
+  metadata.gz: 95a2838c5ba80c0740b31f3875598ecaf085df1e2e8c59c583c3873f34c75c0a1c1b9ea2429f0b734cf2e67e82bbaa6f45a46468645277c2931a024b690c64f0
+  data.tar.gz: 2479ae3cc84a567bb5b6ca79c0eadb50863399a870fba1821c529e917f8dc675f77f175da8622da9dbc65c160c40ce4a8b4d798d65798b74c31469cf9b970445

data/CHANGELOG.markdown

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

data/README.md

@@ -62,7 +62,7 @@ To find discrepancies between number of running instances and purchased instance
 
     $ sport-ngin-aws-auditor audit account1
 
-Any running instances that are not matched with a reserved instance with show up as yellow (with the negative number indicating the amount), the reserved instances that are not matched with an running instance will show up in red (with the positive number indicating the amount), and any reserved instances and running instances that match will show up in green. Any instances in blue with asteriks have a special tag that can either be specified in the audit command or will be defaulted to `no-reserved-instance`.
+Any running instances that are not matched with a reserved instance with show up as yellow, the reserved instances that are not matched with a running instance will show up in red, and any reserved instances and running instances that match will show up in green. Any instances in blue with asteriks have a special tag that can either be specified in the audit command or will be defaulted to `no-reserved-instance`.
 
 To specify your own tag name, run:
 

data/lib/sport_ngin_aws_auditor.rb

@@ -3,6 +3,7 @@ require_relative 'sport_ngin_aws_auditor/convenience_wrappers'
 require_relative 'sport_ngin_aws_auditor/ec2_instance'
 require_relative 'sport_ngin_aws_auditor/rds_instance'
 require_relative 'sport_ngin_aws_auditor/cache_instance'
+require_relative 'sport_ngin_aws_auditor/instance'
 require_relative 'sport_ngin_aws_auditor/stack'
 require_relative 'sport_ngin_aws_auditor/google_sheet'
 require_relative 'sport_ngin_aws_auditor/output'

data/lib/sport_ngin_aws_auditor/instance.rb

@@ -0,0 +1,44 @@
+require_relative './instance_helper'
+
+module SportNginAwsAuditor
+  class Instance
+    extend InstanceHelper
+
+    attr_accessor :name, :count, :type
+    def initialize(name, count)
+      if name.include?(" with tag")
+        name = name.dup # because name is a frozen string right now
+        name.slice!(" with tag")
+        self.name = name
+        self.type = "tagged"
+      else
+        self.name = name
+        if count < 0
+          self.type = "running"
+        elsif count == 0
+          self.type = "matched"
+        elsif count > 0 
+          self.type = "reserved"
+        end
+      end
+
+      self.count = count.abs
+    end
+
+    def tagged?
+      self.type == "tagged"
+    end
+
+    def reserved?
+      self.type == "reserved"
+    end
+
+    def running?
+      self.type == "running"
+    end
+
+    def matched?
+      self.type == "matched"
+    end
+  end
+end

data/lib/sport_ngin_aws_auditor/notify_slack.rb

@@ -1,11 +1,12 @@
-require 'slack-notifier'
+require 'httparty'
 
 module SportNginAwsAuditor
   class NotifySlack
-    attr_accessor :text, :channel, :webhook, :username, :icon_url, :icon_emoji
+    attr_accessor :text, :channel, :webhook, :username, :icon_url, :icon_emoji, :attachments
 
     def initialize(text)
       self.text = text
+      self.attachments = []
       if SportNginAwsAuditor::Config.slack
         self.channel = SportNginAwsAuditor::Config.slack[:channel]
         self.username = SportNginAwsAuditor::Config.slack[:username]
@@ -18,13 +19,14 @@ module SportNginAwsAuditor
 
     def perform
       if SportNginAwsAuditor::Config.slack
-        options = {webhook: webhook,
+        options = {text: text,
+                   webhook: webhook,
                    channel: channel,
                    username: username,
                    icon_url: icon_url,
-                   http_options: {open_timeout: 10}
+                   attachments: attachments
                   }
-        Slack::Notifier.new(webhook, options).ping(text)
+        HTTParty.post(options[:webhook], :body => "payload=#{options.to_json}")
       end
     end
   end

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -1,5 +1,6 @@
 require 'highline/import'
 require_relative "../notify_slack"
+require_relative "../instance"
 
 module SportNginAwsAuditor
   module Scripts
@@ -47,76 +48,79 @@ module SportNginAwsAuditor
           instances_without_tag = klass.filter_instance_without_tags(instances)
           instance_hash = klass.instance_count_hash(instances_without_tag)
           klass.add_instances_with_tag_to_hash(instances_with_tag, instance_hash)
-          return instance_hash
         elsif options[:reserved]
-          return klass.instance_count_hash(klass.get_reserved_instances)
+          instance_hash = klass.instance_count_hash(klass.get_reserved_instances)
         else
-          return klass.compare(tag_name)
+          instance_hash = klass.compare(tag_name)
         end
+
+        compared_array = []
+        instance_hash.each do |key, value|
+          compared_array.push(Instance.new(key, value))
+        end
+        compared_array
       end
 
       def self.print_data(slack, environment, data, class_type)
+        data.sort_by! { |instance| [instance.type, instance.name] }
+
         if slack
           print_to_slack(data, class_type, environment)
         elsif options[:reserved] || options[:instances]
           puts header(class_type)
-          data.each{ |key, value| say "<%= color('#{key}: #{value}', :white) %>" }
+          data.each{ |instance| say "<%= color('#{instance.name}: #{instance.count}', :white) %>" }
         else
           puts header(class_type)
-          data.each{ |key, value| colorize(key, value) }
+          data.each{ |instance| colorize(instance) }
         end
       end
 
-      def self.colorize(key, value)
-        if key.include?(" with tag")
-          key, value = modify_tag_prints(key, value)
-          say "<%= color('#{key}: #{value}', :blue) %>"
-        elsif value < 0
-          say "<%= color('#{key}: #{value}', :yellow) %>"
-        elsif value == 0
-          say "<%= color('#{key}: #{value}', :green) %>"
-        elsif value > 0 
-          say "<%= color('#{key}: #{value}', :red) %>"
-        end
+      def self.colorize(instance)
+        name = instance.name
+        count = instance.count
+        color, rgb = color_chooser(instance)
+        say "<%= color('#{name}: #{count}', :#{color}) %>"
       end
 
-      def self.print_to_slack(instances_hash, class_type, environment)
-        discrepancy_hash = Hash.new
-        instances_hash.each do |key, value|
-          if value != 0
-            discrepancy_hash[key] = value
+      def self.print_to_slack(instances_array, class_type, environment)
+        discrepancy_array = []
+        instances_array.each do |instance|
+          unless instance.matched?
+            discrepancy_array.push(instance)
           end
         end
 
-        true_discrepancies = discrepancy_hash.dup.select{ |key, value| !key.include?(" with tag")}
+        true_discrepancies = discrepancy_array.reject{ |instance| instance.tagged? }
 
-        if true_discrepancies.empty?
-          slack_job = NotifySlack.new("All #{class_type} instances for #{environment} are up to date.")
-          slack_job.perform
-        else
-          print_discrepancies(discrepancy_hash, class_type, environment)
+        unless true_discrepancies.empty?
+          print_discrepancies(discrepancy_array, class_type, environment)
         end
       end
 
-      def self.print_discrepancies(discrepancy_hash, class_type, environment)
-        to_print = "Some #{class_type} instances for #{environment} are out of sync:\n"
-        to_print << "#{header(class_type)}\n"
+      def self.print_discrepancies(discrepancy_array, class_type, environment)
+        title = "Some #{class_type} discrepancies for #{environment} exist:\n"
+        slack_job = NotifySlack.new(title)
 
-        discrepancy_hash.each do |key, value|
-          if key.include?(" with tag")
-            key, value = modify_tag_prints(key, value)
-          end
-          to_print << "#{key}: #{value}\n"
+        discrepancy_array.each do |discrepancy|
+          name = discrepancy.name
+          count = discrepancy.count
+          color, rgb = color_chooser(discrepancy)
+          slack_job.attachments.push({"color" => rgb, "text" => "#{name}: #{count}", "mrkdwn_in" => ["text"]})
         end
 
-        slack_job = NotifySlack.new(to_print)
         slack_job.perform
       end
 
-      def self.modify_tag_prints(key, value)
-        key = key.dup # because key is a frozen string right now
-        key.slice!(" with tag")
-        return key, "*" << value.to_s
+      def self.color_chooser(instance)
+        if instance.tagged?
+          return "blue", "#0000CC"
+        elsif instance.running?
+          return "yellow", "#FFD700"
+        elsif instance.matched?
+          return "green", "#32CD32"
+        elsif instance.reserved?
+          return "red", "#BF1616"
+        end
       end
 
       def self.header(type, length = 50)

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "3.4.1"
+  VERSION = "3.5.0"
 end

data/spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require 'aws-sdk'
-require 'slack-notifier'
 
 # This file was generated by the `rspec --init` command. Conventionally, all
 # specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.

data/spec/sport_ngin_aws_auditor/instance_spec.rb

@@ -0,0 +1,30 @@
+require "sport_ngin_aws_auditor"
+
+module SportNginAwsAuditor
+  describe Instance do
+    it "should make a reserved instance with proper attributes" do
+      instance = Instance.new("Windows VPC us-east-1e m1.large", 4)
+      expect(instance).to be_an_instance_of(Instance)
+      expect(instance.type).to eq("reserved")
+      expect(instance.count).to eq(4)
+      expect(instance.tagged?).to eq(false)
+      expect(instance.reserved?).to eq(true)
+    end
+
+    it "should make a running instance with proper attributes" do
+      instance = Instance.new("Windows VPC us-east-1e m1.large", -1)
+      expect(instance).to be_an_instance_of(Instance)
+      expect(instance.type).to eq("running")
+      expect(instance.count).to eq(-1.abs)
+    end
+
+    it "should make an instance with a tag with proper attributes" do
+      instance = Instance.new("Windows VPC us-east-1e m1.large with tag", 4)
+      expect(instance).to be_an_instance_of(Instance)
+      expect(instance.type).to eq("tagged")
+      expect(instance.count).to eq(4)
+      expect(instance.tagged?).to eq(true)
+      expect(instance.running?).to eq(false)
+    end
+  end
+end

data/spec/sport_ngin_aws_auditor/notify_slack_spec.rb

@@ -14,9 +14,8 @@ module SportNginAwsAuditor
     end
 
     it 'should ping Slack Notifier' do
-      notifier = double('notifier', ping: true)
-      allow(Slack::Notifier).to receive(:new).and_return(notifier)
-      expect(notifier).to receive(:ping).and_return(true)
+      notifier = double('notifier')
+      expect(HTTParty).to receive(:post)
       message = NotifySlack.new("Test message")
       message.perform
     end

data/sport_ngin_aws_auditor.gemspec

@@ -24,9 +24,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'highline', '~> 1.6'
   spec.add_dependency 'google_drive', '~> 1.0.0.pre2'
   spec.add_dependency 'google-api-client', '~> 0.8.6'
-  spec.add_dependency 'slack-notifier', '~> 1.5.1'
   spec.add_dependency 'rack', '~> 1.3.0'
   spec.add_dependency 'activesupport', '~> 3.2'
+  spec.add_dependency 'httparty'
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sport_ngin_aws_auditor
 version: !ruby/object:Gem::Version
-  version: 3.4.1
+  version: 3.5.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -97,47 +97,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.8.6
 - !ruby/object:Gem::Dependency
-  name: slack-notifier
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
-  name: rack
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '3.2'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +214,7 @@ files:
 - lib/sport_ngin_aws_auditor/ec2_instance.rb
 - lib/sport_ngin_aws_auditor/google.rb
 - lib/sport_ngin_aws_auditor/google_sheet.rb
+- lib/sport_ngin_aws_auditor/instance.rb
 - lib/sport_ngin_aws_auditor/instance_helper.rb
 - lib/sport_ngin_aws_auditor/notify_slack.rb
 - lib/sport_ngin_aws_auditor/output.rb
@@ -228,6 +229,7 @@ files:
 - spec/sport_ngin_aws_auditor/cache_instance_spec.rb
 - spec/sport_ngin_aws_auditor/config_spec.rb
 - spec/sport_ngin_aws_auditor/ec2_instance_spec.rb
+- spec/sport_ngin_aws_auditor/instance_spec.rb
 - spec/sport_ngin_aws_auditor/notify_slack_spec.rb
 - spec/sport_ngin_aws_auditor/rds_instance_spec.rb
 - sport_ngin_aws_auditor.gemspec
@@ -261,5 +263,6 @@ test_files:
 - spec/sport_ngin_aws_auditor/cache_instance_spec.rb
 - spec/sport_ngin_aws_auditor/config_spec.rb
 - spec/sport_ngin_aws_auditor/ec2_instance_spec.rb
+- spec/sport_ngin_aws_auditor/instance_spec.rb
 - spec/sport_ngin_aws_auditor/notify_slack_spec.rb
 - spec/sport_ngin_aws_auditor/rds_instance_spec.rb