fog-aws 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5bfdd4651881d56cd47ad871e5b8b7a993418cd
-  data.tar.gz: 5bd28c47be8f7e7aabf993c499b09bdd79b25cbe
+  metadata.gz: 4397f9c8c33ed518c2029eaed97241723b4bde0b
+  data.tar.gz: 717bb82a0012393747acc56f4ab39213ea76d2ff
 SHA512:
-  metadata.gz: 83234e86990287d8151a86c98cc1d3e72d697397278b73ca48b991fb7d827eb360576012f72031dd0c4b2401027370a5ebcccac4abc29cd81df16f43ee702d86
-  data.tar.gz: be95bfbfe84599f9f53de207fa68bc3ce920c6f53ba27b9846abae103c4b4837b91de8537af5f4b87b2577bef910a0117331fae73fb90c4509219a5d94a49a30
+  metadata.gz: b22396fa794717e82b93969954722ae4614facf95107cbd0e03eeaa94c562a6d4dbced6beabbaed4f7fbdc844107223e2957b5255c30b254a89ea724c631b4ed
+  data.tar.gz: 4237cdf3e82649d353fadb7b9f1f6a89fa74e71d40b675ccb1e6462fddc807010031447a2522310b09eb98d8e3c39528f6bf8e205c18596a953e24acc9525d7b

data/lib/fog/aws.rb

@@ -27,7 +27,6 @@ module Fog
     autoload :CredentialFetcher, File.expand_path('../aws/credential_fetcher', __FILE__)
     autoload :Errors, File.expand_path('../aws/errors', __FILE__)
     autoload :Mock, File.expand_path('../aws/mock', __FILE__)
-    autoload :RegionMethods, File.expand_path('../aws/region_methods', __FILE__)
     autoload :SignatureV4, File.expand_path('../aws/signaturev4', __FILE__)
 
     # Services
@@ -103,18 +102,18 @@ module Fog
 
     def self.serialize_keys(key, value, options = {})
       case value
-        when Hash
-          value.each do | k, v |
-            options.merge!(serialize_keys("#{key}.#{k}", v))
-          end
-          return options
-        when Array
-          value.each_with_index do | it, idx |
-            options.merge!(serialize_keys("#{key}.member.#{(idx + 1)}", it))
-          end
-          return options
-        else
-          return {key => value}
+      when Hash
+        value.each do | k, v |
+          options.merge!(serialize_keys("#{key}.#{k}", v))
+        end
+        return options
+      when Array
+        value.each_with_index do | it, idx |
+          options.merge!(serialize_keys("#{key}.member.#{(idx + 1)}", it))
+        end
+        return options
+      else
+        return {key => value}
       end
     end
 
@@ -173,16 +172,16 @@ module Fog
 
     def self.signed_params(params, options = {})
       params.merge!({
-                        'AWSAccessKeyId'    => options[:aws_access_key_id],
-                        'SignatureMethod'   => 'HmacSHA256',
-                        'SignatureVersion'  => '2',
-                        'Timestamp'         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
-                        'Version'           => options[:version]
-                    })
+        'AWSAccessKeyId'    => options[:aws_access_key_id],
+        'SignatureMethod'   => 'HmacSHA256',
+        'SignatureVersion'  => '2',
+        'Timestamp'         => Time.now.utc.strftime("%Y-%m-%dT%H:%M:%SZ"),
+        'Version'           => options[:version]
+      })
 
       params.merge!({
-                        'SecurityToken'     => options[:aws_session_token]
-                    }) if options[:aws_session_token]
+        'SecurityToken'     => options[:aws_session_token]
+      }) if options[:aws_session_token]
 
       body = ''
       for key in params.keys.sort
@@ -223,5 +222,15 @@ module Fog
       return false unless response && response.headers
       response.get_header('Content-Type') =~ %r{application/.*json.*}i ? true : false
     end
+
+    def self.regions
+      @regions ||= ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1', 'cn-north-1']
+    end
+
+    def self.validate_region!(region, host=nil)
+      if (!host || host.end_with?('.amazonaws.com')) && !regions.include?(region)
+        raise ArgumentError, "Unknown region: #{region.inspect}"
+      end
+    end
   end
 end

data/lib/fog/aws/auto_scaling.rb

@@ -147,7 +147,7 @@ module Fog
               :body       => body,
               :expects    => 200,
               :idempotent => idempotent,
-              :headers    =>  headers, 
+              :headers    =>  headers,
               :method     => 'POST',
               :parser     => parser
             })
@@ -253,9 +253,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def region_data

data/lib/fog/aws/cloud_watch.rb

@@ -52,9 +52,7 @@ module Fog
 
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def data

data/lib/fog/aws/compute.rb

@@ -185,7 +185,6 @@ module Fog
         }
 
         include Fog::AWS::CredentialFetcher::ConnectionMethods
-        include Fog::AWS::RegionMethods
 
         def self.data
           @data ||= Hash.new do |hash, region|
@@ -315,7 +314,7 @@ module Fog
             @port       = options[:port]        || 443
             @scheme     = options[:scheme]      || 'https'
           end
-          validate_aws_region(@host, @region)
+          Fog::AWS.validate_region!(@region, @host)
         end
 
         def region_data
@@ -429,7 +428,6 @@ module Fog
 
       class Real
         include Fog::AWS::CredentialFetcher::ConnectionMethods
-        include Fog::AWS::RegionMethods
         # Initialize connection to EC2
         #
         # ==== Notes
@@ -478,7 +476,7 @@ module Fog
             @scheme     = options[:scheme]      || 'https'
           end
 
-          validate_aws_region(@host, @region)
+          Fog::AWS.validate_region!(@region, @host)
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
         end
 

data/lib/fog/aws/ecs.rb

@@ -163,9 +163,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           @region          = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
 
           setup_credentials(options)
         end

data/lib/fog/aws/elb.rb

@@ -80,15 +80,15 @@ module Fog
           @data = nil
         end
 
+        attr_reader :region
+
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
 
           @region = options[:region] || 'us-east-1'
           setup_credentials(options)
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def setup_credentials(options)
@@ -144,9 +144,10 @@ module Fog
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
 
           setup_credentials(options)
-
         end
 
+        attr_reader :region
+
         def reload
           @connection.reset
         end
@@ -154,12 +155,12 @@ module Fog
         private
 
         def setup_credentials(options={})
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
-          @aws_session_token      = options[:aws_session_token]
+          @aws_access_key_id         = options[:aws_access_key_id]
+          @aws_secret_access_key     = options[:aws_secret_access_key]
+          @aws_session_token         = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
-          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,@region,'elasticloadbalancing')
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'elasticloadbalancing')
         end
 
         def request(params)

data/lib/fog/aws/kinesis.rb

@@ -149,9 +149,7 @@ module Fog
           @aws_access_key_id = options[:aws_access_key_id]
           @region            = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'sa-east-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def data

data/lib/fog/aws/kms.rb

@@ -49,9 +49,7 @@ module Fog
           @region = options[:region] || 'us-east-1'
           setup_credentials(options)
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def setup_credentials(options)

data/lib/fog/aws/lambda.rb

@@ -49,9 +49,7 @@ module Fog
           @account_id        = Fog::AWS::Mock.owner_id
           @module            = "lambda"
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def data

data/lib/fog/aws/models/compute/volume.rb

@@ -9,10 +9,11 @@ module Fog
         attribute :created_at,            :aliases => 'createTime'
         attribute :delete_on_termination, :aliases => 'deleteOnTermination'
         attribute :device
+        attribute :encrypted
+        attribute :key_id,                :aliases => ['KmsKeyId', 'kmsKeyId']
         attribute :iops
         attribute :server_id,             :aliases => 'instanceId'
         attribute :size
-        attribute :encrypted
         attribute :snapshot_id,           :aliases => 'snapshotId'
         attribute :state,                 :aliases => 'status'
         attribute :tags,                  :aliases => 'tagSet'
@@ -44,9 +45,8 @@ module Fog
             requires :iops
           end
 
-          data = service.create_volume(availability_zone, size, 'SnapshotId' => snapshot_id, 'VolumeType' => type, 'Iops' => iops, 'Encrypted' => encrypted).body
-          new_attributes = data.reject {|key,value| key == 'requestId'}
-          merge_attributes(new_attributes)
+          data = service.create_volume(availability_zone, size, create_params).body
+          merge_attributes(data)
 
           if tags = self.tags
             # expect eventual consistency
@@ -118,6 +118,16 @@ module Fog
             reload
           end
         end
+
+        def create_params
+          {
+            'Encrypted'  => encrypted,
+            'KmsKeyId'   => key_id,
+            'Iops'       => iops,
+            'SnapshotId' => snapshot_id,
+            'VolumeType' => type
+          }
+        end
       end
     end
   end

data/lib/fog/aws/models/rds/server.rb

@@ -87,9 +87,14 @@ module Fog
 
         def promote_read_replica
           requires :id
-          service.promote_read_replica(id)
+
+          data = service.promote_read_replica(id).body["PromoteReadReplicaResult"]["DBInstance"]
+
+          merge_attributes(data)
         end
 
+        alias promote promote_read_replica
+
         def modify(immediately, options)
           options[:security_group_names] ||= options['DBSecurityGroups']
           params = self.class.new(options).attributes_to_params

data/lib/fog/aws/parsers/compute/create_volume.rb

@@ -5,7 +5,7 @@ module Fog
         class CreateVolume < Fog::Parsers::Base
           def end_element(name)
             case name
-            when 'availabilityZone', 'requestId', 'snapshotId', 'status', 'volumeId', 'volumeType'
+            when 'availabilityZone', 'requestId', 'snapshotId', 'status', 'volumeId', 'volumeType', 'kmsKeyId'
               @response[name] = value
             when 'createTime'
               @response[name] = Time.parse(value)

data/lib/fog/aws/parsers/compute/describe_volumes.rb

@@ -30,7 +30,7 @@ module Fog
                 @attachment[name] = Time.parse(value)
               when 'deleteOnTermination'
                 @attachment[name] = value == 'true'
-              when 'device', 'instanceId', 'status', 'volumeId'
+              when 'device', 'instanceId', 'status', 'volumeId', 'kmsKeyId'
                 @attachment[name] = value
               when 'item'
                 @volume['attachmentSet'] << @attachment

data/lib/fog/aws/rds.rb

@@ -4,6 +4,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       class IdentifierTaken < Fog::Errors::Error; end
+      class InvalidParameterCombination < Fog::Errors::Error; end
 
       class AuthorizationAlreadyExists < Fog::Errors::Error; end
 
@@ -142,9 +143,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           @region          = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
 
           setup_credentials(options)
         end

data/lib/fog/aws/requests/compute/create_volume.rb

@@ -87,19 +87,24 @@ module Fog
               end
             end
 
+            if options['KmsKeyId'] && !options['Encrypted']
+              raise Fog::Compute::AWS::Error.new("InvalidParameterDependency => The parameter KmsKeyId requires the parameter Encrypted to be set.")
+            end
+
             response.status = 200
             volume_id = Fog::AWS::Mock.volume_id
             data = {
-              'availabilityZone'  => availability_zone,
-              'attachmentSet'     => [],
-              'createTime'        => Time.now,
-              'iops'              => options['Iops'],
-              'encrypted'         => options['Encrypted'] || false,
-              'size'              => size,
-              'snapshotId'        => options['SnapshotId'],
-              'status'            => 'creating',
-              'volumeId'          => volume_id,
-              'volumeType'        => options['VolumeType'] || 'standard'
+              'availabilityZone' => availability_zone,
+              'attachmentSet'    => [],
+              'createTime'       => Time.now,
+              'iops'             => options['Iops'],
+              'encrypted'        => options['Encrypted'] || false,
+              'size'             => size,
+              'snapshotId'       => options['SnapshotId'],
+              'kmsKeyId'         => options['KmsKeyId'] || nil, # @todo validate
+              'status'           => 'creating',
+              'volumeId'         => volume_id,
+              'volumeType'       => options['VolumeType'] || 'standard'
             }
             self.data[:volumes][volume_id] = data
             response.body = {

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

@@ -78,6 +78,37 @@ module Fog
             end
           end
 
+          if !!options["MultiAZ"] && !!options["AvailabilityZone"]
+            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"],
@@ -89,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"],
@@ -98,7 +129,7 @@ module Fog
             "Iops"                             => options["Iops"],
             "LicenseModel"                     => "general-public-license",
             "MasterUsername"                   => options["MasterUsername"],
-            "MultiAZ"                          => !!options['MultiAZ'],
+            "MultiAZ"                          => !!options["MultiAZ"],
             "PendingModifiedValues"            => { "MasterUserPassword" => "****" }, # This clears when is available
             "PreferredBackupWindow"            => options["PreferredBackupWindow"] || "08:00-08:30",
             "PreferredMaintenanceWindow"       => options["PreferredMaintenanceWindow"] || "mon:04:30-mon:05:00",
@@ -106,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

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

@@ -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

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

@@ -77,7 +77,7 @@ module Fog
 
           response.status = 200
           response.body = {
-            "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+            "ResponseMetadata"          => { "RequestId"   => Fog::AWS::Mock.request_id },
             "DescribeDBInstancesResult" => { "DBInstances" => server_set }
           }
           response

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

@@ -35,11 +35,12 @@ module Fog
           response = Excon::Response.new
           snapshots = self.data[:snapshots].values
           if opts[:identifier]
-            snapshots = snapshots.select{|snapshot| snapshot['DBInstanceIdentifier'] == opts[:identifier]}
+            snapshots = snapshots.select { |snapshot| snapshot['DBInstanceIdentifier'] == opts[:identifier] }
+
           end
 
           if opts[:snapshot_id]
-            snapshots = snapshots.select{|snapshot| snapshot['DBSnapshotIdentifier'] == opts[:snapshot_id]}
+            snapshots = snapshots.select { |snapshot| snapshot['DBSnapshotIdentifier'] == opts[:snapshot_id] }
             raise Fog::AWS::RDS::NotFound.new("DBSnapshot #{opts[:snapshot_id]} not found") if snapshots.empty?
           end
 

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

@@ -46,10 +46,11 @@ module Fog
       end
 
       class Mock
-        def modify_db_instance(db_name, apply_immediately, options={})
+        def modify_db_instance(db_name, apply_immediately, _options={})
+          options = _options
           response = Excon::Response.new
-          if self.data[:servers][db_name]
-            if self.data[:servers][db_name]["DBInstanceStatus"] != "available"
+          if server = self.data[:servers][db_name]
+            if server["DBInstanceStatus"] != "available"
               raise Fog::AWS::RDS::NotFound.new("DBInstance #{db_name} not available for modification")
             else
               self.data[:modify_time] = Time.now
@@ -61,11 +62,38 @@ module Fog
               #else
               #  modified_server = server["PendingModifiedValues"].merge!(options) # it appends
               #end
+
+              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
+
+                {"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

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

@@ -25,34 +25,43 @@ module Fog
           params['BackupRetentionPeriod'] = backup_retention_period if backup_retention_period
           params['PreferredBackupWindow'] = preferred_backup_window if preferred_backup_window
           request({
-            'Action'  => 'PromoteReadReplica',
+            'Action'               => 'PromoteReadReplica',
             'DBInstanceIdentifier' => identifier,
-            :parser   => Fog::Parsers::AWS::RDS::PromoteReadReplica.new
+            :parser                => Fog::Parsers::AWS::RDS::PromoteReadReplica.new
           }.merge(params))
         end
       end
 
       class Mock
         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,
-            }
+          server = self.data[:servers][identifier]
+          server || raise(Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found"))
+
+          if server["ReadReplicaSourceDBInstanceIdentifier"].nil?
+            raise(Fog::AWS::RDS::Error.new("InvalidDBInstanceState => DB Instance is not a read replica."))
+          end
 
-            db_instance = self.data[:servers][identifier].merge(data)
+          self.data[:modify_time] = Time.now
 
-            response = Excon::Response.new
-            response.body = {
-              "ResponseMetadata"         => { "RequestId"  => Fog::AWS::Mock.request_id },
-              "PromoteReadReplicaResult" => { "DBInstance" => db_instance }
+          data = {
+            'BackupRetentionPeriod' => backup_retention_period || 1,
+            'PreferredBackupWindow' => preferred_backup_window || '08:00-08:30',
+            'DBInstanceIdentifier'  => identifier,
+            'DBInstanceStatus'      => "modifying",
+            'PendingModifiedValues' => {
+              'ReadReplicaSourceDBInstanceIdentifier' => nil,
             }
-            response.status = 200
-            response
-          else
-            raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found")
-          end
+          }
+
+          server.merge!(data)
+
+          response = Excon::Response.new
+          response.body = {
+            "ResponseMetadata"         => { "RequestId"  => Fog::AWS::Mock.request_id },
+            "PromoteReadReplicaResult" => { "DBInstance" => server }
+          }
+          response.status = 200
+          response
         end
       end
     end

data/lib/fog/aws/requests/storage/put_bucket_notification.rb

@@ -36,7 +36,7 @@ module Fog
                 QueueConfiguration do
                   Id    queue['Id']
                   Queue queue['Queue']
-                  Event topic['Event']
+                  Event queue['Event']
                 end
               end
               notification.fetch('CloudFunctions', []).each do |func|

data/lib/fog/aws/sns.rb

@@ -47,9 +47,7 @@ module Fog
           @account_id        = Fog::AWS::Mock.owner_id
           @module            = "sns"
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def data

data/lib/fog/aws/sqs.rb

@@ -38,9 +38,7 @@ module Fog
           setup_credentials(options)
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
-            raise ArgumentError, "Unknown region: #{@region.inspect}"
-          end
+          Fog::AWS.validate_region!(@region)
         end
 
         def data

data/lib/fog/aws/storage.rb

@@ -606,7 +606,7 @@ module Fog
           Fog::Logger.warning("fog: followed redirect to #{host}, connecting to the matching region will be more performant")
           original_region, original_signer = @region, @signer
           @region = @new_region || case new_params[:host]
-          when 's3.amazonaws.com', 's3-external-1.amazonaws.com'
+          when /s3.amazonaws.com/, /s3-external-1.amazonaws.com/
             DEFAULT_REGION
           else
             %r{s3[\.\-]([^\.]*).amazonaws.com}.match(new_params[:host]).captures.first

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.7.4"
+    VERSION = "0.7.5"
   end
 end

data/tests/models/rds/server_tests.rb

@@ -87,8 +87,9 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
     @instance.wait_for { state == 'rebooting' }
     @instance.wait_for { ready? }
 
-    tests('#create_read_replica').succeeds do
+    replica = nil
 
+    tests('#create_read_replica').succeeds do
       replica = @instance_with_final_snapshot.create_read_replica(uniq_id('fog-replica'))
       @instance_with_final_snapshot.reload
       returns([replica.id]) { @instance_with_final_snapshot.read_replica_identifiers }
@@ -98,10 +99,20 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
 
       # FinalDBSnapshotIdentifier can not be specified when deleting a replica instance
       raises(Fog::AWS::RDS::Error) { replica.destroy("foobar") }
+    end
 
-      replica.destroy
+    tests('#promote_read_replica').succeeds do
+      replica.promote.wait_for { state != "modifying" }
+
+      replica.read_replica_source == nil
     end
 
+    tests('#promote_read_replica', 'master').raises(Fog::AWS::RDS::Error) {
+      @instance_with_final_snapshot.promote
+    }
+
+    replica && replica.destroy
+
     test("Destroying with a final snapshot") do
       final_snapshot_id = uniq_id('fog-test-snapshot')
 

data/tests/requests/compute/volume_tests.rb

@@ -1,25 +1,25 @@
 Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
 
   @volume_format = {
-    'availabilityZone'  => String,
-    'createTime'        => Time,
-    'encrypted'         => Fog::Boolean,
-    'iops'              => Fog::Nullable::Integer,
-    'requestId'         => String,
-    'size'              => Integer,
-    'snapshotId'        => Fog::Nullable::String,
-    'status'            => String,
-    'volumeId'          => String,
-    'volumeType'        => String
+    'availabilityZone' => String,
+    'createTime'       => Time,
+    'encrypted'        => Fog::Boolean,
+    'iops'             => Fog::Nullable::Integer,
+    'requestId'        => String,
+    'size'             => Integer,
+    'snapshotId'       => Fog::Nullable::String,
+    'status'           => String,
+    'volumeId'         => String,
+    'volumeType'       => String
   }
 
   @volume_attachment_format = {
-    'attachTime'          => Time,
-    'device'              => String,
-    'instanceId'          => String,
-    'requestId'           => String,
-    'status'              => String,
-    'volumeId'            => String
+    'attachTime' => Time,
+    'device'     => String,
+    'instanceId' => String,
+    'requestId'  => String,
+    'status'     => String,
+    'volumeId'   => String
   }
 
   @volume_status_format = {
@@ -52,17 +52,18 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
 
   @volumes_format = {
     'volumeSet' => [{
-      'availabilityZone'  => String,
-      'attachmentSet'     => Array,
-      'createTime'        => Time,
-      'encrypted'         => Fog::Boolean,
-      'iops'              => Fog::Nullable::Integer,
-      'size'              => Integer,
-      'snapshotId'        => Fog::Nullable::String,
-      'status'            => String,
-      'tagSet'            => Hash,
-      'volumeId'          => String,
-      'volumeType'        => String
+      'availabilityZone' => String,
+      'attachmentSet'    => Array,
+      'createTime'       => Time,
+      'encrypted'        => Fog::Boolean,
+      'iops'             => Fog::Nullable::Integer,
+      'size'             => Integer,
+      'snapshotId'       => Fog::Nullable::String,
+      'kmsKeyId'         => Fog::Nullable::String,
+      'status'           => String,
+      'tagSet'           => Hash,
+      'volumeId'         => String,
+      'volumeType'       => String
     }],
     'requestId' => String
   }
@@ -83,7 +84,11 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
 
     tests('#create_volume from snapshot').formats(@volume_format) do
       volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
+      volume.wait_for { ready? }
+
       snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
+      Fog::Compute[:aws].snapshots.new(snapshot).wait_for { ready? }
+
       data = Fog::Compute[:aws].create_volume(@server.availability_zone, nil, 'SnapshotId' => snapshot['snapshotId']).body
       @volume_id = data['volumeId']
       data
@@ -99,9 +104,21 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
 
     Fog::Compute[:aws].delete_volume(@volume_id)
 
+    tests('#create_volume with encryption').returns(true) do
+      volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1, :encrypted => true)
+      @volume_id = volume.id
+      volume.reload.encrypted
+    end
+
+    Fog::Compute[:aws].delete_volume(@volume_id)
+
     tests('#create_volume from snapshot with size').formats(@volume_format) do
       volume = Fog::Compute[:aws].volumes.create(:availability_zone => 'us-east-1d', :size => 1)
+      volume.wait_for { ready? }
+
       snapshot = Fog::Compute[:aws].create_snapshot(volume.identity).body
+      Fog::Compute[:aws].snapshots.new(snapshot).wait_for { ready? }
+
       data = Fog::Compute[:aws].create_volume(@server.availability_zone, 1, 'SnapshotId' => snapshot['snapshotId']).body
       @volume_id = data['volumeId']
       data

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -693,7 +693,6 @@ files:
 - lib/fog/aws/parsers/sts/get_session_token.rb
 - lib/fog/aws/rds.rb
 - lib/fog/aws/redshift.rb
-- lib/fog/aws/region_methods.rb
 - lib/fog/aws/requests/auto_scaling/attach_load_balancers.rb
 - lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb
 - lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb

data/lib/fog/aws/region_methods.rb

@@ -1,11 +0,0 @@
-module Fog
-  module AWS
-    module RegionMethods
-      def validate_aws_region(host, region)
-        if host.end_with?('.amazonaws.com') && !['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1', 'us-gov-west-1', 'eu-central-1'].include?(region)
-          raise ArgumentError, "Unknown region: #{region.inspect}"
-        end
-      end
-    end
-  end
-end