fog-aws 0.1.2 → 0.2.0

data/lib/fog/aws/requests/rds/promote_read_replica.rb

@@ -36,16 +36,17 @@ module Fog
         def promote_read_replica(identifier, backup_retention_period = nil, preferred_backup_window = nil)
           if self.data[:servers][identifier]
             data = {
-                'BackupRetentionPeriod' => backup_retention_period || 1,
-                'PreferredBackupWindow' => preferred_backup_window || '08:00-08:30',
-                'DBInstanceIdentifier' => identifier
+              'BackupRetentionPeriod' => backup_retention_period || 1,
+              'PreferredBackupWindow' => preferred_backup_window || '08:00-08:30',
+              'DBInstanceIdentifier' => identifier,
             }
-            self.data[:servers][identifier].merge(data)
+
+            db_instance = self.data[:servers][identifier].merge(data)
 
             response = Excon::Response.new
             response.body = {
-                "ResponseMetadata" => { "RequestId" => Fog::AWS::Mock.request_id },
-                "PromoteReadReplicaResult" => { "DBInstance" => data}
+              "ResponseMetadata"         => { "RequestId"  => Fog::AWS::Mock.request_id },
+              "PromoteReadReplicaResult" => { "DBInstance" => db_instance }
             }
             response.status = 200
             response

data/lib/fog/aws/requests/sns/subscribe.rb

@@ -65,7 +65,7 @@ module Fog
               :aws_secret_access_key => SecureRandom.hex(3)
             ).send_message(endpoint, Fog::JSON.encode(
                 "Type"             => "SubscriptionConfirmation",
-                "MessageId"        => SecureRandom.uuid,
+                "MessageId"        => UUID.uuid,
                 "Token"            => token,
                 "TopicArn"         => arn,
                 "Message"          => message,

data/lib/fog/aws/storage.rb

@@ -139,6 +139,8 @@ module Fog
         end
 
         def signed_url(params, expires)
+          refresh_credentials_if_expired
+
           #convert expires from a point in time to a delta to now
           expires = expires.to_i
           if @signature_version == 4
@@ -314,6 +316,7 @@ module Fog
 
       class Mock
         include Utils
+        include Fog::AWS::CredentialFetcher::ConnectionMethods
 
         def self.acls(type)
           case type
@@ -559,10 +562,10 @@ module Fog
               params[:headers]['x-amz-content-sha256'] = 'STREAMING-AWS4-HMAC-SHA256-PAYLOAD'
               params[:headers]['x-amz-decoded-content-length'] = params[:headers].delete 'Content-Length'
 
-              if params[:headers]['Content-Encoding']
-                encoding = "aws-chunked, #{params[:headers]['Content-Encoding']}"
+              if params[:headers]['Content-Encoding'] && params[:headers]['Content-Encoding'].to_s.length > 0
+                encoding = "aws-chunked,#{params[:headers]['Content-Encoding']}"
               else
-                encoding = "aws-chunked, identity"
+                encoding = "aws-chunked"
               end
 
               params[:headers]['Content-Encoding']  = encoding

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.1.2"
+    VERSION = "0.2.0"
   end
 end

data/tests/helper.rb

@@ -14,8 +14,8 @@ Excon.defaults.merge!(:debug_request => true, :debug_response => true)
 require File.expand_path(File.join(File.dirname(__FILE__), 'helpers', 'mock_helper'))
 
 # This overrides the default 600 seconds timeout during live test runs
-if Fog.mocking?
-  Fog.timeout = ENV['FOG_TEST_TIMEOUT'] || 2000
+unless Fog.mocking?
+  Fog.timeout = ENV['FOG_TEST_TIMEOUT'] || 2_000
   Fog::Logger.warning "Setting default fog timeout to #{Fog.timeout} seconds"
 end
 

data/tests/models/rds/helper.rb

@@ -1,5 +1,12 @@
 def rds_default_server_params
-  { :id => uniq_id, :allocated_storage => 5, :engine => 'mysql',
-    :master_username => 'foguser', :password => 'fogpassword',
-    :backup_retention_period => 0 }
+  {
+    :allocated_storage       => 5,
+    :backup_retention_period => 0,
+    :engine                  => 'mysql',
+    :version                 => '5.6.22',
+    :id                      => uniq_id,
+    :master_username         => 'foguser',
+    :password                => 'fogpassword',
+    :flavor_id               => 'db.m3.medium',
+  }
 end

data/tests/models/rds/server_tests.rb

@@ -13,22 +13,25 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       snapshot = nil
 
       tests('#create').succeeds do
-        snapshot = @instance.snapshots.create(:id => 'fog-test-snapshot')
+        snapshot = @instance.snapshots.create(:id => uniq_id('fog-snapshot-test'))
       end
 
       snapshot.wait_for { ready?}
 
       @instance.wait_for { ready? }
 
-      returns(true) { @instance.snapshots.map{|s| s.id}.include?(snapshot.id) }
+      returns(true) { @instance.snapshots.map{ |s| s.id }.include?(snapshot.id) }
       snapshot.destroy
     end
 
     tests("#modify").succeeds do
       pending if Fog.mocking?
 
+      engine  = rds_default_server_params.fetch(:engine)
+      version = rds_default_server_params.fetch(:version).match(/\d+\.\d+/).to_s
+
       orig_parameter_group = @instance.db_parameter_groups.first['DBParameterGroupName']
-      parameter_group = Fog::AWS[:rds].parameter_groups.create(:id => uniq_id, :family => 'mysql5.5', :description => 'fog-test')
+      parameter_group = Fog::AWS[:rds].parameter_groups.create(:id => uniq_id, :family => "#{engine}#{version}", :description => 'fog-test')
 
       orig_security_groups = @instance.db_security_groups.map{|h| h['DBSecurityGroupName']}
       security_group = Fog::AWS[:rds].security_groups.create(:id => uniq_id, :description => 'fog-test')
@@ -94,7 +97,7 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
     end
 
     test("Destroying with a final snapshot") do
-      final_snapshot_id = 'fog-test-snapshot'
+      final_snapshot_id = uniq_id('fog-test-snapshot')
 
       @instance_with_final_snapshot.wait_for { ready? }
       @instance_with_final_snapshot.destroy(final_snapshot_id)

data/tests/requests/compute/spot_instance_tests.rb

@@ -36,14 +36,14 @@ Shindo.tests('Fog::Compute[:aws] | spot instance requests', ['aws']) do
 
   tests('success') do
 
-    pending if Fog.mocking?
-
     tests("#request_spot_instances('ami-3202f25b', 't1.micro', '0.001')").formats(@spot_instance_requests_format) do
       data = Fog::Compute[:aws].request_spot_instances('ami-3202f25b', 't1.micro', '0.001',{'LaunchSpecification.EbsOptimized' => false}).body
       @spot_instance_request_id = data['spotInstanceRequestSet'].first['spotInstanceRequestId']
       data
     end
 
+    pending if Fog.mocking?
+
     tests("#describe_spot_instance_requests").formats(@spot_instance_requests_format) do
       Fog::Compute[:aws].describe_spot_instance_requests('spot-instance-request-id' => [@spot_instance_request_id]).body
     end

data/tests/requests/compute/spot_price_history_tests.rb

@@ -14,8 +14,6 @@ Shindo.tests('Fog::Compute[:aws] | spot price history requests', ['aws']) do
 
   tests('success') do
 
-    pending # Some history data doesn't have an availability zone
-
     tests("#describe_spot_price_history").formats(@spot_price_history_format) do
       Fog::Compute[:aws].describe_spot_price_history.body
     end

data/tests/requests/kms/helper.rb

@@ -0,0 +1,27 @@
+class AWS
+  module KMS
+    module Formats
+      BASIC = {
+        'ResponseMetadata' => { 'RequestId' => String }
+      }
+
+      DESCRIBE_KEY = {
+        "KeyMetadata" => {
+          "KeyUsage"     => String,
+          "AWSAccountId" => String,
+          "KeyId"        => String,
+          "Description"  => Fog::Nullable::String,
+          "CreationDate" => Time,
+          "Arn"          => String,
+          "Enabled"      => Fog::Boolean
+        }
+      }
+
+      LIST_KEYS = {
+        "Keys"      => [{ "KeyId" => String, "KeyArn" => String }],
+        "Truncated" => Fog::Boolean,
+        "Marker"    => Fog::Nullable::String
+      }
+    end
+  end
+end

data/tests/requests/kms/key_tests.rb

@@ -0,0 +1,23 @@
+Shindo.tests('AWS::KMS | key requests', ['aws', 'kms']) do
+  key_id = nil
+
+  tests('success') do
+    tests("#create_key").data_matches_schema(AWS::KMS::Formats::DESCRIBE_KEY) do
+      result = Fog::AWS[:kms].create_key.body
+      key_id = result["KeyMetadata"]["KeyId"]
+
+      result
+    end
+  end
+
+  tests("#describe_key").data_matches_schema(AWS::KMS::Formats::DESCRIBE_KEY) do
+    result = Fog::AWS[:kms].describe_key(key_id).body
+    returns(key_id) { result['KeyMetadata']['KeyId'] }
+    result
+  end
+
+  tests("#list_keys").data_matches_schema(AWS::KMS::Formats::LIST_KEYS) do
+    Fog::AWS[:kms].list_keys.body
+  end
+
+end

data/tests/requests/rds/helper.rb

@@ -6,14 +6,14 @@ class AWS
       }
 
       DB_AVAILABILITY_ZONE_OPTION = {
-          'Name' => String,
-          'ProvisionedIopsCapable' => Fog::Boolean
+        'Name' => String,
+        'ProvisionedIopsCapable' => Fog::Boolean
       }
 
       DB_PARAMETER_GROUP = {
-          'DBParameterGroupFamily' => String,
-          'DBParameterGroupName' => String,
-          'Description' => String
+        'DBParameterGroupFamily' => String,
+        'DBParameterGroupName' => String,
+        'Description' => String
       }
       CREATE_DB_PARAMETER_GROUP = {
         'ResponseMetadata' => { 'RequestId' => String },
@@ -32,7 +32,7 @@ class AWS
 
       CREATE_DB_SECURITY_GROUP = BASIC.merge({
         'CreateDBSecurityGroupResult' => {
-        'DBSecurityGroup' => DB_SECURITY_GROUP
+          'DBSecurityGroup' => DB_SECURITY_GROUP
         }
       })
 
@@ -82,20 +82,20 @@ class AWS
       }
 
       ORDERABLE_DB_INSTANCE_OPTION = {
-          'MultiAZCapable' => Fog::Boolean,
-          'Engine' => String,
-          'LicenseModel' => String,
-          'ReadReplicaCapable' => Fog::Boolean,
-          'EngineVersion' => String,
-          'AvailabilityZones' => [DB_AVAILABILITY_ZONE_OPTION],
-          'DBInstanceClass' => String,
-          'Vpc' => Fog::Boolean
+        'MultiAZCapable' => Fog::Boolean,
+        'Engine' => String,
+        'LicenseModel' => String,
+        'ReadReplicaCapable' => Fog::Boolean,
+        'EngineVersion' => String,
+        'AvailabilityZones' => [DB_AVAILABILITY_ZONE_OPTION],
+        'DBInstanceClass' => String,
+        'Vpc' => Fog::Boolean
       }
 
       DESCRIBE_ORDERABLE_DB_INSTANCE_OPTION = BASIC.merge({
-          'DescribeOrderableDBInstanceOptionsResult' => {
-              'OrderableDBInstanceOptions' => [ORDERABLE_DB_INSTANCE_OPTION]
-          }
+        'DescribeOrderableDBInstanceOptionsResult' => {
+          'OrderableDBInstanceOptions' => [ORDERABLE_DB_INSTANCE_OPTION]
+        }
       })
 
       MODIFY_PARAMETER_GROUP = BASIC.merge({
@@ -153,53 +153,59 @@ class AWS
       }
 
       INSTANCE = {
-        'AllocatedStorage' => Integer,
+        'AllocatedStorage'        => Integer,
         'AutoMinorVersionUpgrade' => Fog::Boolean,
-        'AvailabilityZone' => Fog::Nullable::String,
-        'BackupRetentionPeriod' => Integer,
-        'DBInstanceClass' => String,
-        'DBInstanceIdentifier' => String,
-        'DBInstanceStatus' => String,
-        'DBName' => Fog::Nullable::String,
+        'AvailabilityZone'        => Fog::Nullable::String,
+        'BackupRetentionPeriod'   => Integer,
+        'CACertificateIdentifier' => String,
+        'CharacterSetName'        => Fog::Nullable::String,
+        'DbiResourceId'           => Fog::Nullable::String,
+        'DBInstanceClass'         => String,
+        'DBInstanceIdentifier'    => String,
+        'DBInstanceStatus'        => String,
+        'DBName'                  => Fog::Nullable::String,
         'DBParameterGroups' => [{
-            'ParameterApplyStatus' => String,
-            'DBParameterGroupName' => String
-          }],
+          'ParameterApplyStatus' => String,
+          'DBParameterGroupName' => String
+        }],
         'DBSecurityGroups' => [{
-            'Status' => String,
-            'DBSecurityGroupName' => String
-          }],
-        'DBSubnetGroupName' => Fog::Nullable::String,
+          'Status'              => String,
+          'DBSecurityGroupName' => String
+        }],
+        'DBSubnetGroupName'  => Fog::Nullable::String,
         'PubliclyAccessible' => Fog::Boolean,
         'Endpoint' => {
           'Address' => Fog::Nullable::String,
-          'Port' => Fog::Nullable::Integer
+          'Port'    => Fog::Nullable::Integer
         },
-        'Engine' => String,
-        'EngineVersion' => String,
-        'InstanceCreateTime' => Fog::Nullable::Time,
-        'Iops' => Fog::Nullable::Integer,
+        'Engine'               => String,
+        'EngineVersion'        => String,
+        'InstanceCreateTime'   => Fog::Nullable::Time,
+        'Iops'                 => Fog::Nullable::Integer,
+        'KmsKeyId'             => Fog::Nullable::String,
         'LatestRestorableTime' => Fog::Nullable::Time,
-        'LicenseModel' => String,
-        'MasterUsername' => String,
-        'MultiAZ' => Fog::Boolean,
+        'LicenseModel'         => String,
+        'MasterUsername'       => String,
+        'MultiAZ'              => Fog::Boolean,
         'PendingModifiedValues' => {
           'BackupRetentionPeriod' => Fog::Nullable::Integer,
           'DBInstanceClass'       => Fog::Nullable::String,
           'EngineVersion'         => Fog::Nullable::String,
           'MasterUserPassword'    => Fog::Nullable::String,
-          'MultiAZ'               => Fog::Nullable::String,
+          'MultiAZ'               => Fog::Nullable::Boolean,
           'AllocatedStorage'      => Fog::Nullable::Integer,
           'Port'                  => Fog::Nullable::Integer
         },
-        'PreferredBackupWindow' => String,
-        'PreferredMaintenanceWindow' => String,
-        'ReadReplicaDBInstanceIdentifiers' => [Fog::Nullable::String]
+        'PreferredBackupWindow'            => String,
+        'PreferredMaintenanceWindow'       => String,
+        'ReadReplicaDBInstanceIdentifiers' => [Fog::Nullable::String],
+        'StorageType'                      => String,
+        'StorageEncrypted'                 => Fog::Boolean,
+        'TdeCredentialArn'                 => Fog::Nullable::String
       }
 
       REPLICA_INSTANCE = INSTANCE.merge({
-        'BackupRetentionPeriod' => Fog::Nullable::String,
-        'PreferredBackupWindow' => Fog::Nullable::String,
+        'PreferredBackupWindow'                 => Fog::Nullable::String,
         'ReadReplicaSourceDBInstanceIdentifier' => String
       })
 
@@ -242,7 +248,7 @@ class AWS
 
       PROMOTE_READ_REPLICA = BASIC.merge({
         'PromoteReadReplicaResult' => {
-            'DBInstance' => INSTANCE
+          'DBInstance' => INSTANCE
         }
       })
 

data/tests/requests/rds/instance_tests.rb

@@ -1,6 +1,4 @@
 Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
-  # Disabled due to https://github.com/fog/fog/1546
-  pending
 
   # random_differentiator
   # Useful when rapidly re-running tests, so we don't have to wait
@@ -9,20 +7,26 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
 
   @db_instance_id       = "fog-test-#{suffix}"
   @db_replica_id        = "fog-replica-#{suffix}"
-  @db_snapshot_id       = "fog-snapshot"
-  @db_final_snapshot_id = "fog-final-snapshot"
+  @db_snapshot_id       = "fog-snapshot-#{suffix}"
+  @db_final_snapshot_id = "fog-final-snapshot-#{suffix}"
 
   tests('success') do
 
     tests("#create_db_instance").formats(AWS::RDS::Formats::CREATE_DB_INSTANCE) do
+      default_params = rds_default_server_params
+
+      # creation of replicas requires a > 0 BackupRetentionPeriod value
+      # InvalidDBInstanceState => Automated backups are not enabled for this database instance. To enable automated backups, use ModifyDBInstance to set the backup retention period to a non-zero value. (Fog::AWS::RDS::Error)
+      backup_retention_period = 1
+
       result = Fog::AWS[:rds].create_db_instance(@db_instance_id,
-                                                 'AllocatedStorage' => 5,
-                                                 'DBInstanceClass' => 'db.m1.small',
-                                                 'Engine' => 'mysql',
-                                                 'EngineVersion' => '5.1.50',
-                                                 'MasterUsername' => 'foguser',
-                                                 'BackupRetentionPeriod' => 1,
-                                                 'MasterUserPassword' => 'fogpassword').body
+                                                 'AllocatedStorage'      => default_params.fetch(:allocated_storage),
+                                                 'DBInstanceClass'       => default_params.fetch(:flavor_id),
+                                                 'Engine'                => default_params.fetch(:engine),
+                                                 'EngineVersion'         => default_params.fetch(:version),
+                                                 'MasterUsername'        => default_params.fetch(:master_username),
+                                                 'BackupRetentionPeriod' => backup_retention_period,
+                                                 'MasterUserPassword'    => default_params.fetch(:password)).body
 
       instance = result['CreateDBInstanceResult']['DBInstance']
       returns('creating') { instance['DBInstanceStatus'] }
@@ -69,7 +73,7 @@ Shindo.tests('AWS::RDS | instance requests', ['aws', 'rds']) do
     end
 
     tests("#describe_db_snapshots").formats(AWS::RDS::Formats::DESCRIBE_DB_SNAPSHOTS) do
-      body = Fog::AWS[:rds].describe_db_snapshots.body
+      Fog::AWS[:rds].describe_db_snapshots.body
     end
 
     server.wait_for { state == 'available' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -149,6 +149,7 @@ files:
 - lib/fog/aws/federation.rb
 - lib/fog/aws/glacier.rb
 - lib/fog/aws/iam.rb
+- lib/fog/aws/kms.rb
 - lib/fog/aws/mock.rb
 - lib/fog/aws/models/auto_scaling/activities.rb
 - lib/fog/aws/models/auto_scaling/activity.rb
@@ -258,6 +259,8 @@ files:
 - lib/fog/aws/models/iam/roles.rb
 - lib/fog/aws/models/iam/user.rb
 - 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/event_subscription.rb
 - lib/fog/aws/models/rds/event_subscriptions.rb
 - lib/fog/aws/models/rds/instance_option.rb
@@ -511,6 +514,8 @@ files:
 - lib/fog/aws/parsers/iam/update_user.rb
 - lib/fog/aws/parsers/iam/upload_server_certificate.rb
 - lib/fog/aws/parsers/iam/upload_signing_certificate.rb
+- lib/fog/aws/parsers/kms/describe_key.rb
+- lib/fog/aws/parsers/kms/list_keys.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_instance.rb
@@ -1022,6 +1027,9 @@ files:
 - lib/fog/aws/requests/iam/update_user.rb
 - lib/fog/aws/requests/iam/upload_server_certificate.rb
 - lib/fog/aws/requests/iam/upload_signing_certificate.rb
+- lib/fog/aws/requests/kms/create_key.rb
+- lib/fog/aws/requests/kms/describe_key.rb
+- lib/fog/aws/requests/kms/list_keys.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_instance.rb
@@ -1382,6 +1390,8 @@ files:
 - tests/requests/iam/server_certificate_tests.rb
 - tests/requests/iam/user_policy_tests.rb
 - tests/requests/iam/user_tests.rb
+- tests/requests/kms/helper.rb
+- tests/requests/kms/key_tests.rb
 - tests/requests/rds/db_engine_versions.rb
 - tests/requests/rds/describe_events.rb
 - tests/requests/rds/event_subscription_tests.rb