sport_ngin_aws_auditor 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6e2a11ed64e5f72238b80eb808015489df6a243
-  data.tar.gz: 1b09c49f16a8bf21db028a1be599ed09ff107526
+  metadata.gz: 097d2b8ebf92bd8bebefe7e88ea6488d79027fcc
+  data.tar.gz: 81c8048fa5698dfe4c67701ca0358052d8e2b15a
 SHA512:
-  metadata.gz: b3e794c240a871df8314544b34a2a065409cd83e5bd09f8842e6f5fd6a3a75ad1d9b1ce4f5c4ab5ca0c3bad72cdbcdbd55636b4f52021ff95f6a545ad12fb2ee
-  data.tar.gz: 4d845435e3ede6990360081c22a084545adc66dd76be55234ac1182945b77dca3967b541432da25f3d23601c4ae67d1fdde53aa2c44316f764beda3768037219
+  metadata.gz: e1420329217ae71010ee6c21930928f35b71bbbe76622dbf5a972fe487f3cd0ba764dbc6760598fecca72a22a548c86bd61cf9dd35ffe788dcffc03b3e551728
+  data.tar.gz: c85e78bba0677e337a9c79078dcf378b1895ebcb85875e61f62d12908fc4213c5a44e04041f71fa39af5dbf0efd303ddf09efb4eebef9f513e940bfb412fbd2a

data/CHANGELOG.markdown

@@ -1 +1,9 @@
+#### v4.2.1
+* Only give the name 'VPC' to an instance if the account supports EC2 Classic
+
+  > Emma Sax: Unknown User: https://github.com/sportngin/sport_ngin_aws_auditor/pull/40
+
 #### v4.2.0
+* Thread safe AWS SDK authentication 
+
+  > Brian Bergstrom: https://github.com/sportngin/sport_ngin_aws_auditor/pull/37

data/lib/sport_ngin_aws_auditor/aws.rb

@@ -46,8 +46,9 @@ module SportNginAwsAuditor
       Aws::STS::Client.new(client_options).get_caller_identity.account
     end
 
-    def self.sts_for_instance
-      Aws::STS::Client.new(region: DEFAULT_REGION, credentials: Aws::InstanceProfileCredentials.new)
+    def self.sts
+      creds = Aws::SharedCredentials.new(profile_name: @environment).credentials || Aws::InstanceProfileCredentials.new
+      Aws::STS::Client.new(region: DEFAULT_REGION, credentials: creds)
     end
 
     def self.ec2(region=DEFAULT_REGION)
@@ -87,12 +88,12 @@ module SportNginAwsAuditor
     def self.auth_with_assumed_roles(arn_id, role_name)
       role_arn = "arn:aws:iam::#{arn_id}:role/#{role_name}"
       session_name = "auditor#{Time.now.to_i}"
-      @credentials = Aws::AssumeRoleCredentials.new(client: sts_for_instance, role_arn: role_arn, role_session_name: session_name)
+      @credentials = Aws::AssumeRoleCredentials.new(client: sts, role_arn: role_arn, role_session_name: session_name)
     end
 
     def self.get_session(mfa_token, mfa_serial_number)
       return @session if @session
-      @session = sts_for_instance.get_session_token(duration_seconds: 3600, serial_number: mfa_serial_number, token_code: mfa_token)
+      @session = sts.get_session_token(duration_seconds: 3600, serial_number: mfa_serial_number, token_code: mfa_token)
     end
 
   end

data/lib/sport_ngin_aws_auditor/ec2_instance.rb

@@ -52,7 +52,8 @@ module SportNginAwsAuditor
       private :get_more_info
     end
 
-    attr_accessor :id, :name, :platform, :availability_zone, :scope, :instance_type, :count, :stack_name, :tag_value, :tag_reason, :expiration_date, :count_remaining
+    attr_accessor :id, :name, :platform, :availability_zone, :scope, :instance_type, :count, :stack_name,
+                  :tag_value, :tag_reason, :expiration_date, :count_remaining
     def initialize(ec2_instance, tag_name, count=1)
       if ec2_instance.class.to_s == "Aws::EC2::Types::ReservedInstances"
         self.id = ec2_instance.reserved_instances_id
@@ -60,6 +61,7 @@ module SportNginAwsAuditor
         self.platform = platform_helper(ec2_instance.product_description)
         self.scope = ec2_instance.scope
         self.availability_zone = self.scope == 'Region' ? nil : ec2_instance.availability_zone
+        self.availability_zone << ' ' if self.availability_zone != nil
         self.instance_type = ec2_instance.instance_type
         self.count = count
         self.stack_name = nil
@@ -70,6 +72,7 @@ module SportNginAwsAuditor
         self.platform = platform_helper((ec2_instance.platform || ''), ec2_instance.vpc_id)
         self.scope = nil
         self.availability_zone = ec2_instance.placement.availability_zone
+        self.availability_zone << ' ' if self.availability_zone != nil
         self.instance_type = ec2_instance.instance_type
         self.count = count
         self.stack_name = nil
@@ -88,7 +91,7 @@ module SportNginAwsAuditor
     end
 
     def to_s
-      "#{platform} #{availability_zone} #{instance_type}"
+      "#{platform} #{availability_zone}#{instance_type}"
     end
 
     def no_reserved_instance_tag_value
@@ -104,12 +107,20 @@ module SportNginAwsAuditor
         platform << 'Linux'
       end
 
-      if description.downcase.include?('vpc') || vpc
+      if ec2_classic_support && (description.downcase.include?('vpc') || vpc)
         platform << ' VPC'
       end
 
       return platform
     end
     private :platform_helper
+
+    def ec2_classic_support(client=AWS.ec2)
+      account_attributes = client.describe_account_attributes.account_attributes
+      attribute = account_attributes.select { |aa| aa.attribute_name == 'supported-platforms' }.first
+      attribute_values = attribute.attribute_values
+      attribute_values_array = attribute_values.collect { |v| v.attribute_value }
+      return attribute_values_array.include?('EC2')
+    end
   end
 end

data/lib/sport_ngin_aws_auditor/instance.rb

@@ -54,7 +54,7 @@ module SportNginAwsAuditor
       end
 
       if region_based?
-        # if type = 'Linux VPC  t2.small'...
+        # if type = 'Linux VPC t2.small'...
         my_match = type.match(/(\w*\s*\w*\s{1})\s*(\s*\S*)/)
 
         # then platform = 'Linux VPC '...

data/lib/sport_ngin_aws_auditor/scripts/audit.rb

@@ -104,7 +104,7 @@ module SportNginAwsAuditor
         retired_ris.each do |ri|
           color, rgb, prefix = color_chooser({:instance => ri, :retired_ri => true, :retired_tag => false})
           if ri.availability_zone.nil?
-            # if ri.to_s = 'Linux VPC  t2.small'...
+            # if ri.to_s = 'Linux VPC t2.small'...
             my_match = ri.to_s.match(/(\w*\s*\w*\s{1})\s*(\s*\S*)/)
 
             # then platform = 'Linux VPC '...

data/lib/sport_ngin_aws_auditor/version.rb

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

data/spec/sport_ngin_aws_auditor/aws_spec.rb

@@ -45,7 +45,7 @@ module SportNginAwsAuditor
         allow(Aws::IAM::Client).to receive(:new).and_return(iam_client)
 
         expect(Aws::Credentials).to receive(:new).and_return(cred_double).at_least(:once)
-        expect(Aws::SharedCredentials).to receive(:new).and_return(shared_creds)
+        expect(Aws::SharedCredentials).to receive(:new).and_return(shared_creds).twice
         AWS.auth_with_iam
       end
     end
@@ -65,9 +65,13 @@ module SportNginAwsAuditor
                                           secret_access_key: 'secret_access_key',
                                           session_token: 'session_token')
         new_creds = double('new_creds', credentials: cred_double)
+        shared_credentials = double('shared_credentials', access_key_id: 'access_key_id',
+                                    secret_access_key: 'secret_access_key')
+        shared_creds = double('shared_creds', credentials: shared_credentials)
         @sts = double('sts', get_session_token: new_creds)
         allow(Aws::STS::Client).to receive(:new).and_return(@sts)
         allow(Aws::AssumeRoleCredentials).to receive(:new).and_return(cred_double)
+        expect(Aws::SharedCredentials).to receive(:new).and_return(shared_creds)
       end
 
       it "should set credentials" do

data/spec/sport_ngin_aws_auditor/ec2_instance_spec.rb

@@ -39,6 +39,13 @@ module SportNginAwsAuditor
         stack_tag = { key: "opsworks:stack", value: "our_app_service_2" }
         client_tags = double('tags', tags: [name_tag, stack_tag])
         @ec2_client = double('@ec2_client', describe_instances: ec2_instances, describe_tags: client_tags)
+        ec2_value = double('value', attribute_value: "EC2")
+        vpc_value = double('value', attribute_value: "VPC")
+        arr_of_hashes = [ec2_value, vpc_value]
+        attr_values = double('attr_values', attribute_name: 'supported-platforms', attribute_values: arr_of_hashes)
+        account_attributes = double('account_attributes', account_attributes: [attr_values])
+        allow(@ec2_client).to receive(:describe_account_attributes).and_return(account_attributes)
+        allow(Aws::EC2::Client).to receive(:new).and_return(@ec2_client)
       end
 
       it "should make an ec2_instance for each instance" do
@@ -59,7 +66,7 @@ module SportNginAwsAuditor
         expect(instance.stack_name).to eq("our_app_service_2")
         expect(instance.name).to eq("our-app-instance-100")
         expect(instance.id).to eq("i-thisisfake")
-        expect(instance.availability_zone).to eq("us-east-1d")
+        expect(instance.availability_zone).to eq("us-east-1d  ")
         expect(instance.instance_type).to eq("t2.large")
         expect(instance.platform).to eq("Linux VPC")
       end
@@ -93,6 +100,13 @@ module SportNginAwsAuditor
                                                                  class: "Aws::EC2::Types::ReservedInstances")
         reserved_ec2_instances = double('reserved_ec2_instances', reserved_instances: [reserved_ec2_instance1, reserved_ec2_instance2])
         @ec2_client = double('@ec2_client', describe_reserved_instances: reserved_ec2_instances)
+        ec2_value = double('value', attribute_value: "EC2")
+        vpc_value = double('value', attribute_value: "VPC")
+        arr_of_hashes = [ec2_value, vpc_value]
+        attr_values = double('attr_values', attribute_name: 'supported-platforms', attribute_values: arr_of_hashes)
+        account_attributes = double('account_attributes', account_attributes: [attr_values])
+        allow(@ec2_client).to receive(:describe_account_attributes).and_return(account_attributes)
+        allow(Aws::EC2::Client).to receive(:new).and_return(@ec2_client)
       end
 
       it "should make a reserved_ec2_instance for each instance" do
@@ -112,7 +126,7 @@ module SportNginAwsAuditor
         reserved_instance = reserved_instances.first
         expect(reserved_instance.id).to eq("12345-dfas-1234-asdf-thisisfake!!")
         expect(reserved_instance.platform).to eq("Windows VPC")
-        expect(reserved_instance.availability_zone).to eq("us-east-1b")
+        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
@@ -158,6 +172,13 @@ module SportNginAwsAuditor
                                                                                          retired_reserved_ec2_instance2,
                                                                                          reserved_ec2_instance1])
           @ec2_client = double('@ec2_client', describe_reserved_instances: reserved_ec2_instances)
+          ec2_value = double('value', attribute_value: "EC2")
+          vpc_value = double('value', attribute_value: "VPC")
+          arr_of_hashes = [ec2_value, vpc_value]
+          attr_values = double('attr_values', attribute_name: 'supported-platforms', attribute_values: arr_of_hashes)
+          account_attributes = double('account_attributes', account_attributes: [attr_values])
+          allow(@ec2_client).to receive(:describe_account_attributes).and_return(account_attributes)
+          allow(Aws::EC2::Client).to receive(:new).and_return(@ec2_client)
         end
 
         it "should make a retired_reserved_ec2_instance for each instance" do
@@ -177,7 +198,7 @@ module SportNginAwsAuditor
           retired_reserved_instance = retired_reserved_instances.first
           expect(retired_reserved_instance.id).to eq("12345-dfas-1234-asdf-thisisfake!!")
           expect(retired_reserved_instance.platform).to eq("Windows VPC")
-          expect(retired_reserved_instance.availability_zone).to eq("us-east-1b")
+          expect(retired_reserved_instance.availability_zone).to eq("us-east-1b ")
           expect(retired_reserved_instance.instance_type).to eq("t2.medium")
           expect(retired_reserved_instance.count).to eq(4)
           expect(retired_reserved_instance.expiration_date).to be >= @time - 86500
@@ -215,6 +236,13 @@ module SportNginAwsAuditor
         stack_tag = { key: "opsworks:stack", value: "our_app_service_2" }
         tags = double('tags', tags: [name_tag, stack_tag])
         @ec2_client = double('@ec2_client', describe_instances: ec2_instances, describe_tags: tags)
+        ec2_value = double('value', attribute_value: "EC2")
+        vpc_value = double('value', attribute_value: "VPC")
+        arr_of_hashes = [ec2_value, vpc_value]
+        attr_values = double('attr_values', attribute_name: 'supported-platforms', attribute_values: arr_of_hashes)
+        account_attributes = double('account_attributes', account_attributes: [attr_values])
+        allow(@ec2_client).to receive(:describe_account_attributes).and_return(account_attributes)
+        allow(Aws::EC2::Client).to receive(:new).and_return(@ec2_client)
         instances = EC2Instance.get_instances(@ec2_client, "tag_name")
         instance = instances.first
         expect(instance.to_s).to eq("Linux VPC us-east-1d t2.large")
@@ -247,6 +275,13 @@ module SportNginAwsAuditor
         stack_tag = { key: "opsworks:stack", value: "our_app_service_2" }
         tags = double('tags', tags: [name_tag, stack_tag])
         @ec2_client = double('@ec2_client', describe_instances: ec2_instances, describe_tags: tags)
+        ec2_value = double('value', attribute_value: "EC2")
+        vpc_value = double('value', attribute_value: "VPC")
+        arr_of_hashes = [ec2_value, vpc_value]
+        attr_values = double('attr_values', attribute_name: 'supported-platforms', attribute_values: arr_of_hashes)
+        account_attributes = double('account_attributes', account_attributes: [attr_values])
+        allow(@ec2_client).to receive(:describe_account_attributes).and_return(account_attributes)
+        allow(Aws::EC2::Client).to receive(:new).and_return(@ec2_client)
       end
 
       it "should return a hash where the first element's key is the opsworks:stack name of the instances" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sport_ngin_aws_auditor
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk