kotovalexarian-likes-github/fog--fog-aws
1
0
Fork 0
mirror of https://github.com/fog/fog-aws.git synced 2022-11-09 13:50:52 -05:00
Code Releases Activity

Merge pull request #173 from engineyard/format-security-groups

Browse source 
validate rds server security group associations
This commit is contained in:
Wesley Beary 2015-08-24 14:55:58 -05:00
commit d9651260e1
3 changed files with 53 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/fog/aws/requests/rds/create_db_instance.rb
View file

@ -82,6 +82,33 @@ module Fog
raise Fog::AWS::RDS::InvalidParameterCombination.new('Requesting a specific availability zone is not valid for Multi-AZ instances.')
end
ec2 = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id]
db_security_group_names = Array(options.delete("DBSecurityGroups"))
rds_security_groups = self.data[:security_groups].values
ec2_security_groups = ec2[:security_groups].values
vpc = !ec2[:account_attributes].find { |h| "supported-platforms" == h["attributeName"] }["values"].include?("EC2")
db_security_groups = db_security_group_names.map do |group_name|
unless rds_security_groups.find { |sg| sg["DBSecurityGroupName"] == group_name }
raise Fog::AWS::RDS::Error.new("InvalidParameterValue => Invalid security group , groupId= , groupName=#{group_name}")
end
{"Status" => "active", "DBSecurityGroupName" => group_name }
end
if !vpc && db_security_groups.empty?
db_security_groups << { "Status" => "active", "DBSecurityGroupName" => "default" }
end
vpc_security_groups = Array(options.delete("VpcSecurityGroups")).map do |group_id|
unless ec2_security_groups.find { |sg| sg["groupId"] == group_id }
raise Fog::AWS::RDS::Error.new("InvalidParameterValue => Invalid security group , groupId=#{group_id} , groupName=")
end
{"Status" => "active", "VpcSecurityGroupId" => group_id }
end
data = {
"AllocatedStorage" => options["AllocatedStorage"],
"AutoMinorVersionUpgrade" => options["AutoMinorVersionUpgrade"].nil? ? true : options["AutoMinorVersionUpgrade"],
@ -93,7 +120,7 @@ module Fog
"DBInstanceStatus" =>"creating",
"DBName" => options["DBName"],
"DBParameterGroups" => [{ "DBParameterGroupName" => "default.mysql5.5", "ParameterApplyStatus" => "in-sync" }],
"DBSecurityGroups" => [{ "Status" => "active", "DBSecurityGroupName" => "default" }],
"DBSecurityGroups" => db_security_groups,
"DBSubnetGroupName" => options["DBSubnetGroupName"],
"Endpoint" =>{},
"Engine" => options["Engine"],
@ -110,7 +137,7 @@ module Fog
"ReadReplicaDBInstanceIdentifiers" => [],
"StorageEncrypted" => options["StorageEncrypted"] || false,
"StorageType" => options["StorageType"] || "standard",
"VpcSecurityGroups" => options["VpcSecurityGroups"],
"VpcSecurityGroups" => vpc_security_groups,
}
self.data[:servers][db_name] = data

1
lib/fog/aws/requests/rds/create_db_instance_read_replica.rb
View file

@ -61,6 +61,7 @@ module Fog
'ReadReplicaSourceDBInstanceIdentifier' => source_identifier,
'StorageType' => options['StorageType'] || 'standard',
'StorageEncrypted' => false,
'VpcSecurityGroups' => source['VpcSecurityGroups'],
}
self.data[:servers][instance_identifier] = data
self.data[:servers][source_identifier]['ReadReplicaDBInstanceIdentifiers'] << instance_identifier

30
lib/fog/aws/requests/rds/modify_db_instance.rb
View file

@ -63,21 +63,37 @@ module Fog
# modified_server = server["PendingModifiedValues"].merge!(options) # it appends
#end
db_security_group_names = options.delete("DBSecurityGroups")
if db_security_group_names && db_security_group_names.any?
db_security_groups =
db_security_group_names.inject([]) do |r, security_group_name|
r << {"Status" => "active", "DBSecurityGroupName" => security_group_name }
db_security_group_names = Array(options.delete("DBSecurityGroups"))
rds_security_groups = self.data[:security_groups].values
db_security_groups = db_security_group_names.map do |r, group_name|
unless rds_security_groups.find { |sg| sg["DBSecurityGroupName"] == group_name }
raise Fog::AWS::RDS::Error.new("InvalidParameterValue => Invalid security group , groupId= , groupName=#{group_name}")
end
r << {"Status" => "active", "DBSecurityGroupName" => group_name }
end
ec2_security_groups = Fog::Compute::AWS::Mock.data[@region][@aws_access_key_id][:security_groups].values
vpc_security_groups = Array(options.delete("VpcSecurityGroups")).map do |group_id|
unless ec2_security_groups.find { |sg| sg["groupId"] == group_id }
raise Fog::AWS::RDS::Error.new("InvalidParameterValue => Invalid security group , groupId=#{group_id} , groupName=")
end
options.merge!("DBSecurityGroups" => db_security_groups)
{"Status" => "active", "VpcSecurityGroupId" => group_id }
end
options.merge!(
"DBSecurityGroups" => db_security_groups,
"VpcSecurityGroups" => vpc_security_groups
)
self.data[:servers][db_name]["PendingModifiedValues"].merge!(options) # it appends
self.data[:servers][db_name]["DBInstanceStatus"] = "modifying"
response.status = 200
response.body = {
"ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
"ResponseMetadata" => { "RequestId" => Fog::AWS::Mock.request_id },
"ModifyDBInstanceResult" => { "DBInstance" => self.data[:servers][db_name] }
}
response