fog 1.6.0 → 1.7.0

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

@@ -21,7 +21,7 @@ module Fog
         # * 'subnetId'<~String> - The Subnet's ID
         # * 'state'<~String> - The current state of the Subnet. ['pending', 'available']
         # * 'cidrBlock'<~String> - The CIDR block the Subnet covers.
-        # * 'AvailableIpAddressCount'<~Integer> - The number of unused IP addresses in the subnet (the IP addresses for any stopped 
+        # * 'AvailableIpAddressCount'<~Integer> - The number of unused IP addresses in the subnet (the IP addresses for any stopped
         #   instances are considered unavailable)
         # * 'AvailabilityZone'<~String> - The Availability Zone the subnet is in
         # * 'tagSet'<~Array>: Tags assigned to the resource.
@@ -39,7 +39,7 @@ module Fog
 
         end
       end
-      
+
       class Mock
         def create_subnet(vpcId, cidrBlock, options = {})
           av_zone = options['AvailabilityZone'].nil? ? 'us-east-1c' : options['AvailabilityZone']
@@ -49,7 +49,7 @@ module Fog
               self.data[:subnets].push({
                 'subnetId'                 => Fog::AWS::Mock.request_id,
                 'state'                    => 'pending',
-                'vpcId'                    => Fog::AWS::Mock.request_id,
+                'vpcId'                    => vpcId,
                 'cidrBlock'                => cidrBlock,
                 'availableIpAddressCount'  => "255",
                 'availabilityZone'         => av_zone,

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

@@ -83,8 +83,8 @@ module Fog
                 raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too low; minimum is 100.")
               end
 
-              if iops > 1000
-                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 1000.")
+              if iops > 2000
+                raise Fog::Compute::AWS::Error.new("VolumeIOPSLimit => Volume iops of #{iops} is too high; maximum is 2000.")
               end
             end
 

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

@@ -102,7 +102,7 @@ module Fog
                 'ebs' => {}
               }
               ["DeviceName","VirtualName"].each do |n|
-                block_device_mapping = bd[n] if bd[n]
+                block_device_mapping[n] = bd[n] if bd[n]
               end
               ["SnapshotId","VolumeSize","NoDevice","DeleteOnTermination"].each do |n|
                 block_device_mapping['ebs'][n] = bd[n] if bd[n]

data/lib/fog/aws/requests/elasticache/describe_events.rb

@@ -6,16 +6,19 @@ module Fog
         require 'fog/aws/parsers/elasticache/event_list'
 
         # Returns a list of service events
+		#
+		# For more information see:
+        # http://docs.amazonwebservices.com/AmazonElastiCache/latest/APIReference/API_DescribeEvents.html
         #
         # === Parameters (optional)
         # * options <~Hash> (optional):
         # *  :start_time <~DateTime> - starting time for event records
         # *  :end_time <~DateTime> - ending time for event records
-        # *  :duration <~DateTime> - time span for event records
+        # *  :duration <~Integer> - time span for event records
         # *  :marker <~String> - marker provided in the previous request
         # *  :max_records <~Integer> - the maximum number of records to include
-        # *  :source_identifier <~DateTime> - identifier of the event source
-        # *  :source_type <~DateTime> - event type, one of:
+        # *  :source_identifier <~String> - identifier of the event source
+        # *  :source_type <~String> - event type, one of:
         #      (cache-cluster | cache-parameter-group | cache-security-group)
         # === Returns
         # * response <~Excon::Response>:
@@ -23,7 +26,7 @@ module Fog
         def describe_events(options = {})
           request(
             'Action'            => 'DescribeEvents',
-            'StartTime'         => options[:sart_time],
+            'StartTime'         => options[:start_time],
             'EndTime'           => options[:end_time],
             'Duration'          => options[:duration],
             'Marker'            => options[:marker],

data/lib/fog/aws/requests/glacier/create_archive.rb

@@ -26,7 +26,7 @@ module Fog
             'x-amz-content-sha256' => Digest::SHA256.hexdigest(body),
             'x-amz-sha256-tree-hash' => Fog::AWS::Glacier::TreeHash.digest(body)
           }
-          headers['x-amz-archive-description'] = options['description'] if options['description']
+          headers['x-amz-archive-description'] = Fog::AWS.escape(options['description']) if options['description']
 
           request(
             :expects  => 201,

data/lib/fog/aws/requests/glacier/initiate_multipart_upload.rb

@@ -23,7 +23,7 @@ module Fog
           path = "/#{account_id}/vaults/#{Fog::AWS.escape(name)}/multipart-uploads"
 
           headers = {'x-amz-part-size' => part_size.to_s}
-          headers['x-amz-archive-description'] = options['description'] if options['description']
+          headers['x-amz-archive-description'] = Fog::AWS.escape(options['description']) if options['description']
           request(
             :expects  => 201,
             :headers => headers,

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

@@ -0,0 +1,46 @@
+module Fog
+  module AWS
+    class RDS
+      class Real
+
+        # adds tags to a database instance
+        # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_AddTagsToResource.html
+        # ==== Parameters
+        # * rds_id <~String> - name of the RDS instance whose tags are to be retrieved
+        # * tags <~Hash> A Hash of (String) key-value pairs
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def add_tags_to_resource(rds_id, tags)
+          keys    = tags.keys.sort
+          values  = keys.map {|key| tags[key]}
+          request({
+              'Action'        => 'AddTagsToResource',
+              'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
+              :parser         => Fog::Parsers::AWS::RDS::Base.new,
+            }.merge(Fog::AWS.indexed_param('Tags.member.%d.Key', keys)).
+              merge(Fog::AWS.indexed_param('Tags.member.%d.Value', values)))
+        end
+
+      end
+
+      class Mock
+
+        def add_tags_to_resource(rds_id, tags)
+          response = Excon::Response.new
+          if server = self.data[:servers][rds_id]
+            self.data[:tags][rds_id].merge! tags
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+            }
+            response
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -115,6 +115,8 @@ module Fog
           response.status = 200
           # This values aren't showed at creating time but at available time
           self.data[:servers][db_name]["InstanceCreateTime"] = Time.now
+          self.data[:tags] ||= {}
+          self.data[:tags][db_name] = {}
           response
         end
 

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

@@ -0,0 +1,58 @@
+module Fog
+  module AWS
+    class RDS
+      class Real
+
+        require 'fog/aws/parsers/rds/create_db_subnet_group'
+
+        # Creates a db subnet group
+        # http://docs.amazonwebservices.com/AmazonRDS/2012-01-15/APIReference/API_CreateDBSubnetGroup.html
+        # ==== Parameters
+        # * DBSubnetGroupName <~String> - The name for the DB Subnet Group. This value is stored as a lowercase string. Must contain no more than 255 alphanumeric characters or hyphens. Must not be "Default".
+        # * SubnetIds <~Array> - The EC2 Subnet IDs for the DB Subnet Group.
+        # * DBSubnetGroupDescription <~String> - The description for the DB Subnet Group
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def create_db_subnet_group(name, subnet_ids, description = name)
+          params = { 'Action'  => 'CreateDBSubnetGroup',
+            'DBSubnetGroupName' => name,
+            'DBSubnetGroupDescription' => description,
+            :parser   => Fog::Parsers::AWS::RDS::CreateDBSubnetGroup.new }
+          params.merge!(Fog::AWS.indexed_param("SubnetIds.member", Array(subnet_ids)))
+          request(params)
+        end
+
+      end
+
+      class Mock
+
+        def create_db_subnet_group(name, subnet_ids, description = name)
+          response = Excon::Response.new
+          if self.data[:subnet_groups] && self.data[:subnet_groups][name]
+            raise Fog::AWS::RDS::IdentifierTaken.new("DBSubnetGroupAlreadyExists => The subnet group '#{name}' already exists")
+          end
+
+          subnets = subnet_ids.map { |snid| Fog::Compute[:aws].subnets.get(snid) }
+          vpc_id = subnets.first.vpc_id
+
+          data = {
+            'DBSubnetGroupName' => name,
+            'DBSubnetGroupDescription' => description,
+            'SubnetGroupStatus' => 'Complete',
+            'Subnets' => subnet_ids,
+            'VpcId' => vpc_id
+          }
+          self.data[:subnet_groups][name] = data
+          response.body = {
+            "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+            'CreateDBSubnetGroupResult' => { 'DBSubnetGroup' => data }
+          }
+          response
+
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,63 @@
+module Fog
+  module AWS
+    class RDS
+      class Real
+
+        require 'fog/aws/parsers/rds/describe_db_subnet_groups'
+
+        # This API returns a list of DBSubnetGroup descriptions. If a DBSubnetGroupName is specified, the list will contain only
+        # the descriptions of the specified DBSubnetGroup
+        # http://docs.amazonwebservices.com/AmazonRDS/2012-01-15/APIReference/API_DescribeDBSubnetGroups.html
+        # ==== Parameters
+        # * DBSubnetGroupName <~String> - The name of a specific database subnet group to return details for.
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def describe_db_subnet_groups(name = nil, opts = {})
+          params = {}
+          if opts[:marker]
+            params['Marker'] = opts[:marker]
+          end
+          if name
+            params['DBSubnetGroupName'] = name
+          end
+          if opts[:max_records]
+            params['MaxRecords'] = opts[:max_records]
+          end
+
+          request({
+            'Action'  => 'DescribeDBSubnetGroups',
+            :parser   => Fog::Parsers::AWS::RDS::DescribeDBSubnetGroups.new
+          }.merge(params))
+        end
+
+      end
+
+      class Mock
+
+        def describe_db_subnet_groups(name = nil, opts = {})
+          response = Excon::Response.new
+
+          subnet_group_set = []
+          if name
+            if subnet_group = self.data[:subnet_groups][name]
+              subnet_group_set << subnet_group
+            else
+              raise Fog::AWS::RDS::NotFound.new("Subnet Group #{name} not found")
+            end
+          else
+            subnet_group_set = self.data[:subnet_groups].values
+          end
+
+          response.status = 200
+          response.body = {
+            "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id },
+            "DescribeDBSubnetGroupsResult" => { "DBSubnetGroups" => subnet_group_set }
+          }
+          response
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,52 @@
+module Fog
+  module AWS
+    class RDS 
+      class Real
+
+        require 'fog/aws/parsers/rds/event_list'
+
+        # Returns a list of service events
+		#
+        # For more information see:
+		# http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_DescribeEvents.html
+		#
+        # === Parameters (optional)
+        # * options <~Hash> (optional):
+        # *  :start_time <~DateTime> - starting time for event records
+        # *  :end_time <~DateTime> - ending time for event records
+        # *  :duration <~Integer> - The number of minutes to retrieve events for
+		#			Default = 60 Mins
+        # *  :marker <~String> - marker provided in the previous request
+        # *  :max_records <~Integer> - the maximum number of records to include
+		#			Default = 100
+		#			Constraints: min = 20, maximum 100
+        # *  :source_identifier <~String> - identifier of the event source
+        # *  :source_type <~DateTime> - event type, one of:
+        #      (db-instance | db-parameter-group | db-security-group | db-snapshot)
+        # === Returns
+        # * response <~Excon::Response>:
+        #   * body <~Hash>
+        def describe_events(options = {})
+          request(
+            'Action'            => 'DescribeEvents',
+            'StartTime'         => options[:start_time],
+            'EndTime'           => options[:end_time],
+            'Duration'          => options[:duration],
+            'Marker'            => options[:marker],
+            'MaxRecords'        => options[:max_records],
+            'SourceIdentifier'  => options[:source_identifier],
+            'SourceType'        => options[:source_type],
+            :parser => Fog::Parsers::AWS::RDS::EventListParser.new
+          )
+        end
+
+      end
+
+      class Mock
+        def describe_events
+          Fog::Mock.not_implemented
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Fog
+  module AWS
+    class RDS
+      class Real
+
+        require 'fog/aws/parsers/rds/tag_list_parser'
+
+        # returns a Hash of tags for a database instance
+        # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_ListTagsForResource.html
+        # ==== Parameters
+        # * rds_id <~String> - name of the RDS instance whose tags are to be retrieved
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def list_tags_for_resource(rds_id)
+          request(
+            'Action'        => 'ListTagsForResource',
+            'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
+            :parser         => Fog::Parsers::AWS::RDS::TagListParser.new
+          )
+        end
+
+      end
+
+      class Mock
+
+        def list_tags_for_resource(rds_id)
+          response = Excon::Response.new
+          if server = self.data[:servers][rds_id]
+            response.status = 200
+            response.body = {
+              "ListTagsForResourceResult" =>
+                {"TagList" =>  self.data[:tags][rds_id]}
+            }
+            response
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,44 @@
+module Fog
+  module AWS
+    class RDS
+      class Real
+
+        # removes tags from a database instance
+        # http://docs.amazonwebservices.com/AmazonRDS/latest/APIReference/API_RemoveTagsFromResource.html
+        # ==== Parameters
+        # * rds_id <~String> - name of the RDS instance whose tags are to be retrieved
+        # * keys <~Array> A list of String keys for the tags to remove
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def remove_tags_from_resource(rds_id, keys)          
+          request(
+            { 'Action'        => 'RemoveTagsFromResource',
+              'ResourceName'  => "arn:aws:rds:#{@region}:#{owner_id}:db:#{rds_id}",
+              :parser         => Fog::Parsers::AWS::RDS::Base.new,
+            }.merge(Fog::AWS.indexed_param('TagKeys.member.%d', keys))
+          )
+        end
+
+      end
+
+      class Mock
+
+        def remove_tags_from_resource(rds_id, keys)
+          response = Excon::Response.new
+          if server = self.data[:servers][rds_id]
+            keys.each {|key| self.data[:tags][rds_id].delete key}
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+            }
+            response
+          else
+            raise Fog::AWS::RDS::NotFound.new("DBInstance #{rds_id} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/sqs.rb

@@ -107,7 +107,7 @@ module Fog
         end
 
         def path_from_queue_url(queue_url)
-          queue_url.split('.com', 2).last
+          queue_url.split('.com', 2).last.sub(/^:[0-9]+/, '')
         end
 
         def request(params)

data/lib/fog/aws/storage.rb

@@ -263,7 +263,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
-          
+
           if @endpoint = options[:endpoint]
             endpoint = URI.parse(@endpoint)
             @host = endpoint.host

data/lib/fog/bin/openstack.rb

@@ -7,6 +7,8 @@ class OpenStack < Fog::Bin
         Fog::Compute::OpenStack
       when :identity
         Fog::Identity::OpenStack
+      when :network
+        Fog::Network::OpenStack
       else
         raise ArgumentError, "Unrecognized service: #{key}"
       end
@@ -21,6 +23,9 @@ class OpenStack < Fog::Bin
         when :identity
           Fog::Logger.warning("OpenStack[:identity] is not recommended, use Compute[:openstack] for portability")
           Fog::Compute.new(:provider => 'OpenStack')
+        when :network
+          Fog::Logger.warning("OpenStack[:network] is not recommended, use Network[:openstack] for portability")
+          Fog::Network.new(:provider => 'OpenStack')
         else
           raise ArgumentError, "Unrecognized service: #{key.inspect}"
         end