fog-aws 0.8.1 → 0.9.0

data/tests/models/rds/servers_tests.rb

@@ -3,4 +3,22 @@ Shindo.tests("AWS::RDS | servers", ['aws', 'rds']) do
   collection_tests(Fog::AWS[:rds].servers, rds_default_server_params) do
     @instance.wait_for { ready? }
   end
+
+  tests("#restore").succeeds do
+    instance = Fog::AWS[:rds].servers.create(rds_default_server_params.merge(:id => uniq_id("fog-snapshot-test")))
+
+    snapshot_id = uniq_id('fog-snapshot-test')
+    @snapshot = instance.snapshots.create(:id => snapshot_id )
+    instance.destroy
+
+    db_name = uniq_id('fog-db-name')
+    @restore_instance = Fog::AWS[:rds].servers.restore('master_username' => instance.master_username, 'flavor_id' => 'db.m3.medium', 'source_snapshot_id' => snapshot_id, 'id' => uniq_id('restored-instance'))
+  end
+
+  if Fog.mocking? && @restore_instance.respond_to?(:ready?)
+    @restore_instance.wait_for { ready? }
+  end
+
+  @snapshot.destroy
+  @restore_instance.destroy
 end

data/tests/requests/compute/instance_tests.rb

@@ -229,7 +229,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
               "App"   => "test1",
           },
           :image_id => 'ami-3d7e2e54',
-          :flavor_id =>  't1.micro',
+          :flavor_id =>  't1.micro'
       )
       svr2 = Fog::Compute[:aws].servers.create(
           :availability_zone => 'eu-west-1b',
@@ -240,10 +240,9 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
               "App"   => "test2",
           },
           :image_id => 'ami-3d7e2e54',
-          :flavor_id =>  't1.micro',
+          :flavor_id =>  't1.micro'
       )
 
-      filters = {'tag:App' => ['test1', 'test2']}
       body = Fog::Compute[:aws].describe_instances('tag:App' => ['test1', 'test2']).body
       tests("returns 2 hosts").returns(2) { body['reservationSet'].size }
       svr1.destroy

data/tests/requests/rds/cluster_snapshot_tests.rb

@@ -0,0 +1,43 @@
+Shindo.tests('AWS::RDS | cluster snapshot requests', ['aws', 'rds']) do
+  @cluster_id     = uniq_id("fog-test")
+  @snapshot_id    = uniq_id("cluster-db-snapshot")
+  @cluster        = Fog::AWS[:rds].clusters.create(rds_default_cluster_params.merge(:id => @cluster_id))
+  @snapshot_count = Fog::AWS[:rds].describe_db_cluster_snapshots.body['DescribeDBClusterSnapshotsResult']['DBClusterSnapshots'].count
+
+  tests("success") do
+    tests("#create_db_cluster_snapshot").formats(AWS::RDS::Formats::CREATE_DB_CLUSTER_SNAPSHOT) do
+      result = Fog::AWS[:rds].create_db_cluster_snapshot(@cluster_id, @snapshot_id).body
+
+      snapshot = result['CreateDBClusterSnapshotResult']['DBClusterSnapshot']
+      returns(@snapshot_id)               { snapshot["DBClusterSnapshotIdentifier"] }
+      returns(@cluster.engine)            { snapshot["Engine"] }
+      returns(@cluster.id)                { snapshot["DBClusterIdentifier"] }
+      returns(@cluster.engine_version)    { snapshot["EngineVersion"] }
+      returns(@cluster.allocated_storage) { snapshot["AllocatedStorage"].to_i }
+      returns(@cluster.master_username)   { snapshot["MasterUsername"] }
+
+      result
+    end
+
+    second_snapshot = Fog::AWS[:rds].create_db_cluster_snapshot(@cluster_id, uniq_id("second-snapshot")).body['CreateDBClusterSnapshotResult']['DBClusterSnapshot']
+
+    tests("#describe_db_cluster_snapshots").formats(AWS::RDS::Formats::DESCRIBE_DB_CLUSTER_SNAPSHOTS) do
+      result    = Fog::AWS[:rds].describe_db_cluster_snapshots.body
+      snapshots = result['DescribeDBClusterSnapshotsResult']['DBClusterSnapshots']
+      returns(@snapshot_count + 2) { snapshots.count }
+
+      single_result = Fog::AWS[:rds].describe_db_cluster_snapshots(:snapshot_id => second_snapshot['DBClusterSnapshotIdentifier']).body['DescribeDBClusterSnapshotsResult']['DBClusterSnapshots']
+      returns([second_snapshot['DBClusterSnapshotIdentifier']]) { single_result.map { |s| s['DBClusterSnapshotIdentifier'] } }
+
+      result
+    end
+
+    tests("delete_db_cluster_snapshot").formats(AWS::RDS::Formats::DELETE_DB_CLUSTER_SNAPSHOT) do
+      result = Fog::AWS[:rds].delete_db_cluster_snapshot(@snapshot_id).body
+
+      raises(Fog::AWS::RDS::NotFound) { Fog::AWS[:rds].describe_db_cluster_snapshots(:snapshot_id => @snapshot_id) }
+
+      result
+    end
+  end
+end

data/tests/requests/rds/cluster_tests.rb

@@ -0,0 +1,37 @@
+Shindo.tests('AWS::RDS | cluster requests', ['aws', 'rds']) do
+  suffix = rand(65535).to_s(16)
+
+  @cluster_id        = "fog-test-#{suffix}"
+  @master_id         = "fog-master-#{suffix}"
+  @final_snapshot_id = "fog-snapshot-#{suffix}"
+
+  tests("success") do
+    tests("#create_db_cluster").formats(AWS::RDS::Formats::CREATE_DB_CLUSTER) do
+      result = Fog::AWS[:rds].create_db_cluster(@cluster_id,
+                                                'Engine'             => 'aurora',
+                                                'MasterUsername'     => "fog-#{suffix}",
+                                                'MasterUserPassword' => "fog-#{suffix}"
+                                               ).body
+
+      cluster = result['CreateDBClusterResult']['DBCluster']
+      returns("1")             { cluster['AllocatedStorage'] }
+      returns('aurora')        { cluster['Engine'] }
+      returns("fog-#{suffix}") { cluster['MasterUsername'] }
+      result
+    end
+
+    tests("#describe_db_clusters").formats(AWS::RDS::Formats::DESCRIBE_DB_CLUSTERS) do
+      Fog::AWS[:rds].describe_db_clusters.body
+    end
+
+    tests("#delete_db_cluster").formats(AWS::RDS::Formats::DELETE_DB_CLUSTER) do
+      body = Fog::AWS[:rds].delete_db_cluster(@cluster_id, @final_snapshot_id).body
+
+      tests('final snapshot') do
+        returns('creating') { Fog::AWS[:rds].describe_db_cluster_snapshots(:snapshot_id => @final_snapshot_id).body['DescribeDBClusterSnapshotsResult']['DBClusterSnapshots'].first['Status'] }
+      end
+
+      body
+    end
+  end
+end

data/tests/requests/rds/helper.rb

@@ -159,6 +159,7 @@ class AWS
         'BackupRetentionPeriod'   => Integer,
         'CACertificateIdentifier' => String,
         'CharacterSetName'        => Fog::Nullable::String,
+        'DBClusterIndentifier'    => Fog::Nullable::String,
         'DbiResourceId'           => Fog::Nullable::String,
         'DBInstanceClass'         => String,
         'DBInstanceIdentifier'    => String,
@@ -311,6 +312,89 @@ class AWS
           'DBEngineVersions' => [DB_ENGINE_VERSION]
         }
       )
+
+      DB_CLUSTER = {
+        'AllocatedStorage'           => String,
+        'BackupRetentionPeriod'      => String,
+        'DBClusterIdentifier'        => String,
+        'DBClusterMembers'           => [{
+          "master"               => Fog::Nullable::Boolean,
+          "DBInstanceIdentifier" => Fog::Nullable::String,
+        }],
+        'DBClusterParameterGroup'    => String,
+        'DBSubnetGroup'              => String,
+        'Endpoint'                   => String,
+        'Engine'                     => String,
+        'EngineVersion'              => String,
+        'MasterUsername'             => String,
+        'Port'                       => String,
+        'PreferredBackupWindow'      => String,
+        'PreferredMaintenanceWindow' => String,
+        'Status'                     => String,
+        'VpcSecurityGroups'          => [{
+          "VpcSecurityGroupId" => Fog::Nullable::String,
+        }]
+      }
+
+      DESCRIBE_DB_CLUSTERS = BASIC.merge({
+        'DescribeDBClustersResult' =>  {
+          'Marker' => Fog::Nullable::String,
+          'DBClusters' => [DB_CLUSTER]
+        }
+      })
+
+      CREATE_DB_CLUSTER = BASIC.merge(
+        'CreateDBClusterResult' => {
+          'DBCluster' => DB_CLUSTER
+        }
+      )
+
+      DELETE_DB_CLUSTER = BASIC.merge(
+        'DeleteDBClusterResult' => {
+          'DBCluster' => DB_CLUSTER
+        }
+      )
+
+      DB_CLUSTER_SNAPSHOT = {
+        'AllocatedStorage'            => Fog::Nullable::Integer,
+        'ClusterCreateTime'           => Fog::Nullable::Time,
+        'DBClusterIdentifier'         => String,
+        'DBClusterSnapshotIdentifier' => String,
+        'Engine'                      => String,
+        'LicenseModel'                => String,
+        'MasterUsername'              => String,
+        'PercentProgress'             => Fog::Nullable::Integer,
+        'Port'                        => Fog::Nullable::Integer,
+        'SnapshotCreateTime'          => Fog::Nullable::Time,
+        'SnapshotType'                => String,
+        'Status'                      => String,
+        'VpcId'                       => Fog::Nullable::String
+      }
+
+      CREATE_DB_CLUSTER_SNAPSHOT = BASIC.merge(
+        'CreateDBClusterSnapshotResult' => {
+          'DBClusterSnapshot' => DB_CLUSTER_SNAPSHOT
+        }
+      )
+
+      DESCRIBE_DB_CLUSTER_SNAPSHOTS = BASIC.merge(
+        'DescribeDBClusterSnapshotsResult' => {
+          'Marker'             => Fog::Nullable::String,
+          'DBClusterSnapshots' => [DB_CLUSTER_SNAPSHOT],
+        }
+      )
+
+      DELETE_DB_CLUSTER_SNAPSHOT = BASIC.merge(
+        'DeleteDBClusterSnapshotResult' => {
+          'DBClusterSnapshot' => DB_CLUSTER_SNAPSHOT,
+        }
+      )
+
+      RESTORE_DB_INSTANCE_FROM_DB_SNAPSHOT = BASIC.merge({
+        'RestoreDBInstanceFromDBSnapshotResult' => {
+          'DBInstance' => INSTANCE
+        }
+      })
     end
   end
 end

data/tests/requests/rds/instance_tests.rb

@@ -5,10 +5,11 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
   # serveral minutes for deleted servers to disappear
   suffix = rand(65536).to_s(16)
 
-  @db_instance_id       = "fog-test-#{suffix}"
-  @db_replica_id        = "fog-replica-#{suffix}"
-  @db_snapshot_id       = "fog-snapshot-#{suffix}"
-  @db_final_snapshot_id = "fog-final-snapshot-#{suffix}"
+  @db_instance_id         = "fog-test-#{suffix}"
+  @db_replica_id          = "fog-replica-#{suffix}"
+  @db_snapshot_id         = "fog-snapshot-#{suffix}"
+  @db_final_snapshot_id   = "fog-final-snapshot-#{suffix}"
+  @db_instance_restore_id = "fog-test-#{suffix}"
 
   tests('success') do
 
@@ -109,6 +110,17 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
       body
     end
 
+    tests("#restore_db_instance_from_db_snapshot").formats(AWS::RDS::Formats::RESTORE_DB_INSTANCE_FROM_DB_SNAPSHOT) do
+      snapshot = Fog::AWS[:rds].snapshots.get(@db_final_snapshot_id)
+      snapshot.wait_for { state == 'available' }
+      result = Fog::AWS[:rds].restore_db_instance_from_db_snapshot(@db_final_snapshot_id, @db_instance_restore_id).body
+      instance = result['RestoreDBInstanceFromDBSnapshotResult']['DBInstance']
+      returns('creating') { instance['DBInstanceStatus'] }
+      result
+    end
+    restore_server = Fog::AWS[:rds].servers.get(@db_instance_restore_id)
+    restore_server.wait_for { state == 'available' }
+
     tests("#delete_db_snapshot").formats(AWS::RDS::Formats::DELETE_DB_SNAPSHOT) do
       Fog::AWS[:rds].snapshots.get(@db_snapshot_id).wait_for { ready? }
       Fog::AWS[:rds].delete_db_snapshot(@db_snapshot_id).body

data/tests/requests/rds/parameter_group_tests.rb

@@ -21,7 +21,7 @@ Shindo.tests('AWS::RDS | parameter group requests', ['aws', 'rds']) do
       body
     end
 
-    tests("#describe_db_parameter_groups('fog-group)").formats(AWS::RDS::Formats::DESCRIBE_DB_PARAMETER_GROUP) do
+    tests("#describe_db_parameter_groups('fog-group')").formats(AWS::RDS::Formats::DESCRIBE_DB_PARAMETER_GROUP) do
 
       body = Fog::AWS[:rds].describe_db_parameter_groups('fog-group').body
 

data/tests/requests/rds/parameter_request_tests.rb

@@ -1,7 +1,5 @@
 Shindo.tests('AWS::RDS | parameter requests', ['aws', 'rds']) do
   tests('success') do
-    pending if Fog.mocking?
-
     Fog::AWS[:rds].create_db_parameter_group('fog-group', 'MySQL5.1', 'Some description')
 
     tests('#modify_db_parameter_group').formats(AWS::RDS::Formats::MODIFY_PARAMETER_GROUP) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -287,6 +287,9 @@ files:
 - lib/fog/aws/models/iam/users.rb
 - lib/fog/aws/models/kms/key.rb
 - lib/fog/aws/models/kms/keys.rb
+- lib/fog/aws/models/rds/cluster.rb
+- lib/fog/aws/models/rds/cluster_snapshots.rb
+- lib/fog/aws/models/rds/clusters.rb
 - lib/fog/aws/models/rds/event_subscription.rb
 - lib/fog/aws/models/rds/event_subscriptions.rb
 - lib/fog/aws/models/rds/instance_option.rb
@@ -574,6 +577,8 @@ files:
 - lib/fog/aws/parsers/lambda/base.rb
 - lib/fog/aws/parsers/rds/authorize_db_security_group_ingress.rb
 - lib/fog/aws/parsers/rds/base.rb
+- lib/fog/aws/parsers/rds/create_db_cluster.rb
+- lib/fog/aws/parsers/rds/create_db_cluster_snapshot.rb
 - lib/fog/aws/parsers/rds/create_db_instance.rb
 - lib/fog/aws/parsers/rds/create_db_instance_read_replica.rb
 - lib/fog/aws/parsers/rds/create_db_parameter_group.rb
@@ -581,14 +586,21 @@ files:
 - lib/fog/aws/parsers/rds/create_db_snapshot.rb
 - lib/fog/aws/parsers/rds/create_db_subnet_group.rb
 - lib/fog/aws/parsers/rds/create_event_subscription.rb
+- lib/fog/aws/parsers/rds/db_cluster_parser.rb
+- lib/fog/aws/parsers/rds/db_cluster_snapshot_parser.rb
 - lib/fog/aws/parsers/rds/db_engine_version_parser.rb
+- lib/fog/aws/parsers/rds/db_parameter_parser.rb
 - lib/fog/aws/parsers/rds/db_parser.rb
+- lib/fog/aws/parsers/rds/delete_db_cluster.rb
+- lib/fog/aws/parsers/rds/delete_db_cluster_snapshot.rb
 - lib/fog/aws/parsers/rds/delete_db_instance.rb
 - lib/fog/aws/parsers/rds/delete_db_parameter_group.rb
 - lib/fog/aws/parsers/rds/delete_db_security_group.rb
 - lib/fog/aws/parsers/rds/delete_db_snapshot.rb
 - lib/fog/aws/parsers/rds/delete_db_subnet_group.rb
 - lib/fog/aws/parsers/rds/delete_event_subscription.rb
+- lib/fog/aws/parsers/rds/describe_db_cluster_snapshots.rb
+- lib/fog/aws/parsers/rds/describe_db_clusters.rb
 - lib/fog/aws/parsers/rds/describe_db_engine_versions.rb
 - lib/fog/aws/parsers/rds/describe_db_instances.rb
 - lib/fog/aws/parsers/rds/describe_db_log_files.rb
@@ -598,6 +610,7 @@ files:
 - lib/fog/aws/parsers/rds/describe_db_security_groups.rb
 - lib/fog/aws/parsers/rds/describe_db_snapshots.rb
 - lib/fog/aws/parsers/rds/describe_db_subnet_groups.rb
+- lib/fog/aws/parsers/rds/describe_engine_default_parameters.rb
 - lib/fog/aws/parsers/rds/describe_event_subscriptions.rb
 - lib/fog/aws/parsers/rds/describe_orderable_db_instance_options.rb
 - lib/fog/aws/parsers/rds/download_db_logfile_portion.rb
@@ -1145,6 +1158,8 @@ files:
 - lib/fog/aws/requests/lambda/update_function_configuration.rb
 - lib/fog/aws/requests/rds/add_tags_to_resource.rb
 - lib/fog/aws/requests/rds/authorize_db_security_group_ingress.rb
+- lib/fog/aws/requests/rds/create_db_cluster.rb
+- lib/fog/aws/requests/rds/create_db_cluster_snapshot.rb
 - lib/fog/aws/requests/rds/create_db_instance.rb
 - lib/fog/aws/requests/rds/create_db_instance_read_replica.rb
 - lib/fog/aws/requests/rds/create_db_parameter_group.rb
@@ -1152,12 +1167,16 @@ files:
 - lib/fog/aws/requests/rds/create_db_snapshot.rb
 - lib/fog/aws/requests/rds/create_db_subnet_group.rb
 - lib/fog/aws/requests/rds/create_event_subscription.rb
+- lib/fog/aws/requests/rds/delete_db_cluster.rb
+- lib/fog/aws/requests/rds/delete_db_cluster_snapshot.rb
 - lib/fog/aws/requests/rds/delete_db_instance.rb
 - lib/fog/aws/requests/rds/delete_db_parameter_group.rb
 - lib/fog/aws/requests/rds/delete_db_security_group.rb
 - lib/fog/aws/requests/rds/delete_db_snapshot.rb
 - lib/fog/aws/requests/rds/delete_db_subnet_group.rb
 - lib/fog/aws/requests/rds/delete_event_subscription.rb
+- lib/fog/aws/requests/rds/describe_db_cluster_snapshots.rb
+- lib/fog/aws/requests/rds/describe_db_clusters.rb
 - lib/fog/aws/requests/rds/describe_db_engine_versions.rb
 - lib/fog/aws/requests/rds/describe_db_instances.rb
 - lib/fog/aws/requests/rds/describe_db_log_files.rb
@@ -1167,6 +1186,7 @@ files:
 - lib/fog/aws/requests/rds/describe_db_security_groups.rb
 - lib/fog/aws/requests/rds/describe_db_snapshots.rb
 - lib/fog/aws/requests/rds/describe_db_subnet_groups.rb
+- lib/fog/aws/requests/rds/describe_engine_default_parameters.rb
 - lib/fog/aws/requests/rds/describe_event_subscriptions.rb
 - lib/fog/aws/requests/rds/describe_events.rb
 - lib/fog/aws/requests/rds/describe_orderable_db_instance_options.rb
@@ -1406,6 +1426,8 @@ files:
 - tests/models/iam/policies_tests.rb
 - tests/models/iam/roles_tests.rb
 - tests/models/iam/users_tests.rb
+- tests/models/rds/cluster_tests.rb
+- tests/models/rds/clusters_tests.rb
 - tests/models/rds/event_subscription_tests.rb
 - tests/models/rds/event_subscriptions_tests.rb
 - tests/models/rds/helper.rb
@@ -1521,6 +1543,8 @@ files:
 - tests/requests/lambda/function_sample_2.js
 - tests/requests/lambda/function_tests.rb
 - tests/requests/lambda/helper.rb
+- tests/requests/rds/cluster_snapshot_tests.rb
+- tests/requests/rds/cluster_tests.rb
 - tests/requests/rds/db_engine_versions.rb
 - tests/requests/rds/describe_events.rb
 - tests/requests/rds/event_subscription_tests.rb
@@ -1584,7 +1608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Module for the 'fog' gem to support Amazon Web Services.