Merge pull request #25 from CU-CloudCollab/modify-securirty-groups

Modify securirty groups

Author: sbower

lib/cucloud/rds_utils.rb

@@ -24,7 +24,7 @@ def get_instance(db_instance_identifier)
     def does_db_exist?(db_instance_identifier)
       get_instance(db_instance_identifier).instance_create_time
       true
-    rescue Aws::RDS::Errors::DBInstanceNotFound
+    rescue
       false
     end
 
@@ -46,6 +46,32 @@ def delete_db_instance(db_instance_identifier, db_snapshot_identifier = nil)
       end
     end
 
+    # Modify the security groups for a RDS instance
+    # @param db_instance_identifier [String] RDS instance identifier
+    # @param vpc_security_group_ids [Array] Array of security groups to apply
+    # @return [Hash] Hash represnting the return from AWS
+    def modify_security_group(db_instance_identifier, vpc_security_groups)
+      modify_db_instance(db_instance_identifier: db_instance_identifier, vpc_security_group_ids: vpc_security_groups)
+    end
+
+    # 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
+    # @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
+    # @return [Hash] Hash represnting the return from AWS
+    def modify_db_instance(options)
+      options[:apply_immediately] = options[:apply_immediately].nil? ? true : options[:apply_immediately]
+      options[:copy_tags_to_snapshot] = options[:copy_tags_to_snapshot].nil? ? true : options[:copy_tags_to_snapshot]
+
+      @rds.modify_db_instance(options)
+    end
+
     # Restore DB from a snapshot
     # @param db_instance_identifier [String] RDS instance identifier
     # @param db_snapshot_identifier [String] Name for final snapshot, default is nil
@@ -57,6 +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)
     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.2'
+  VERSION = '0.7.3'
 end

spec/rds_utils_spec.rb

@@ -51,7 +51,29 @@
     expect(Cucloud::RdsUtils.new(rds_client)).to be_a_kind_of(Cucloud::RdsUtils)
   end
 
-  context 'while describe_db_instances is returns an instand not found error' do
+  context 'while modify_db_instance is stubbed out' do
+    before do
+      rds_client.stub_responses(
+        :modify_db_instance,
+        db_instance: {
+          db_instance_identifier: 'testDb'
+        }
+      )
+    end
+    describe '#modify_security_group' do
+      it 'shoud not rais an error' do
+        expect { rds_utils.modify_security_group('testDb', ['sg-084646']) }.not_to raise_error
+      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
+    end
+  end
+
+  context 'while describe_db_instances returns an instand not found error' do
     before do
       rds_client.stub_responses(
         :describe_db_instances,