fog 1.3.1 → 1.4.0

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

@@ -73,10 +73,10 @@ module Fog
               'imageOwnerId' => self.data[:owner_id],
               'isPublic' => false,
               'productCodes' => [],
-              'architecture' => 'i386',
+              'architecture' => options['Architecture'] || 'i386',
               'imageType' => 'machine',
-              'kernelId' => Fog::AWS::Mock.kernel_id,
-              'ramdiskId' => Fog::AWS::Mock.ramdisk_id,
+              'kernelId' => options['KernelId'] || Fog::AWS::Mock.kernel_id,
+              'ramdiskId' => options['RamdiskId'] || Fog::AWS::Mock.ramdisk_id,
               'platform' => 'Linux',
               'stateReason' => {},
               'imageOwnerAlias' => self.data[:owner_id],

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

@@ -14,10 +14,18 @@ module Fog
         #     * 'return'<~Boolean> - success?
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-ReleaseAddress.html]
-        def release_address(public_ip)
+        # 
+        # non-VPC: requires public_ip only
+        #     VPC: requires allocation_id only
+        def release_address(ip_or_allocation)
+          field = if ip_or_allocation.to_s =~ /^(\d|\.)+$/
+                    "PublicIp"
+                  else
+                    "AllocationId"
+                  end
           request(
             'Action'    => 'ReleaseAddress',
-            'PublicIp'  => public_ip,
+            field       => ip_or_allocation,
             :idempotent => true,
             :parser     => Fog::Parsers::Compute::AWS::Basic.new
           )

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

@@ -0,0 +1,56 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/describe_network_interface_attribute'
+        # Resets a network interface attribute value
+        #
+        # ==== Parameters
+        # * network_interface_id<~String> - The ID of the network interface you want to describe an attribute of
+        # * attribute<~String>            - The attribute to reset, only 'sourceDestCheck' is supported.
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2012-03-01/APIReference/ApiReference-query-DescribeNetworkInterfaceAttribute.html]
+        def reset_network_interface_attribute(network_interface_id, attribute)
+          if attribute != 'sourceDestCheck'
+            raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+          end
+          request(
+            'Action'             => 'ResetNetworkInterfaceAttribute',
+            'NetworkInterfaceId' => network_interface_id,
+            'Attribute'          => attribute,
+            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+          )
+        end
+      end
+      
+      class Mock
+        def reset_network_interface_attribute(network_interface_id, attribute)
+          response = Excon::Response.new
+          if self.data[:network_interfaces][network_interface_id]
+
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            if attribute == 'sourceDestCheck'
+              self.data[:network_interfaces][network_interface_id]['sourceDestCheck'] = true
+            else
+              raise Fog::Compute::AWS::Error.new("Illegal attribute '#{attribute}' specified")
+            end
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The network interface '#{network_interface_id}' does not exist")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -34,7 +34,7 @@ module Fog
         #   * 'SecurityGroupId'<~Array> or <~String> - id's of security group(s) for instances, use this or SecurityGroup
         #   * 'InstanceInitiatedShutdownBehaviour'<~String> - specifies whether volumes are stopped or terminated when instance is shutdown, in [stop, terminate]
         #   * 'InstanceType'<~String> - Type of instance to boot. Valid options
-        #     in ['t1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', m2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cg1.4xlarge']
+        #     in ['t1.micro', 'm1.small', 'm1.large', 'm1.xlarge', 'c1.medium', 'c1.xlarge', 'm2.xlarge', m2.2xlarge', 'm2.4xlarge', 'cc1.4xlarge', 'cc2.8xlarge', 'cg1.4xlarge']
         #     default is 'm1.small'
         #   * 'KernelId'<~String> - Id of kernel with which to launch
         #   * 'KeyName'<~String> - Name of a keypair to add to booting instances

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

@@ -27,6 +27,33 @@ module Fog
         end
 
       end
+
+      class Mock
+        def start_instances(instance_id)
+          instance_ids = Array(instance_id)
+
+          instance_set = self.data[:instances].values
+          instance_set = apply_tag_filters(instance_set, {'instance_id' => instance_ids}, 'instanceId')
+
+          if instance_set.empty?
+            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
+          else
+            response = Excon::Response.new
+            response.status = 200
+
+            response.body = {
+              'instancesSet' => instance_set.inject([]) do |ia, instance|
+                                  ia << {'currentState' => { 'code' => 0, 'name' => 'pending' },
+                                         'previousState' => instance['instanceState'],
+                                         'instanceId' => instance['instanceId'] }
+                                  instance['instanceState'] = {'code'=>0, 'name'=>'pending'}
+                                  ia
+              end
+            }
+            response
+          end
+        end
+      end
     end
   end
 end

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

@@ -28,6 +28,33 @@ module Fog
         end
 
       end
+
+      class Mock
+        def stop_instances(instance_id, force = false)
+          instance_ids = Array(instance_id)
+
+          instance_set = self.data[:instances].values
+          instance_set = apply_tag_filters(instance_set, {'instance_id' => instance_ids}, 'instanceId')
+
+          if instance_set.empty?
+            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance_ids.first}' does not exist")
+          else
+            response = Excon::Response.new
+            response.status = 200
+
+            response.body = {
+              'instancesSet' => instance_set.inject([]) do |ia, instance|
+                                  ia << {'currentState' => { 'code' => 0, 'name' => 'stopping' },
+                                         'previousState' => instance['instanceState'],
+                                         'instanceId' => instance['instanceId'] }
+                                  instance['instanceState'] = {'code'=>0, 'name'=>'stopping'}
+                                  ia
+              end
+            }
+            response
+          end
+        end
+      end
     end
   end
 end

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

@@ -6,22 +6,22 @@ module Fog
         require 'fog/aws/parsers/dns/change_resource_record_sets'
 
         # Use this action to create or change your authoritative DNS information for a zone
+        # http://docs.amazonwebservices.com/Route53/latest/DeveloperGuide/RRSchanges.html#RRSchanges_API
         #
         # ==== Parameters
         # * zone_id<~String> - ID of the zone these changes apply to
         # * options<~Hash>
         #   * comment<~String> - Any comments you want to include about the change.
-        #   * change_batch<~Array> - The information for a change request
-        #     * changes<~Hash> -
-        #       * action<~String> - 'CREATE' or 'DELETE'
-        #       * name<~String> - This must be a fully-specified name, ending with a final period
-        #       * type<~String> - A | AAAA | CNAME | MX | NS | PTR | SOA | SPF | SRV | TXT
-        #       * ttl<~Integer> - Time-to-live value - omit if using an alias record
-        #       * resource_record<~String> - Omit if using an alias record
-        #       * alias_target<~Hash> - Information about the domain to which you are redirecting traffic (Alias record sets only)
-        #         * dns_name<~String> - The Elastic Load Balancing domain to which you want to reroute traffic
-        #         * hosted_zone_id<~String> - The ID of the hosted zone that contains the Elastic Load Balancing domain to which you want to reroute traffic
-        #
+        # * change_batch<~Array> - The information for a change request
+        #   * changes<~Hash> -
+        #     * action<~String> - 'CREATE' or 'DELETE'
+        #     * name<~String>   - This must be a fully-specified name, ending with a final period
+        #     * type<~String>   - A | AAAA | CNAME | MX | NS | PTR | SOA | SPF | SRV | TXT
+        #     * ttl<~Integer>   - Time-to-live value - omit if using an alias record
+        #     * resource_records<~Array> - Omit if using an alias record
+        #     * alias_target<~Hash> - Information about the domain to which you are redirecting traffic (Alias record sets only)
+        #       * dns_name<~String> - The Elastic Load Balancing domain to which you want to reroute traffic
+        #       * hosted_zone_id<~String> - The ID of the hosted zone that contains the Elastic Load Balancing domain to which you want to reroute traffic
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
@@ -29,7 +29,31 @@ module Fog
         #       * 'Id'<~String> - The ID of the request
         #       * 'Status'<~String> - status of the request - PENDING | INSYNC
         #       * 'SubmittedAt'<~String> - The date and time the change was made
-        #   * status<~Integer> - 201 when successful
+        #   * status<~Integer> - 200 when successful
+        #
+        # ==== Examples
+        #
+        # Example changing a CNAME record:
+        #
+        #     change_batch_options = [
+        #       {
+        #         :action => "DELETE",
+        #         :name => "foo.example.com.",
+        #         :type => "CNAME",
+        #         :ttl => 3600,
+        #         :resource_records => [ "baz.example.com." ]
+        #       },
+        #       {
+        #         :action => "CREATE",
+        #         :name => "foo.example.com.",
+        #         :type => "CNAME",
+        #         :ttl => 3600,
+        #         :resource_records => [ "bar.example.com." ]
+        #       }
+        #     ]
+        #
+        #     change_resource_record_sets("ABCDEFGHIJKLMN", change_batch_options)
+        #
         def change_resource_record_sets(zone_id, change_batch, options = {})
 
           # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use
@@ -58,6 +82,17 @@ module Fog
               ttl_tag = ''
               ttl_tag += %Q{<TTL>#{change_item[:ttl]}</TTL>} unless change_item[:alias_target]
 
+              weight_tag = ''
+              set_identifier_tag = ''
+              region_tag = ''
+              if change_item[:set_identifier]
+                set_identifier_tag += %Q{<SetIdentifier>#{change_item[:set_identifier]}</SetIdentifier>}
+                if change_item[:weight] # Weighted Record
+                  weight_tag += %Q{<Weight>#{change_item[:weight]}</Weight>}
+                elsif change_item[:region] # Latency record
+                  region_tag += %Q{<Region>#{change_item[:region]}</Region>}
+                end
+              end
               resource_records = change_item[:resource_records] || []
               resource_record_tags = ''
               resource_records.each do |record|
@@ -70,17 +105,21 @@ module Fog
 
               alias_target_tag = ''
               if change_item[:alias_target]
-                alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{change_item[:alias_target][:hosted_zone_id]}</HostedZoneId><DNSName>#{change_item[:alias_target][:dns_name]}</DNSName></AliasTarget>}
+                # Accept either underscore or camel case for hash keys.
+                hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId]
+                dns_name = change_item[:alias_target][:dns_name] || change_item[:alias_target][:DNSName]
+                alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{hosted_zone_id}</HostedZoneId><DNSName>#{dns_name}</DNSName></AliasTarget>}
               end
 
-              change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}</ResourceRecordSet></Change>}
+              change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{set_identifier_tag}#{weight_tag}#{region_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}</ResourceRecordSet></Change>}
               changes += change_tags
             end
 
             changes += '</Changes></ChangeBatch>'
           end
 
-          body = %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2011-05-05/">#{changes}</ChangeResourceRecordSetsRequest>}
+
+          body = %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/">#{changes}</ChangeResourceRecordSetsRequest>}
           request({
             :body       => body,
             :parser     => Fog::Parsers::DNS::AWS::ChangeResourceRecordSets.new,
@@ -92,6 +131,61 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def change_resource_record_sets(zone_id, change_batch, options = {})
+          response = Excon::Response.new
+          errors   = []
+
+          if (zone = self.data[:zones][zone_id])
+            response.status = 200
+
+            change_batch.each do |change|
+              case change[:action]
+              when "CREATE"
+                if zone[:records][change[:type]].nil?
+                  zone[:records][change[:type]] = {}
+                end
+
+                if zone[:records][change[:type]][change[:name]].nil?
+                  zone[:records][change[:type]][change[:name]] = {
+                    :name => change[:name],
+                    :type => change[:type],
+                    :ttl => change[:ttl],
+                    :resource_records => change[:resource_records]
+                  }
+                else
+                  errors << "Tried to create resource record set #{change[:name]}. type #{change[:type]}, but it already exists"
+                end
+              when "DELETE"
+                if zone[:records][change[:type]].nil? || zone[:records][change[:type]].delete(change[:name]).nil?
+                  errors << "Tried to delete resource record set #{change[:name]}. type #{change[:type]}, but it was not found"
+                end
+              end
+            end
+
+            if errors.empty?
+              response.body = {
+                'ChangeInfo' => {
+                  'Id' => "/change/#{Fog::AWS::Mock.change_id}",
+                  'Status' => 'INSYNC',
+                  'SubmittedAt' => Time.now.utc.iso8601
+                }
+              }
+              response
+            else
+              response.status = 400
+              response.body = "<?xml version=\"1.0\"?><InvalidChangeBatch xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Messages>#{errors.map {|e| "<Message>#{e}</Message>"}.join()}</Messages></InvalidChangeBatch>"
+              raise(Excon::Errors.status_error({:expects => 200}, response))
+            end
+          else
+            response.status = 404
+            response.body = "<?xml version=\"1.0\"?><Response><Errors><Error><Code>NoSuchHostedZone</Code><Message>A hosted zone with the specified hosted zone ID does not exist.</Message></Error></Errors><RequestID>#{Fog::AWS::Mock.request_id}</RequestID></Response>"
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+        end
+      end
     end
   end
 end

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

@@ -44,7 +44,7 @@ module Fog
           end
 
           request({
-            :body    => %Q{<?xml version="1.0" encoding="UTF-8"?><CreateHostedZoneRequest xmlns="https://route53.amazonaws.com/doc/2011-05-05/"><Name>#{name}</Name>#{optional_tags}</CreateHostedZoneRequest>},
+            :body    => %Q{<?xml version="1.0" encoding="UTF-8"?><CreateHostedZoneRequest xmlns="https://route53.amazonaws.com/doc/#{@version}/"><Name>#{name}</Name>#{optional_tags}</CreateHostedZoneRequest>},
             :parser  => Fog::Parsers::DNS::AWS::CreateHostedZone.new,
             :expects => 201,
             :method  => 'POST',
@@ -54,6 +54,51 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        require 'time'
+
+        def create_hosted_zone(name, options = {})
+          response = Excon::Response.new
+          if list_hosted_zones.body['HostedZones'].find_all {|z| z['Name'] == name}.size < self.data[:limits][:duplicate_domains]
+            response.status = 201
+            if options[:caller_ref]
+              caller_ref = options[:caller_ref]
+            else
+              #make sure we have a unique call reference
+              caller_ref = "ref-#{rand(1000000).to_s}"
+            end
+            zone_id = "/hostedzone/#{Fog::AWS::Mock.zone_id}"
+            self.data[:zones][zone_id] = {
+              :id => zone_id,
+              :name => name,
+              :reference => caller_ref,
+              :comment => options[:comment],
+              :records => {}
+            }
+            response.body = {
+              'HostedZone' => {
+                'Id' => zone_id,
+                'Name' => name,
+                'CallerReference' => caller_ref,
+                'Comment' => options[:comment]
+              },
+              'ChangeInfo' => {
+                'Id' => "/change/#{Fog::AWS::Mock.change_id}",
+                'Status' => 'INSYNC',
+                'SubmittedAt' => Time.now.utc.iso8601
+              },
+              'NameServers' => Fog::AWS::Mock.nameservers
+            }
+            response
+          else
+            response.status = 400
+            response.body = "<?xml version=\"1.0\"?><Response><Errors><Error><Code>DelegationSetNotAvailable</Code><Message>Amazon Route 53 allows some duplication, but Amazon Route 53 has a maximum threshold of duplicated domains. This error is generated when you reach that threshold. In this case, the error indicates that too many hosted zones with the given domain name exist. If you want to create a hosted zone and Amazon Route 53 generates this error, contact Customer Support.</Message></Error></Errors><RequestID>#{Fog::AWS::Mock.request_id}</RequestID></Response>"
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+        end
+      end
     end
   end
 end

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

@@ -20,7 +20,7 @@ module Fog
         #       * 'Comment'<~String> -
         #     * 'NameServers'<~Array>
         #       * 'NameServer'<~String>
-        #   * status<~Integer> - 201 when successful
+        #   * status<~Integer> - 200 when successful
         def get_hosted_zone(zone_id)
 
           # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use
@@ -37,6 +37,29 @@ module Fog
         end
 
       end
+
+      class Mock
+        def get_hosted_zone(zone_id)
+          response = Excon::Response.new
+          if (zone = self.data[:zones][zone_id])
+            response.status = 200
+            response.body = {
+              'HostedZone' => {
+                'Id' => zone[:id],
+                'Name' => zone[:name],
+                'CallerReference' => zone[:reference],
+                'Comment' => zone[:comment]
+              },
+              'NameServers' => Fog::AWS::Mock.nameservers
+            }
+            response
+          else
+            response.status = 404
+            response.body = "<?xml version=\"1.0\"?><Response><Errors><Error><Code>NoSuchHostedZone</Code><Message>A hosted zone with the specified hosted zone ID does not exist.</Message></Error></Errors><RequestID>#{Fog::AWS::Mock.request_id}</RequestID></Response>"
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+        end
+      end
     end
   end
 end

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

@@ -49,6 +49,51 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def list_hosted_zones(options = {})
+
+          if options[:max_items].nil?
+            maxitems = 100
+          else
+            maxitems = options[:max_items]
+          end
+
+          if options[:marker].nil?
+            start = 0
+          else
+            start = self.data[:zones].find_index {|z| z[:id] == options[:marker]}
+          end
+
+          zones     = self.data[:zones].values[start, maxitems]
+          next_zone = self.data[:zones].values[start + maxitems]
+          truncated = !next_zone.nil?
+
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'HostedZones' => zones.map do |z|
+              {
+                'Id' => z[:id],
+                'Name' => z[:name],
+                'CallerReference' => z[:reference],
+                'Comment' => z[:comment],
+              }
+            end,
+            'Marker' => options[:marker].to_s,
+            'MaxItems' => options[:max_items].to_s,
+            'IsTruncated' => truncated.to_s
+          }
+
+          if truncated
+            response.body['NextMarker'] = next_zone[:id]
+          end
+
+          response
+        end
+
+      end
     end
   end
 end