Merge pull request #26 from CU-CloudCollab/review-changes

changes to test per review with brett, fixed bug in restore waiter

Author: sbower

lib/cucloud/rds_utils.rb

@@ -56,14 +56,14 @@ def modify_security_group(db_instance_identifier, vpc_security_groups)
 
     # Modify the options group for a RDS instance
     # @param db_instance_identifier [String] RDS instance identifier
-    # @param option_group_name [Sting] Name od the options group to apply
+    # @param option_group_name [Sting] Name of the options group to apply
     # @return [Hash] Hash represnting the return from AWS
     def modify_option_group(db_instance_identifier, option_group_name)
       modify_db_instance(db_instance_identifier: db_instance_identifier, option_group_name: option_group_name)
     end
 
     # Base function to modify DB, resets defualts for apply_immediately and copy_tags_to_snapshot
-    # @param options [hash] Hash represnting the configuration for the RDS restore
+    # @param options [hash] Hash represnting the configuration for the RDS modify
     # @return [Hash] Hash represnting the return from AWS
     def modify_db_instance(options)
       options[:apply_immediately] = options[:apply_immediately].nil? ? true : options[:apply_immediately]
@@ -83,7 +83,7 @@ def restore_db(db_instance_identifier, restore_from, options = {})
       options[:db_instance_identifier] = db_instance_identifier
       options[:db_snapshot_identifier] = db_snapshot_identifier
       @rds.restore_db_instance_from_db_snapshot(options)
-      @rds.wait_until(:db_instance_deleted, db_instance_identifier: db_instance_identifier)
+      @rds.wait_until(:db_instance_available, db_instance_identifier: db_instance_identifier)
     end
 
     # Delete a givne db instance

lib/cucloud/version.rb

@@ -1,5 +1,5 @@
 module Cucloud
   # Disable mutable constant warning - freezing this oddly breaks bundler
   # rubocop:disable Style/MutableConstant
-  VERSION = '0.7.3'
+  VERSION = '0.7.4'
 end

spec/rds_utils_spec.rb

@@ -64,26 +64,57 @@
       it 'shoud not rais an error' do
         expect { rds_utils.modify_security_group('testDb', ['sg-084646']) }.not_to raise_error
       end
+
+      it 'should get the correct default parameters' do
+        expect(rds_client).to receive(:modify_db_instance).with(db_instance_identifier: 'testDb',
+                                                                vpc_security_group_ids: ['sg-084646'],
+                                                                apply_immediately: true,
+                                                                copy_tags_to_snapshot: true)
+        rds_utils.modify_security_group('testDb', ['sg-084646'])
+      end
     end
 
     describe '#modify_option_group' do
       it 'shoud not rais an error' do
         expect { rds_utils.modify_option_group('testDb', 'options-group') }.not_to raise_error
       end
+
+      it 'should get the correct default parameters' do
+        expect(rds_client).to receive(:modify_db_instance).with(db_instance_identifier: 'testDb',
+                                                                option_group_name: 'options-group',
+                                                                apply_immediately: true,
+                                                                copy_tags_to_snapshot: true)
+        rds_utils.modify_option_group('testDb', 'options-group')
+      end
+    end
+
+    describe '#modify_db_instance' do
+      it 'should allow your to override default values' do
+        expect(rds_client).to receive(:modify_db_instance).with(db_instance_identifier: 'testDb',
+                                                                option_group_name: 'options-group',
+                                                                apply_immediately: false,
+                                                                copy_tags_to_snapshot: false)
+        rds_utils.modify_db_instance(
+          db_instance_identifier: 'testDb',
+          option_group_name: 'options-group',
+          apply_immediately: false,
+          copy_tags_to_snapshot: false
+        )
+      end
     end
   end
 
   context 'while describe_db_instances returns an instand not found error' do
     before do
       rds_client.stub_responses(
         :describe_db_instances,
-        Aws::RDS::Errors::DBInstanceNotFound.new('test', 'test')
-      )
-      rds_client.stub_responses(
-        :restore_db_instance_from_db_snapshot,
-        db_instance: {
-          db_instance_identifier: 'testDb'
-        }
+        [
+          Aws::RDS::Errors::DBInstanceNotFound.new('test', 'test'),
+          { db_instances: [
+            db_instance_identifier: 'testDb',
+            db_instance_status: 'available'
+          ] }
+        ]
       )
       rds_client.stub_responses(
         :describe_db_snapshots,
@@ -116,7 +147,7 @@
     end
   end
 
-  context 'while describe_db_instances is returns an instand not found error' do
+  context 'while describe_db_instances is mocked out' do
     before do
       rds_client.stub_responses(
         :delete_db_instance,