sport_ngin_aws_auditor 3.11.3 → 4.0.0

data/spec/sport_ngin_aws_auditor/audit_data_spec.rb

@@ -28,75 +28,94 @@ module SportNginAwsAuditor
 
     context '#initialization' do
       it 'should gather instance data' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => true, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.selected_audit_type).to eq("instances")
       end
 
       it 'should gather reserved instance data' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => true, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.selected_audit_type).to eq("reserved")
       end
 
       it 'should by default gather instance data' do
-        audit_results = AuditData.new(true, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => true, :reserved => true, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.selected_audit_type).to eq("instances")
       end
 
       it 'should gather all data to compare' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.selected_audit_type).to eq("all")
       end
 
       it 'should use EC2Instance class' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.klass).to eq(SportNginAwsAuditor::EC2Instance)
       end
 
       it 'should use EC2Instance class' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.tag_name).to eq("no-reserved-instance")
       end
+
+      it 'should use EC2Instance class' do
+        info = {:instances => false, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
+        expect(audit_results.region).to eq("us-east")
+      end
     end
 
     context '#instances?' do
       it 'should return true' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => true, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.instances?).to eq(true)
       end
 
       it 'should return true' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => true, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.instances?).to eq(false)
       end
     end
 
     context '#reserved?' do
       it 'should return true' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => true, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.reserved?).to eq(false)
       end
 
       it 'should return true' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => true, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.reserved?).to eq(true)
       end
     end
 
     context '#all?' do
       it 'should return true' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => true, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.all?).to eq(false)
       end
 
       it 'should return true' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         expect(audit_results.all?).to eq(true)
       end
     end
 
     context '#gather_data' do
       it 'should gather some empty results by comparison' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         audit_results.gather_data
         expect(audit_results.data).to eq([@instance, @instance])
         expect(audit_results.retired_tags).to eq([])
@@ -104,7 +123,8 @@ module SportNginAwsAuditor
       end
 
       it 'should gather some empty results from just instances' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => true, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         audit_results.gather_data
         expect(audit_results.data).to eq([@instance, @instance])
         expect(audit_results.retired_tags).to eq([])
@@ -112,7 +132,8 @@ module SportNginAwsAuditor
       end
 
       it 'should gather some empty results from just reserved' do
-        audit_results = AuditData.new(false, true, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => true, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         audit_results.gather_data
         expect(audit_results.data).to eq([@instance, @instance])
         expect(audit_results.retired_tags).to eq(nil)
@@ -122,7 +143,8 @@ module SportNginAwsAuditor
 
     context '#gather_instances_data' do
       it 'should gather some instances data but not convert' do
-        audit_results = AuditData.new(true, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => true, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         result1, result2 = audit_results.gather_instances_data
         expect(result1).to eq({'instance1' => 1, 'instance2' => 1})
         expect(result2).to eq([])
@@ -131,20 +153,13 @@ module SportNginAwsAuditor
 
     context '#gather_all_data' do
       it 'should gather some comparison data but not convert' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
+        info = {:instances => false, :reserved => false, :class => "EC2Instance", :tag_name => "no-reserved-instance", :regexes => @ignore_instances_regexes, :region => 'us-east-1'}
+        audit_results = AuditData.new(info)
         result1, result2, result3 = audit_results.gather_all_data
         expect(result1).to eq({'instance1' => 1, 'instance2' => 1})
         expect(result2).to eq([])
         expect(result3).to eq(@retired_ris)
       end
     end
-
-    context '#gather_region' do
-      it 'should gather the region from an instance' do
-        audit_results = AuditData.new(false, false, "EC2Instance", "no-reserved-instance", @ignore_instances_regexes)
-        audit_results.gather_region(@ec2_instances)
-        expect(audit_results.region).to eq('us-east')
-      end
-    end
   end
 end

data/spec/sport_ngin_aws_auditor/aws_spec.rb

@@ -11,14 +11,14 @@ module SportNginAwsAuditor
 
       it "should receive new Aws::SharedCredentials" do
         expect(Aws::SharedCredentials).to receive(:new).with(profile_name: 'staging')
-        AWSSDK::authenticate('staging')
+        AWSSDK::authenticate_with_iam('staging')
       end
 
       it "should update configs" do
         coffee_types = {:coffee => "cappuccino", :beans => "arabica"}
         allow(Aws::SharedCredentials).to receive(:new).and_return(coffee_types)
         expect(Aws.config).to receive(:update).with({region: 'us-east-1', credentials: coffee_types})
-        AWSSDK::authenticate('staging')
+        AWSSDK::authenticate_with_iam('staging')
       end
     end
 
@@ -41,14 +41,36 @@ module SportNginAwsAuditor
 
         expect(Aws::Credentials).to receive(:new).and_return(cred_double).at_least(:once)
         expect(Aws::SharedCredentials).to receive(:new).and_return(shared_creds)
-        AWSSDK::authenticate('staging')
+        AWSSDK::authenticate_with_iam('staging')
       end
     end
 
     context 'without mfa with roles' do
       it "should update configs" do
         expect(Aws.config).to receive(:update).with({region: 'us-east-1'})
-        AWSSDK::authenticate_with_roles('staging')
+        AWSSDK::update_aws_config({region: 'us-east-1'})
+      end
+    end
+
+    context 'without mfa with multiple accounts' do
+      before :each do
+        cred_double = double('cred_hash', access_key_id: 'access_key_id',
+                                          secret_access_key: 'secret_access_key',
+                                          session_token: 'session_token')
+        new_creds = double('new_creds', credentials: cred_double)
+        @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)
+      end
+
+      it "should update config" do
+        expect(Aws.config).to receive(:update)
+        AWSSDK::authenticate_with_assumed_roles('staging', '999999999999', 'CrossAccountAuditorAccess', @sts)
+      end
+
+      it "should call for some credentials" do
+        expect(Aws::AssumeRoleCredentials).to receive(:new)
+        AWSSDK::authenticate_with_assumed_roles('staging', '999999999999', 'CrossAccountAuditorAccess', @sts)
       end
     end
   end

data/spec/sport_ngin_aws_auditor/cache_instance_spec.rb

@@ -7,6 +7,7 @@ module SportNginAwsAuditor
       identity = double('identity', account: 123456789)
       client = double('client', get_caller_identity: identity)
       allow(Aws::STS::Client).to receive(:new).and_return(client)
+      # @client = Aws::ElastiCache::Client.new(region: 'us-east-1')
     end
 
     after :each do
@@ -34,24 +35,23 @@ module SportNginAwsAuditor
         tag1 = double('tag', key: "cookie", value: "chocolate chip")
         tag2 = double('tag', key: "ice cream", value: "oreo")
         tags = double('tags', tag_list: [tag1, tag2])
-        cache_client = double('cache_client', describe_cache_clusters: cache_clusters, list_tags_for_resource: tags)
-        allow(CacheInstance).to receive(:cache).and_return(cache_client)
+        @cache_client = double('cache_client', describe_cache_clusters: cache_clusters, list_tags_for_resource: tags)
       end
 
       it "should make a cache_instance for each instance" do
-        instances = CacheInstance.get_instances("tag_name")
+        instances = CacheInstance.get_instances(@cache_client, "tag_name")
         expect(instances.first).to be_an_instance_of(CacheInstance)
         expect(instances.last).to be_an_instance_of(CacheInstance)
       end
 
       it "should return an array of cache_instances" do
-        instances = CacheInstance.get_instances("tag_name")
+        instances = CacheInstance.get_instances(@cache_client, "tag_name")
         expect(instances).not_to be_empty
         expect(instances.length).to eq(2)
       end
 
       it "should have proper variables set" do
-        instances = CacheInstance.get_instances("tag_name")
+        instances = CacheInstance.get_instances(@cache_client, "tag_name")
         instance = instances.first
         expect(instance.id).to eq("job-queue-cluster")
         expect(instance.name).to eq("job-queue-cluster")
@@ -75,24 +75,23 @@ module SportNginAwsAuditor
                                                                      cache_node_count: 1,
                                                                      class: "Aws::ElastiCache::Types::ReservedCacheNode")
         reserved_cache_nodes = double('cache_cluster', reserved_cache_nodes: [reserved_cache_instance1, reserved_cache_instance2])
-        cache_client = double('cache_client', describe_reserved_cache_nodes: reserved_cache_nodes)
-        allow(CacheInstance).to receive(:cache).and_return(cache_client)
+        @cache_client = double('cache_client', describe_reserved_cache_nodes: reserved_cache_nodes)
       end
 
       it "should make a reserved_cache_instance for each instance" do
-        reserved_instances = CacheInstance.get_reserved_instances
+        reserved_instances = CacheInstance.get_reserved_instances(@cache_client)
         expect(reserved_instances.first).to be_an_instance_of(CacheInstance)
         expect(reserved_instances.last).to be_an_instance_of(CacheInstance)
       end
 
       it "should return an array of reserved_cache_instances" do
-        reserved_instances = CacheInstance.get_reserved_instances
+        reserved_instances = CacheInstance.get_reserved_instances(@cache_client)
         expect(reserved_instances).not_to be_empty
         expect(reserved_instances.length).to eq(2)
       end
 
       it "should have proper variables set" do
-        reserved_instances = CacheInstance.get_reserved_instances
+        reserved_instances = CacheInstance.get_reserved_instances(@cache_client)
         reserved_instance = reserved_instances.first
         expect(reserved_instance.id).to eq("job-queue-cluster")
         expect(reserved_instance.name).to eq("job-queue-cluster")
@@ -121,24 +120,23 @@ module SportNginAwsAuditor
                                                                                duration: 31536000)
           reserved_cache_nodes = double('cache_cluster', reserved_cache_nodes: [retired_reserved_cache_instance1,
                                                                                 retired_reserved_cache_instance2])
-          cache_client = double('cache_client', describe_reserved_cache_nodes: reserved_cache_nodes)
-          allow(CacheInstance).to receive(:cache).and_return(cache_client)
+          @cache_client = double('cache_client', describe_reserved_cache_nodes: reserved_cache_nodes)
         end
 
         it "should make a retired_reserved_cache_instance for each instance" do
-          retired_reserved_instances = CacheInstance.get_retired_reserved_instances
+          retired_reserved_instances = CacheInstance.get_retired_reserved_instances(@cache_client)
           expect(retired_reserved_instances.first).to be_an_instance_of(CacheInstance)
           expect(retired_reserved_instances.last).to be_an_instance_of(CacheInstance)
         end
 
         it "should return an array of retired_reserved_cache_instances" do
-          retired_reserved_instances = CacheInstance.get_retired_reserved_instances
+          retired_reserved_instances = CacheInstance.get_retired_reserved_instances(@cache_client)
           expect(retired_reserved_instances).not_to be_empty
           expect(retired_reserved_instances.length).to eq(2)
         end
 
         it "should have proper variables set" do
-          retired_reserved_instances = CacheInstance.get_retired_reserved_instances
+          retired_reserved_instances = CacheInstance.get_retired_reserved_instances(@cache_client)
           retired_reserved_instance = retired_reserved_instances.first
           expect(retired_reserved_instance.id).to eq("job-queue-cluster")
           expect(retired_reserved_instance.name).to eq("job-queue-cluster")
@@ -162,9 +160,8 @@ module SportNginAwsAuditor
         tag1 = double('tag', key: "cookie", value: "chocolate chip")
         tag2 = double('tag', key: "ice cream", value: "oreo")
         tags = double('tags', tag_list: [tag1, tag2])
-        cache_client = double('cache_client', describe_cache_clusters: cache_clusters, list_tags_for_resource: tags)
-        allow(CacheInstance).to receive(:cache).and_return(cache_client)
-        instances = CacheInstance.get_instances("tag_name")
+        @cache_client = double('cache_client', describe_cache_clusters: cache_clusters, list_tags_for_resource: tags)
+        instances = CacheInstance.get_instances(@cache_client, "tag_name")
         instance = instances.first
         expect(instance.to_s).to eq("Redis cache.t2.small")
       end

data/spec/sport_ngin_aws_auditor/ec2_instance_spec.rb

@@ -38,24 +38,23 @@ 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('ec2_client', describe_instances: ec2_instances, describe_tags: client_tags)
-        allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
+        @ec2_client = double('@ec2_client', describe_instances: ec2_instances, describe_tags: client_tags)
       end
 
       it "should make an ec2_instance for each instance" do
-        instances = EC2Instance.get_instances("tag_name")
+        instances = EC2Instance.get_instances(@ec2_client, "tag_name")
         expect(instances.first).to be_an_instance_of(EC2Instance)
         expect(instances.last).to be_an_instance_of(EC2Instance)
       end
 
       it "should return an array of ec2_instances" do
-        instances = EC2Instance.get_instances("tag_name")
+        instances = EC2Instance.get_instances(@ec2_client, "tag_name")
         expect(instances).not_to be_empty
         expect(instances.length).to eq(2)
       end
 
       it "should have proper variables set" do
-        instances = EC2Instance.get_instances("tag_name")
+        instances = EC2Instance.get_instances(@ec2_client, "tag_name")
         instance = instances.first
         expect(instance.stack_name).to eq("our_app_service_2")
         expect(instance.name).to eq("our-app-instance-100")
@@ -66,7 +65,7 @@ module SportNginAwsAuditor
       end
 
       it "should recognize Windows vs. Linux" do
-        instances = EC2Instance.get_instances("tag_name")
+        instances = EC2Instance.get_instances(@ec2_client, "tag_name")
         instance1 = instances.first
         instance2 = instances.last
         expect(instance1.platform).to eq("Linux VPC")
@@ -93,24 +92,23 @@ module SportNginAwsAuditor
                                                                  scope: 'Availability Zone',
                                                                  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)
-        allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
+        @ec2_client = double('@ec2_client', describe_reserved_instances: reserved_ec2_instances)
       end
 
       it "should make a reserved_ec2_instance for each instance" do
-        reserved_instances = EC2Instance.get_reserved_instances
+        reserved_instances = EC2Instance.get_reserved_instances(@ec2_client)
         expect(reserved_instances.first).to be_an_instance_of(EC2Instance)
         expect(reserved_instances.last).to be_an_instance_of(EC2Instance)
       end
 
       it "should return an array of reserved_ec2_instances" do
-        reserved_instances = EC2Instance.get_reserved_instances
+        reserved_instances = EC2Instance.get_reserved_instances(@ec2_client)
         expect(reserved_instances).not_to be_empty
         expect(reserved_instances.length).to eq(2)
       end
 
       it "should have proper variables set" do
-        reserved_instances = EC2Instance.get_reserved_instances
+        reserved_instances = EC2Instance.get_reserved_instances(@ec2_client)
         reserved_instance = reserved_instances.first
         expect(reserved_instance.id).to eq("12345-dfas-1234-asdf-thisisfake!!")
         expect(reserved_instance.platform).to eq("Windows VPC")
@@ -120,7 +118,7 @@ module SportNginAwsAuditor
       end
 
       it "should recognize Windows vs. Linux" do
-        reserved_instances = EC2Instance.get_reserved_instances
+        reserved_instances = EC2Instance.get_reserved_instances(@ec2_client)
         reserved_instance1 = reserved_instances.first
         reserved_instance2 = reserved_instances.last
         expect(reserved_instance1.platform).to eq("Windows VPC")
@@ -159,24 +157,23 @@ module SportNginAwsAuditor
           reserved_ec2_instances = double('reserved_ec2_instances', reserved_instances: [retired_reserved_ec2_instance1,
                                                                                          retired_reserved_ec2_instance2,
                                                                                          reserved_ec2_instance1])
-          ec2_client = double('ec2_client', describe_reserved_instances: reserved_ec2_instances)
-          allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
+          @ec2_client = double('@ec2_client', describe_reserved_instances: reserved_ec2_instances)
         end
 
         it "should make a retired_reserved_ec2_instance for each instance" do
-          retired_reserved_instances = EC2Instance.get_retired_reserved_instances
+          retired_reserved_instances = EC2Instance.get_retired_reserved_instances(@ec2_client)
           expect(retired_reserved_instances.first).to be_an_instance_of(EC2Instance)
           expect(retired_reserved_instances.last).to be_an_instance_of(EC2Instance)
         end
 
         it "should return an array of retired_reserved_ec2_instances" do
-          retired_reserved_instances = EC2Instance.get_retired_reserved_instances
+          retired_reserved_instances = EC2Instance.get_retired_reserved_instances(@ec2_client)
           expect(retired_reserved_instances).not_to be_empty
           expect(retired_reserved_instances.length).to eq(2)
         end
 
         it "should have proper variables set" do
-          retired_reserved_instances = EC2Instance.get_retired_reserved_instances
+          retired_reserved_instances = EC2Instance.get_retired_reserved_instances(@ec2_client)
           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")
@@ -187,7 +184,7 @@ module SportNginAwsAuditor
         end
 
         it "should recognize Windows vs. Linux" do
-          retired_reserved_instances = EC2Instance.get_retired_reserved_instances
+          retired_reserved_instances = EC2Instance.get_retired_reserved_instances(@ec2_client)
           retired_reserved_instance1 = retired_reserved_instances.first
           retired_reserved_instance2 = retired_reserved_instances.last
           expect(retired_reserved_instance1.platform).to eq("Windows VPC")
@@ -217,9 +214,8 @@ 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('ec2_client', describe_instances: ec2_instances, describe_tags: tags)
-        allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
-        instances = EC2Instance.get_instances("tag_name")
+        @ec2_client = double('@ec2_client', describe_instances: ec2_instances, describe_tags: tags)
+        instances = EC2Instance.get_instances(@ec2_client, "tag_name")
         instance = instances.first
         expect(instance.to_s).to eq("Linux VPC us-east-1d t2.large")
       end
@@ -250,25 +246,24 @@ 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('ec2_client', describe_instances: ec2_instances, describe_tags: tags)
-        allow(EC2Instance).to receive(:ec2).and_return(ec2_client)
+        @ec2_client = double('@ec2_client', describe_instances: ec2_instances, describe_tags: tags)
       end
 
       it "should return a hash where the first element's key is the opsworks:stack name of the instances" do
-        instances = EC2Instance.get_instances
-        buckets = EC2Instance.bucketize
+        instances = EC2Instance.get_instances(@ec2_client)
+        buckets = EC2Instance.bucketize(@ec2_client)
         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
+        instances = EC2Instance.get_instances(@ec2_client)
+        buckets = EC2Instance.bucketize(@ec2_client)
         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
+        instances = EC2Instance.get_instances(@ec2_client)
+        buckets = EC2Instance.bucketize(@ec2_client)
         expect(buckets).not_to be_empty
         expect(buckets.length).to eq(1)
         expect(buckets.first.length).to eq(2)

data/spec/sport_ngin_aws_auditor/rds_instance_spec.rb

@@ -36,24 +36,23 @@ module SportNginAwsAuditor
         tag1 = double('tag', key: "cookie", value: "chocolate chip")
         tag2 = double('tag', key: "ice cream", value: "oreo")
         tags = double('tags', tag_list: [tag1, tag2])
-        rds_client = double('rds_client', describe_db_instances: db_instances, list_tags_for_resource: tags)
-        allow(RDSInstance).to receive(:rds).and_return(rds_client)
+        @rds_client = double('@rds_client', describe_db_instances: db_instances, list_tags_for_resource: tags)
       end
 
       it "should make a rds_instance for each instance" do
-        instances = RDSInstance.get_instances("tag_name")
+        instances = RDSInstance.get_instances(@rds_client, "tag_name")
         expect(instances.first).to be_an_instance_of(RDSInstance)
         expect(instances.last).to be_an_instance_of(RDSInstance)
       end
 
       it "should return an array of rds_instances" do
-        instances = RDSInstance.get_instances("tag_name")
+        instances = RDSInstance.get_instances(@rds_client, "tag_name")
         expect(instances).not_to be_empty
         expect(instances.length).to eq(2)
       end
 
       it "should have proper variables set" do
-        instances = RDSInstance.get_instances("tag_name")
+        instances = RDSInstance.get_instances(@rds_client, "tag_name")
         instance = instances.first
         expect(instance.id).to eq("our-service")
         expect(instance.multi_az).to eq("Single-AZ")
@@ -79,24 +78,23 @@ module SportNginAwsAuditor
                                                                  db_instance_count: 2,
                                                                  class: "Aws::RDS::Types::ReservedDBInstance")
         reserved_db_instances = double('db_instances', reserved_db_instances: [reserved_rds_instance1, reserved_rds_instance2])
-        rds_client = double('rds_client', describe_reserved_db_instances: reserved_db_instances)
-        allow(RDSInstance).to receive(:rds).and_return(rds_client)
+        @rds_client = double('@rds_client', describe_reserved_db_instances: reserved_db_instances)
       end
 
       it "should make a reserved_rds_instance for each instance" do
-        reserved_instances = RDSInstance.get_reserved_instances
+        reserved_instances = RDSInstance.get_reserved_instances(@rds_client)
         expect(reserved_instances.first).to be_an_instance_of(RDSInstance)
         expect(reserved_instances.last).to be_an_instance_of(RDSInstance)
       end
 
       it "should return an array of reserved_rds_instances" do
-        reserved_instances = RDSInstance.get_reserved_instances
+        reserved_instances = RDSInstance.get_reserved_instances(@rds_client)
         expect(reserved_instances).not_to be_empty
         expect(reserved_instances.length).to eq(2)
       end
 
       it "should have proper variables set" do
-        reserved_instances = RDSInstance.get_reserved_instances
+        reserved_instances = RDSInstance.get_reserved_instances(@rds_client)
         reserved_instance = reserved_instances.first
         expect(reserved_instance.id).to eq("555te4yy-1234-555c-5678-thisisafake!!")
         expect(reserved_instance.multi_az).to eq("Single-AZ")
@@ -127,24 +125,23 @@ module SportNginAwsAuditor
                                                                            duration: 31536000)
         reserved_db_instances = double('db_instances', reserved_db_instances: [retired_reserved_rds_instance1,
                                                                                retired_reserved_rds_instance2])
-        rds_client = double('rds_client', describe_reserved_db_instances: reserved_db_instances)
-        allow(RDSInstance).to receive(:rds).and_return(rds_client)
+        @rds_client = double('@rds_client', describe_reserved_db_instances: reserved_db_instances)
         end
 
         it "should make a retired_reserved_rds_instance for each instance" do
-          retired_reserved_instances = RDSInstance.get_retired_reserved_instances
+          retired_reserved_instances = RDSInstance.get_retired_reserved_instances(@rds_client)
           expect(retired_reserved_instances.first).to be_an_instance_of(RDSInstance)
           expect(retired_reserved_instances.last).to be_an_instance_of(RDSInstance)
         end
 
         it "should return an array of retired_reserved_rds_instances" do
-          retired_reserved_instances = RDSInstance.get_retired_reserved_instances
+          retired_reserved_instances = RDSInstance.get_retired_reserved_instances(@rds_client)
           expect(retired_reserved_instances).not_to be_empty
           expect(retired_reserved_instances.length).to eq(2)
         end
 
         it "should have proper variables set" do
-          retired_reserved_instances = RDSInstance.get_retired_reserved_instances
+          retired_reserved_instances = RDSInstance.get_retired_reserved_instances(@rds_client)
           retired_reserved_instance = retired_reserved_instances.first
           expect(retired_reserved_instance.id).to eq("555te4yy-1234-555c-5678-thisisafake!!")
           expect(retired_reserved_instance.multi_az).to eq("Single-AZ")
@@ -165,9 +162,8 @@ module SportNginAwsAuditor
                                                                 db_instance_count: 3,
                                                                 class: "Aws::RDS::Types::ReservedDBInstance")
         reserved_db_instances = double('db_instances', reserved_db_instances: [reserved_rds_instance])
-        rds_client = double('rds_client', describe_reserved_db_instances: reserved_db_instances)
-        allow(RDSInstance).to receive(:rds).and_return(rds_client)
-        reserved_instances = RDSInstance.get_reserved_instances
+        @rds_client = double('@rds_client', describe_reserved_db_instances: reserved_db_instances)
+        reserved_instances = RDSInstance.get_reserved_instances(@rds_client)
         reserved_instance = reserved_instances.first
         expect(reserved_instance.to_s).to eq("MySQL Single-AZ db.t2.small")
       end
@@ -185,9 +181,8 @@ module SportNginAwsAuditor
         tag1 = double('tag', key: "cookie", value: "chocolate chip")
         tag2 = double('tag', key: "ice cream", value: "oreo")
         tags = double('tags', tag_list: [tag1, tag2])
-        rds_client = double('rds_client', describe_db_instances: db_instances, list_tags_for_resource: tags)
-        allow(RDSInstance).to receive(:rds).and_return(rds_client)
-        instances = RDSInstance.get_instances("tag_name")
+        @rds_client = double('@rds_client', describe_db_instances: db_instances, list_tags_for_resource: tags)
+        instances = RDSInstance.get_instances(@rds_client, "tag_name")
         instance = instances.first
         expect(instance.to_s).to eq("PostgreSQL Single-AZ db.t2.small")
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sport_ngin_aws_auditor
 version: !ruby/object:Gem::Version
-  version: 3.11.3
+  version: 4.0.0
 platform: ruby
 authors:
 - Elliot Hursh
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-19 00:00:00.000000000 Z
+date: 2017-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk