Merge pull request #153 from ehowe/encrypted-rds-mock

encrypted storage on rds
fog · Jul 10, 2015 · a9d0d37 · a9d0d37
2 parents b932a1c + 60ace7f
commit a9d0d37
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/lib/fog/aws/models/rds/server.rb b/lib/fog/aws/models/rds/server.rb
@@ -116,27 +116,28 @@ def attributes_to_params
           options = {
             'AllocatedStorage'              => allocated_storage,
             'AutoMinorVersionUpgrade'       => auto_minor_version_upgrade,
+            'AvailabilityZone'              => availability_zone,
             'BackupRetentionPeriod'         => backup_retention_period,
+            'DBInstanceClass'               => flavor_id,
+            'DBInstanceIdentifier'          => id,
             'DBName'                        => db_name,
             'DBParameterGroupName'          => parameter_group_name || attributes['DBParameterGroupName'],
             'DBSecurityGroups'              => security_group_names,
-            'DBInstanceIdentifier'          => id,
-            'AvailabilityZone'              => availability_zone,
-            'DBInstanceClass'               => flavor_id,
-            'Port'                          => port || attributes['Port'],
+            'DBSubnetGroupName'             => db_subnet_group_name,
             'Engine'                        => engine,
             'EngineVersion'                 => engine_version,
+            'StorageEncrypted'              => storage_encrypted,
             'Iops'                          => iops,
-            'MasterUsername'                => master_username,
+            'LicenseModel'                  => license_model,
             'MasterUserPassword'            => password || attributes['MasterUserPassword'],
-            'PreferredMaintenanceWindow'    => preferred_maintenance_window,
-            'PreferredBackupWindow'         => preferred_backup_window,
+            'MasterUsername'                => master_username,
             'MultiAZ'                       => multi_az,
-            'LicenseModel'                  => license_model,
-            'DBSubnetGroupName'             => db_subnet_group_name,
+            'Port'                          => port || attributes['Port'],
+            'PreferredBackupWindow'         => preferred_backup_window,
+            'PreferredMaintenanceWindow'    => preferred_maintenance_window,
             'PubliclyAccessible'            => publicly_accessible,
-            'VpcSecurityGroups'             => vpc_security_groups,
             'StorageType'                   => storage_type,
+            'VpcSecurityGroups'             => vpc_security_groups,
           }
 
           options.delete_if {|key, value| value.nil?}

diff --git a/lib/fog/aws/requests/rds/create_db_instance.rb b/lib/fog/aws/requests/rds/create_db_instance.rb
@@ -104,7 +104,7 @@ def create_db_instance(db_name, options={})
             "PreferredMaintenanceWindow"       => options["PreferredMaintenanceWindow"] || "mon:04:30-mon:05:00",
             "PubliclyAccessible"               => !!options["PubliclyAccessible"],
             "ReadReplicaDBInstanceIdentifiers" => [],
-            "StorageEncrypted"                 => false,
+            "StorageEncrypted"                 => options["StorageEncrypted"] || false,
             "StorageType"                      => options["StorageType"] || "standard",
             "VpcSecurityGroups"                => options["VpcSecurityGroups"],
           }

diff --git a/tests/models/rds/server_tests.rb b/tests/models/rds/server_tests.rb
@@ -2,8 +2,14 @@
   model_tests(Fog::AWS[:rds].servers, rds_default_server_params) do
     # 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_encrypted_storage = Fog::AWS[:rds].servers.create(rds_default_server_params.merge(:storage_encrypted => true))
 
     @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
       returns([]) { @instance.read_replica_identifiers }