fog-aws 0.1.1 → 0.1.2

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

@@ -8,6 +8,14 @@ module Fog
         #
         # ==== Parameters
         # * filters<~Hash> - List of filters to limit results with
+        #   * filters and/or the following
+        #     * 'AvailabilityZone'<~String> - availability zone of offering
+        #     * 'InstanceType'<~Array> - instance types of offering
+        #     * 'ProductDescription'<~Array> - basic product descriptions
+        #     * 'StartTime'<~Time> - The date and time, up to the past 90 days, from which to start retrieving the price history data
+        #     * 'EndTime'<~Time> - The date and time, up to the current date, from which to stop retrieving the price history data
+        #     * 'MaxResults'<~Integer> - The maximum number of results to return for the request in a single page
+        #     * 'NextToken'<~String> - The token to retrieve the next page of results
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -19,10 +27,28 @@ module Fog
         #       * 'productDescription'<~String> - general description of AMI
         #       * 'spotPrice'<~Float> - maximum price to launch one or more instances
         #       * 'timestamp'<~Time> - date and time of request creation
+        #     * 'nextToken'<~String> - token to retrieve the next page of results
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSpotPriceHistory.html]
         def describe_spot_price_history(filters = {})
-          params = Fog::AWS.indexed_filters(filters)
+          params = {}
+
+          for key in %w(AvailabilityZone StartTime EndTime MaxResults NextToken)
+            if filters.is_a?(Hash) && filters.key?(key)
+              params[key] = filters.delete(key)
+            end
+          end
+
+          if instance_types = filters.delete('InstanceType')
+            params.merge!(Fog::AWS.indexed_param('InstanceType', [*instance_types]))
+          end
+
+          if product_descriptions = filters.delete('ProductDescription')
+            params.merge!(Fog::AWS.indexed_param('ProductDescription', [*product_descriptions]))
+          end
+
+          params.merge!(Fog::AWS.indexed_filters(filters))
+
           request({
             'Action'    => 'DescribeSpotPriceHistory',
             :idempotent => true,

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -222,9 +222,9 @@ module Fog
       end
 
       def self.hosted_zone_for_alias_target(dns_name)
-        elb_hosted_zone_mapping.select { |k, _|
+        Hash[elb_hosted_zone_mapping.select { |k, _|
           dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
-        }.last
+        }].values.last
       end
 
       def self.elb_hosted_zone_mapping
@@ -233,6 +233,7 @@ module Fog
           "ap-southeast-1" => "Z1WI8VXHPB1R38",
           "ap-southeast-2" => "Z2999QAZ9SRTIC",
           "eu-west-1"      => "Z3NF1Z3NOM5OY2",
+          "eu-central-1"   => "Z215JYRZR1TBD5",
           "sa-east-1"      => "Z2ES78Y61JGQKS",
           "us-east-1"      => "Z3DZXE0Q79N41H",
           "us-west-1"      => "Z1M58G0W56PQJA",

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

@@ -30,6 +30,7 @@ module Fog
           end
 
           server_data = data[:servers][identifier]
+
           unless server_data
             raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found")
           end

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

@@ -18,10 +18,10 @@ module Fog
           params = {}
           params['FinalDBSnapshotIdentifier'] = snapshot_identifier if snapshot_identifier
           request({
-            'Action'  => 'DeleteDBInstance',
+            'Action'               => 'DeleteDBInstance',
             'DBInstanceIdentifier' => identifier,
-            'SkipFinalSnapshot' => skip_snapshot,
-            :parser   => Fog::Parsers::AWS::RDS::DeleteDBInstance.new
+            'SkipFinalSnapshot'    => skip_snapshot,
+            :parser                => Fog::Parsers::AWS::RDS::DeleteDBInstance.new
           }.merge(params))
         end
       end
@@ -30,20 +30,26 @@ module Fog
         def delete_db_instance(identifier, snapshot_identifier, skip_snapshot = false)
           response = Excon::Response.new
 
+
+          server_set = self.data[:servers][identifier] ||
+            raise(Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found"))
+
           unless skip_snapshot
-            create_db_snapshot(identifier, snapshot_identifier)
+            if server_set["ReadReplicaSourceDBInstanceIdentifier"]
+              raise Fog::AWS::RDS::Error.new("InvalidParameterCombination => FinalDBSnapshotIdentifier can not be specified when deleting a replica instance")
+            else
+              create_db_snapshot(identifier, snapshot_identifier)
+            end
           end
 
-          if server_set = self.data[:servers].delete(identifier)
-            response.status = 200
-            response.body = {
-              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
-              "DeleteDBInstanceResult" => { "DBInstance" => server_set }
-            }
-            response
-          else
-            raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found")
-          end
+          self.data[:servers].delete(identifier)
+
+          response.status = 200
+          response.body = {
+            "ResponseMetadata"       => { "RequestId"  => Fog::AWS::Mock.request_id },
+            "DeleteDBInstanceResult" => { "DBInstance" => server_set }
+          }
+          response
         end
       end
     end

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

@@ -22,7 +22,14 @@ module Fog
 
       class Mock
         def describe_db_engine_versions(opts={})
-          Fog::Mock.not_implemented
+          response = Excon::Response.new
+
+          response.status = 200
+          response.body = {
+            "ResponseMetadata"               => { "RequestId"        => Fog::AWS::Mock.request_id },
+            "DescribeDBEngineVersionsResult" => { "DBEngineVersions" => self.data[:db_engine_versions] }
+          }
+          response
         end
       end
     end

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

@@ -33,8 +33,8 @@ module Fog
           response = Excon::Response.new
           server_set = []
           if identifier
-            if server = self.data[:servers][identifier]
-              server_set << server
+            if specified_server = self.data[:servers][identifier]
+              server_set << specified_server
             else
               raise Fog::AWS::RDS::NotFound.new("DBInstance #{identifier} not found")
             end
@@ -46,7 +46,6 @@ module Fog
              case server["DBInstanceStatus"]
              when "creating"
                if Time.now - server['InstanceCreateTime'] >= Fog::Mock.delay * 2
-                 region = "us-east-1"
                  server["DBInstanceStatus"] = "available"
                  server["AvailabilityZone"] ||= region + 'a'
                  server["Endpoint"] = {"Port"=>3306,

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

@@ -1,7 +1,7 @@
 module Fog
   module Storage
     class AWS
-      class Real
+      module PostObjectHiddenFields
         # Get a hash of hidden fields for form uploading to S3, in the form {:field_name => :field_value}
         # Form should look like: <form action="http://#{bucket_name}.s3.amazonaws.com/" method="post" enctype="multipart/form-data">
         # These hidden fields should then appear, followed by a field named 'file' which is either a textarea or file input.
@@ -42,13 +42,19 @@ module Fog
             options['X-Amz-Date'] = date.to_iso8601_basic
             options['X-Amz-Algorithm'] = Fog::AWS::SignatureV4::ALGORITHM
             if @aws_session_token
-              options['X-Amz-Security-Token'] = @aws_session_token         
+              options['X-Amz-Security-Token'] = @aws_session_token
             end
             options['X-Amz-Signature'] = @signer.derived_hmac(date).sign(options['policy']).unpack('H*').first
           end
-          options          
+          options
         end
       end
+      class Real
+        include PostObjectHiddenFields
+      end
+      class Mock
+        include PostObjectHiddenFields
+      end
     end
   end
 end

data/lib/fog/aws/ses.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module AWS
     class SES < Fog::Service

data/lib/fog/aws/signaturev4.rb

@@ -1,10 +1,10 @@
-require 'fog/aws/core'
-
 # See http://docs.amazonwebservices.com/general/latest/gr/signature-version-4.html
+
 module Fog
   module AWS
     class SignatureV4
       ALGORITHM = 'AWS4-HMAC-SHA256'
+
       def initialize(aws_access_key_id, secret_key, region, service)
         @region = region
         @service = service
@@ -115,7 +115,6 @@ DATA
       def signed_headers(headers)
         headers.keys.map {|key| key.to_s.downcase}.sort.join(';')
       end
-
     end
   end
 end

data/lib/fog/aws/simpledb.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module AWS
     class SimpleDB < Fog::Service

data/lib/fog/aws/sns.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module AWS
     class SNS < Fog::Service

data/lib/fog/aws/sqs.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module AWS
     class SQS < Fog::Service

data/lib/fog/aws/storage.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module Storage
     class AWS < Fog::Service
@@ -256,21 +254,25 @@ module Fog
           if params[:bucket_name]
             bucket_name = params[:bucket_name]
 
-            path_style = params.fetch(:path_style, @path_style)
-            if !path_style
-              if COMPLIANT_BUCKET_NAMES !~ bucket_name
-                Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
-                path_style = true
-              elsif scheme == 'https' && !path_style && bucket_name =~ /\./
-                Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
-                path_style = true
+            if params[:bucket_cname]
+              host = bucket_name
+            else
+              path_style = params.fetch(:path_style, @path_style)
+              if !path_style
+                if COMPLIANT_BUCKET_NAMES !~ bucket_name
+                  Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) is not a valid dns name, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
+                  path_style = true
+                elsif scheme == 'https' && !path_style && bucket_name =~ /\./
+                  Fog::Logger.warning("fog: the specified s3 bucket name(#{bucket_name}) contains a '.' so is not accessible over https as a virtual hosted bucket, which will negatively impact performance.  For details see: http://docs.amazonwebservices.com/AmazonS3/latest/dev/BucketRestrictions.html")
+                  path_style = true
+                end
               end
-            end
 
-            if path_style
-              path = bucket_to_path bucket_name, path
-            else
-              host = [bucket_name, host].join('.')
+              if path_style
+                path = bucket_to_path bucket_name, path
+              else
+                host = [bucket_name, host].join('.')
+              end
             end
           end
 
@@ -532,6 +534,7 @@ module Fog
           date = Fog::Time.now
 
           params = params.dup
+          stringify_query_keys(params)
           params[:headers] = (params[:headers] || {}).dup
 
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
@@ -556,9 +559,12 @@ 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'
 
-              encoding = "aws-chunked"
+              if params[:headers]['Content-Encoding']
+                encoding = "aws-chunked, #{params[:headers]['Content-Encoding']}"
+              else
+                encoding = "aws-chunked, identity"
+              end
 
-              encoding += ", #{params[:headers]['Content-Encoding']}" if params[:headers]['Content-Encoding']
               params[:headers]['Content-Encoding']  = encoding
             else
               params[:headers]['x-amz-content-sha256'] ||= Digest::SHA256.hexdigest(params[:body] || '')
@@ -729,6 +735,10 @@ DATA
           signed_string = @hmac.sign(string_to_sign)
           Base64.encode64(signed_string).chomp!
         end
+
+        def stringify_query_keys(params)
+          params[:query] = Hash[params[:query].map { |k,v| [k.to_s, v] }] if params[:query]
+        end
       end
     end
   end

data/lib/fog/aws/sts.rb

@@ -1,5 +1,3 @@
-require 'fog/aws/core'
-
 module Fog
   module AWS
     class STS < Fog::Service

data/lib/fog/aws/version.rb

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

data/tests/models/rds/server_tests.rb

@@ -1,7 +1,4 @@
 Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
-  # Disabled due to https://github.com/fog/fog/1546
-  pending
-
   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))
@@ -89,6 +86,10 @@ Shindo.tests("AWS::RDS | server", ['aws', 'rds']) do
       returns(@instance_with_final_snapshot.id) { replica.read_replica_source }
 
       replica.wait_for { ready? }
+
+      # FinalDBSnapshotIdentifier can not be specified when deleting a replica instance
+      raises(Fog::AWS::RDS::Error) { replica.destroy("foobar") }
+
       replica.destroy
     end
 

data/tests/requests/compute/spot_price_history_tests.rb

@@ -8,7 +8,8 @@ Shindo.tests('Fog::Compute[:aws] | spot price history requests', ['aws']) do
       'productDescription'  => String,
       'timestamp'           => Time
     }],
-    'requestId' => String
+    'requestId' => String,
+    'nextToken' => Fog::Nullable::String
   }
 
   tests('success') do

data/tests/requests/dns/change_resource_record_sets_tests.rb

@@ -0,0 +1,10 @@
+Shindo.tests('Fog::DNS[:aws] | change_resource_record_sets', ['aws', 'dns']) do
+  @r53_connection = Fog::DNS[:aws]
+
+  tests('success') do
+    test('#elb_hosted_zone_mapping from DNS name') do
+      zone_id = Fog::DNS::AWS.hosted_zone_for_alias_target('arbitrary-sub-domain.eu-west-1.elb.amazonaws.com')
+      zone_id == Fog::DNS::AWS.elb_hosted_zone_mapping['eu-west-1']
+    end
+  end
+end

data/tests/requests/rds/db_engine_versions.rb

@@ -0,0 +1,7 @@
+Shindo.tests('AWS::RDS | describe db engine versions', ['aws', 'rds']) do
+  tests('success') do
+    tests("#describe_db_engine_versions").formats(AWS::RDS::Formats::DB_ENGINE_VERSIONS_LIST) do
+      Fog::AWS[:rds].describe_db_engine_versions.body
+    end
+  end
+end

data/tests/requests/rds/helper.rb

@@ -291,6 +291,20 @@ class AWS
           'EventSubscriptionsList' => [EVENT_SUBSCRIPTION]
         }
       }
+
+      DB_ENGINE_VERSION = {
+        'Engine'                     => String,
+        'DBParameterGroupFamily'     => String,
+        'DBEngineDescription'        => String,
+        'EngineVersion'              => String,
+        'DBEngineVersionDescription' => String
+      }
+
+      DB_ENGINE_VERSIONS_LIST = BASIC.merge(
+        'DescribeDBEngineVersionsResult' => {
+          'DBEngineVersions' => [DB_ENGINE_VERSION]
+        }
+      )
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-25 00:00:00.000000000 Z
+date: 2015-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,7 +137,6 @@ files:
 - lib/fog/aws/cloud_formation.rb
 - lib/fog/aws/cloud_watch.rb
 - lib/fog/aws/compute.rb
-- lib/fog/aws/core.rb
 - lib/fog/aws/credential_fetcher.rb
 - lib/fog/aws/data_pipeline.rb
 - lib/fog/aws/dns.rb
@@ -146,9 +145,11 @@ files:
 - lib/fog/aws/elb.rb
 - lib/fog/aws/elb/policy_types.rb
 - lib/fog/aws/emr.rb
+- lib/fog/aws/errors.rb
 - lib/fog/aws/federation.rb
 - lib/fog/aws/glacier.rb
 - lib/fog/aws/iam.rb
+- lib/fog/aws/mock.rb
 - lib/fog/aws/models/auto_scaling/activities.rb
 - lib/fog/aws/models/auto_scaling/activity.rb
 - lib/fog/aws/models/auto_scaling/configuration.rb
@@ -285,7 +286,6 @@ files:
 - lib/fog/aws/models/storage/files.rb
 - lib/fog/aws/models/storage/version.rb
 - lib/fog/aws/models/storage/versions.rb
-- lib/fog/aws/parsers/.DS_Store
 - lib/fog/aws/parsers/auto_scaling/basic.rb
 - lib/fog/aws/parsers/auto_scaling/describe_adjustment_types.rb
 - lib/fog/aws/parsers/auto_scaling/describe_auto_scaling_groups.rb
@@ -634,7 +634,6 @@ files:
 - lib/fog/aws/rds.rb
 - lib/fog/aws/redshift.rb
 - lib/fog/aws/region_methods.rb
-- lib/fog/aws/requests/.DS_Store
 - lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb
 - lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb
 - lib/fog/aws/requests/auto_scaling/create_or_update_tags.rb
@@ -1345,6 +1344,7 @@ files:
 - tests/requests/compute/vpc_tests.rb
 - tests/requests/data_pipeline/helper.rb
 - tests/requests/data_pipeline/pipeline_tests.rb
+- tests/requests/dns/change_resource_record_sets_tests.rb
 - tests/requests/dns/dns_tests.rb
 - tests/requests/dns/health_check_tests.rb
 - tests/requests/dns/helper.rb
@@ -1382,6 +1382,7 @@ files:
 - tests/requests/iam/server_certificate_tests.rb
 - tests/requests/iam/user_policy_tests.rb
 - tests/requests/iam/user_tests.rb
+- tests/requests/rds/db_engine_versions.rb
 - tests/requests/rds/describe_events.rb
 - tests/requests/rds/event_subscription_tests.rb
 - tests/requests/rds/helper.rb