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

encrypted storage on rds

Browse source
This commit is contained in:
Eugene Howe 2015-07-10 11:56:16 -04:00
parent b932a1cc48
commit 60ace7f28f
3 changed files with 19 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
lib/fog/aws/models/rds/server.rb
View file

@ -116,27 +116,28 @@ module Fog
options = { options = {
'AllocatedStorage' => allocated_storage, 'AllocatedStorage' => allocated_storage,
'AutoMinorVersionUpgrade' => auto_minor_version_upgrade, 'AutoMinorVersionUpgrade' => auto_minor_version_upgrade,
'AvailabilityZone' => availability_zone,
'BackupRetentionPeriod' => backup_retention_period, 'BackupRetentionPeriod' => backup_retention_period,
'DBInstanceClass' => flavor_id,
'DBInstanceIdentifier' => id,
'DBName' => db_name, 'DBName' => db_name,
'DBParameterGroupName' => parameter_group_name || attributes['DBParameterGroupName'], 'DBParameterGroupName' => parameter_group_name || attributes['DBParameterGroupName'],
'DBSecurityGroups' => security_group_names, 'DBSecurityGroups' => security_group_names,
'DBInstanceIdentifier' => id, 'DBSubnetGroupName' => db_subnet_group_name,
'AvailabilityZone' => availability_zone,
'DBInstanceClass' => flavor_id,
'Port' => port || attributes['Port'],
'Engine' => engine, 'Engine' => engine,
'EngineVersion' => engine_version, 'EngineVersion' => engine_version,
'StorageEncrypted' => storage_encrypted,
'Iops' => iops, 'Iops' => iops,
'MasterUsername' => master_username,
'MasterUserPassword' => password || attributes['MasterUserPassword'],
'PreferredMaintenanceWindow' => preferred_maintenance_window,
'PreferredBackupWindow' => preferred_backup_window,
'MultiAZ' => multi_az,
'LicenseModel' => license_model, 'LicenseModel' => license_model,
'DBSubnetGroupName' => db_subnet_group_name, 'MasterUserPassword' => password || attributes['MasterUserPassword'],
'MasterUsername' => master_username,
'MultiAZ' => multi_az,
'Port' => port || attributes['Port'],
'PreferredBackupWindow' => preferred_backup_window,
'PreferredMaintenanceWindow' => preferred_maintenance_window,
'PubliclyAccessible' => publicly_accessible, 'PubliclyAccessible' => publicly_accessible,
'VpcSecurityGroups' => vpc_security_groups,
'StorageType' => storage_type, 'StorageType' => storage_type,
'VpcSecurityGroups' => vpc_security_groups,
} }
options.delete_if {|key, value| value.nil?} options.delete_if {|key, value| value.nil?}

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

@ -104,7 +104,7 @@ module Fog
"PreferredMaintenanceWindow" => options["PreferredMaintenanceWindow"] || "mon:04:30-mon:05:00", "PreferredMaintenanceWindow" => options["PreferredMaintenanceWindow"] || "mon:04:30-mon:05:00",
"PubliclyAccessible" => !!options["PubliclyAccessible"], "PubliclyAccessible" => !!options["PubliclyAccessible"],
"ReadReplicaDBInstanceIdentifiers" => [], "ReadReplicaDBInstanceIdentifiers" => [],
"StorageEncrypted" => false, "StorageEncrypted" => options["StorageEncrypted"] || false,
"StorageType" => options["StorageType"] || "standard", "StorageType" => options["StorageType"] || "standard",
"VpcSecurityGroups" => options["VpcSecurityGroups"], "VpcSecurityGroups" => options["VpcSecurityGroups"],
} }

6
tests/models/rds/server_tests.rb
View file

@ -2,8 +2,14 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
model_tests(Fog::AWS[:rds].servers, rds_default_server_params) do model_tests(Fog::AWS[:rds].servers, rds_default_server_params) do
# We'll need this later; create it early to avoid waiting # We'll need this later; create it early to avoid waiting
@instance_with_final_snapshot = Fog::AWS[:rds].servers.create(rds_default_server_params.merge(:id => uniq_id("fog-snapshot-test"), :backup_retention_period => 1)) @instance_with_final_snapshot = Fog::AWS[:rds].servers.create(rds_default_server_params.merge(:id => uniq_id("fog-snapshot-test"), :backup_retention_period => 1))
@instance_with_encrypted_storage = Fog::AWS[:rds].servers.create(rds_default_server_params.merge(:storage_encrypted => true))
@instance.wait_for(20*60) { ready? } @instance.wait_for(20*60) { ready? }
@instance_with_encrypted_storage.wait_for(20*60) { ready? }
tests("#storage_encrypted") do
returns(true) { @instance_with_encrypted_storage.storage_encrypted }
end
test('#read_replica_identifiers is []') do test('#read_replica_identifiers is []') do
returns([]) { @instance.read_replica_identifiers } returns([]) { @instance.read_replica_identifiers }