sport_ngin_aws_auditor 3.1.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebc790d7e87791bcc90e8f2e85677e3283fa6fc7
-  data.tar.gz: 003b57e0b051d17419d7570d29d71b6596cb0803
+  metadata.gz: 41d1decba10c84cc01e2651addad2e71c88aa467
+  data.tar.gz: 2a346488fc698a3ac5de44bd7a8e7e7f300d6d42
 SHA512:
-  metadata.gz: 43f37a2f593dd957f519d1dc8f7e070b70f1497e630944565958f39bba1bf2cd83cb779ace1158b0cc69ae36594bbc5ee61de0d70aef11edbd9da3d0d3072c34
-  data.tar.gz: bae0efdbdb45afc0e00bb7df98b11ed62392b0410231caba5ef820c6d8fa9fa381a0993f9567f097890c129db8f3a994048c703b20b43eede5371cf45580e0ce
+  metadata.gz: a47cd28e41a0e7cb599d1c271dba4424951e607589f41ae991c46df5469ba2d1edcba86e08ba6d63aceef9d562bbdaee28e9d6bea0affb88815a075e4486abac
+  data.tar.gz: 30eeda03adf4d0d718a9df08706fe575693a0d9ccdc88bc6202be9daca0bca2e2a3295e7ebc594f50105fc4b1105511a95a503a87e4f8a87126dd470621212f4

data/CHANGELOG.markdown

@@ -1 +1,40 @@
+#### 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/cache_instance.rb

@@ -41,7 +41,7 @@ module SportNginAwsAuditor
     end
 
     def to_s
-      "#{engine} #{instance_type}"
+      "#{engine.capitalize} #{instance_type}"
     end
 
     def self.get_instances(tag_name=nil)

data/lib/sport_ngin_aws_auditor/ec2_instance.rb

@@ -14,7 +14,7 @@ module SportNginAwsAuditor
       if ec2_instance.class.to_s == "Aws::EC2::Types::ReservedInstances"
         self.id = ec2_instance.reserved_instances_id
         self.name = nil
-        self.platform = platform_helper(ec2_instance)
+        self.platform = platform_helper(ec2_instance.product_description)
         self.availability_zone = ec2_instance.availability_zone
         self.instance_type = ec2_instance.instance_type
         self.count = count
@@ -22,7 +22,7 @@ module SportNginAwsAuditor
       elsif ec2_instance.class.to_s == "Aws::EC2::Types::Instance"
         self.id = ec2_instance.instance_id
         self.name = nil
-        self.platform = platform_helper(ec2_instance)
+        self.platform = platform_helper((ec2_instance.platform || ''), ec2_instance.vpc_id)
         self.availability_zone = ec2_instance.placement.availability_zone
         self.instance_type = ec2_instance.instance_type
         self.count = count
@@ -66,28 +66,20 @@ module SportNginAwsAuditor
       @tag_value
     end
 
-    def platform_helper(ec2_instance)
-      if ec2_instance.class.to_s == "Aws::EC2::Types::Instance"
-        if ec2_instance.vpc_id
-          return 'VPC'
-        elsif ec2_instance.platform
-          if ec2_instance.platform.downcase.include? 'windows' 
-            return 'Windows'
-          else
-            return 'Linux'
-          end
-        else
-          return 'Linux'
-        end
-      elsif ec2_instance.class.to_s == "Aws::EC2::Types::ReservedInstances"
-        if ec2_instance.product_description.downcase.include? 'vpc'
-          return 'VPC'
-        elsif ec2_instance.product_description.downcase.include? 'windows'
-          return 'Windows'
-        else
-          return 'Linux'
-        end
+    def platform_helper(description, vpc=nil)
+      platform = ''
+
+      if description.downcase.include?('windows')
+        platform << 'Windows'
+      elsif description.downcase.include?('linux') || description.empty?
+        platform << 'Linux'
+      end
+
+      if description.downcase.include?('vpc') || vpc
+        platform << ' VPC'
       end
+
+      return platform
     end
     private :platform_helper
 

data/lib/sport_ngin_aws_auditor/rds_instance.rb

@@ -16,13 +16,13 @@ module SportNginAwsAuditor
         self.id = rds_instance.reserved_db_instances_offering_id
         self.multi_az = rds_instance.multi_az ? "Multi-AZ" : "Single-AZ"
         self.instance_type = rds_instance.db_instance_class
-        self.engine = rds_instance.product_description
+        self.engine = engine_helper(rds_instance.product_description)
         self.count = 1
       elsif rds_instance.class.to_s == "Aws::RDS::Types::DBInstance"
         self.id = rds_instance.db_instance_identifier
         self.multi_az = rds_instance.multi_az ? "Multi-AZ" : "Single-AZ"
         self.instance_type = rds_instance.db_instance_class
-        self.engine = rds_instance.engine
+        self.engine = engine_helper(rds_instance.engine)
         self.count = 1
 
         if tag_name
@@ -41,7 +41,7 @@ module SportNginAwsAuditor
     end
 
     def to_s
-      "#{engine_helper} #{multi_az} #{instance_type}"
+      "#{engine} #{multi_az} #{instance_type}"
     end
 
     def self.get_instances(tag_name=nil)
@@ -65,7 +65,7 @@ module SportNginAwsAuditor
       @tag_value
     end
 
-    def engine_helper
+    def engine_helper(engine)
       if engine.downcase.include? "post"
         return "PostgreSQL"
       elsif engine.downcase.include? "mysql"

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -32,10 +32,10 @@ module SportNginAwsAuditor
         print_data(slack, environment, data, "EC2Instance") if options[:ec2] || no_selection
 
         data = gather_data("RDSInstance", tag_name) if options[:rds] || no_selection
-        print_data(slack, environment, data, "RDSInstance") if options[:ec2] || no_selection
+        print_data(slack, environment, data, "RDSInstance") if options[:rds] || no_selection
 
         data = gather_data("CacheInstance", tag_name) if options[:cache] || no_selection
-        print_data(slack, environment, data, "CacheInstance") if options[:ec2] || no_selection
+        print_data(slack, environment, data, "CacheInstance") if options[:cache] || no_selection
       end
 
       def self.gather_data(class_type, tag_name)

data/lib/sport_ngin_aws_auditor/version.rb

@@ -1,3 +1,3 @@
 module SportNginAwsAuditor
-  VERSION = "3.1.2"
+  VERSION = "3.2.0"
 end

data/spec/sport_ngin_aws_auditor/cache_instance_spec.rb

@@ -118,7 +118,7 @@ module SportNginAwsAuditor
         allow(CacheInstance).to receive(:cache).and_return(cache_client)
         instances = CacheInstance::get_instances("tag_name")
         instance = instances.first
-        expect(instance.to_s).to eq("redis cache.t2.small")
+        expect(instance.to_s).to eq("Redis cache.t2.small")
       end
     end
   end

data/spec/sport_ngin_aws_auditor/ec2_instance_spec.rb

@@ -26,7 +26,7 @@ module SportNginAwsAuditor
         ec2_instance2 = double('ec2_instance', instance_id: "i-thisisfake",
                                                instance_type: "t2.large",
                                                vpc_id: "vpc-alsofake",
-                                               platform: nil,
+                                               platform: "Windows",
                                                state: state,
                                                placement: placement,
                                                tags: instance_tags,
@@ -36,7 +36,7 @@ module SportNginAwsAuditor
         name_tag = { key: "Name", value: "our-app-instance-100" }
         stack_tag = { key: "opsworks:stack", value: "our_app_service_2" }
         client_tags = double('tags', tags: [name_tag, stack_tag])
-        ec2_client = double('rds_client', describe_instances: ec2_instances, describe_tags: client_tags)
+        ec2_client = double('ec2_client', describe_instances: ec2_instances, describe_tags: client_tags)
         allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
       end
 
@@ -60,7 +60,15 @@ module SportNginAwsAuditor
         expect(instance.id).to eq("i-thisisfake")
         expect(instance.availability_zone).to eq("us-east-1d")
         expect(instance.instance_type).to eq("t2.large")
-        expect(instance.platform).to eq("VPC")
+        expect(instance.platform).to eq("Linux VPC")
+      end
+
+      it "should recognize Windows vs. Linux" do
+        instances = EC2Instance::get_instances("tag_name")
+        instance1 = instances.first
+        instance2 = instances.last
+        expect(instance1.platform).to eq("Linux VPC")
+        expect(instance2.platform).to eq("Windows VPC")
       end
     end
 
@@ -68,7 +76,7 @@ module SportNginAwsAuditor
       before :each do
         reserved_ec2_instance1 = double('reserved_ec2_instance', reserved_instances_id: "12345-dfas-1234-asdf-thisisfake!!",
                                                                  instance_type: "t2.medium",
-                                                                 product_description: "Linux/UNIX (Amazon VPC)",
+                                                                 product_description: "Windows (Amazon VPC)",
                                                                  state: "active",
                                                                  availability_zone: "us-east-1b",
                                                                  instance_count: 4,
@@ -81,7 +89,7 @@ module SportNginAwsAuditor
                                                                  instance_count: 2,
                                                                  class: "Aws::EC2::Types::ReservedInstances")
         reserved_ec2_instances = double('reserved_ec2_instances', reserved_instances: [reserved_ec2_instance1, reserved_ec2_instance2])
-        ec2_client = double('rds_client', describe_reserved_instances: reserved_ec2_instances)
+        ec2_client = double('ec2_client', describe_reserved_instances: reserved_ec2_instances)
         allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
       end
 
@@ -101,15 +109,23 @@ module SportNginAwsAuditor
         reserved_instances = EC2Instance::get_reserved_instances
         reserved_instance = reserved_instances.first
         expect(reserved_instance.id).to eq("12345-dfas-1234-asdf-thisisfake!!")
-        expect(reserved_instance.platform).to eq("VPC")
+        expect(reserved_instance.platform).to eq("Windows VPC")
         expect(reserved_instance.availability_zone).to eq("us-east-1b")
         expect(reserved_instance.instance_type).to eq("t2.medium")
         expect(reserved_instance.count).to eq(4)
       end
+
+      it "should recognize Windows vs. Linux" do
+        reserved_instances = EC2Instance::get_reserved_instances
+        reserved_instance1 = reserved_instances.first
+        reserved_instance2 = reserved_instances.last
+        expect(reserved_instance1.platform).to eq("Windows VPC")
+        expect(reserved_instance2.platform).to eq("Linux VPC")
+      end
     end
 
     context "for returning pretty string formats" do
-      it "should return a string version of the name of the reserved_rds_instance" do
+      it "should return a string version of the name of the reserved_ec2_instance" do
         state = double('state', name: 'running')
         placement = double('placement', availability_zone: "us-east-1d")
         tag1 = double('tag', key: "cookie", value: "chocolate chip")
@@ -128,11 +144,11 @@ module SportNginAwsAuditor
         name_tag = { key: "Name", value: "our-app-instance-100" }
         stack_tag = { key: "opsworks:stack", value: "our_app_service_2" }
         tags = double('tags', tags: [name_tag, stack_tag])
-        ec2_client = double('rds_client', describe_instances: ec2_instances, describe_tags: tags)
+        ec2_client = double('ec2_client', describe_instances: ec2_instances, describe_tags: tags)
         allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
         instances = EC2Instance::get_instances("tag_name")
         instance = instances.first
-        expect(instance.to_s).to eq("VPC us-east-1d t2.large")
+        expect(instance.to_s).to eq("Linux VPC us-east-1d t2.large")
       end
     end
 
@@ -150,7 +166,7 @@ module SportNginAwsAuditor
         ec2_instance2 = double('ec2_instance', instance_id: "i-alsofake",
                                                instance_type: "t2.small",
                                                vpc_id: "vpc-alsofake",
-                                               platform: nil,
+                                               platform: "Windows",
                                                state: state,
                                                placement: placement,
                                                class: "Aws::EC2::Types::Instance")
@@ -159,7 +175,7 @@ module SportNginAwsAuditor
         name_tag = { key: "Name", value: "our-app-instance-100" }
         stack_tag = { key: "opsworks:stack", value: "our_app_service_2" }
         tags = double('tags', tags: [name_tag, stack_tag])
-        ec2_client = double('rds_client', describe_instances: ec2_instances, describe_tags: tags)
+        ec2_client = double('ec2_client', describe_instances: ec2_instances, describe_tags: tags)
         allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
       end
 
@@ -169,6 +185,12 @@ module SportNginAwsAuditor
         expect(buckets.first.first).to eq("our_app_service_2")
       end
 
+      it "should return a hash where the last element's key is the opsworks:stack name of the instances" do
+        instances = EC2Instance::get_instances
+        buckets = EC2Instance::bucketize
+        expect(buckets.last.first).to eq("our_app_service_2")
+      end
+
       it "should return a hash where each element is a list of ec2_instances" do
         instances = EC2Instance::get_instances
         buckets = EC2Instance::bucketize

data/spec/sport_ngin_aws_auditor/rds_instance_spec.rb

@@ -56,7 +56,7 @@ module SportNginAwsAuditor
         expect(instance.id).to eq("our-service")
         expect(instance.multi_az).to eq("Single-AZ")
         expect(instance.instance_type).to eq("db.t2.small")
-        expect(instance.engine).to eq("mysql")
+        expect(instance.engine).to eq("MySQL")
       end
     end
 
@@ -97,7 +97,7 @@ module SportNginAwsAuditor
         expect(reserved_instance.id).to eq("555te4yy-1234-555c-5678-thisisafake!!")
         expect(reserved_instance.multi_az).to eq("Single-AZ")
         expect(reserved_instance.instance_type).to eq("db.t2.small")
-        expect(reserved_instance.engine).to eq("mysql")
+        expect(reserved_instance.engine).to eq("MySQL")
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sport_ngin_aws_auditor
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-08 00:00:00.000000000 Z
+date: 2016-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk