fog 1.18.0 → 1.19.0

data/lib/fog/aws/requests/auto_scaling/create_launch_configuration.rb

@@ -83,8 +83,10 @@ module Fog
             raise Fog::AWS::AutoScaling::IdentifierTaken.new("Launch Configuration by this name already exists - A launch configuration already exists with the name #{launch_configuration_name}")
           end
           self.data[:launch_configurations][launch_configuration_name] = {
+            'AssociatePublicIpAddress' => nil,
             'BlockDeviceMappings'     => [],
             'CreatedTime'             => Time.now.utc,
+            'IamInstanceProfile'      => nil,
             'ImageId'                 => image_id,
             'InstanceMonitoring'      => {'Enabled' => true},
             'InstanceType'            => instance_type,

data/lib/fog/aws/requests/auto_scaling/describe_notification_configurations.rb

@@ -11,7 +11,7 @@ module Fog
         #
         # ==== Parameters
         # * options<~Hash>:
-        #   * 'AutoScalingGroupsName'<~String> - The name of the Auto Scaling
+        #   * 'AutoScalingGroupNames'<~String> - The name of the Auto Scaling
         #     group.
         #   * 'MaxRecords'<~Integer> - The maximum number of records to return.
         #   * 'NextToken'<~String> - A string that is used to mark the start of

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

@@ -0,0 +1,60 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/assign_private_ip_addresses'
+
+        # Assigns one or more secondary private IP addresses to the specified network interface.
+        #
+        # ==== Parameters
+        # * NetworkInterfaceId<~String> - The ID of the network interface
+        # * PrivateIpAddresses<~Array> - One or more IP addresses to be assigned as a secondary private IP address (conditional)
+        # * SecondaryPrivateIpAddressCount<~String> - The number of secondary IP addresses to assign (conditional)
+        # * AllowReassignment<~Boolean> - Whether to reassign an IP address
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - The ID of the request.
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-AssignPrivateIpAddresses.html]
+        def assign_private_ip_addresses(network_interface_id, options={})
+
+          if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
+            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+          end
+          
+          if private_ip_addresses = options.delete('PrivateIpAddresses')
+            options.merge!(Fog::AWS.indexed_param('PrivateIpAddress.%d', [*private_ip_addresses]))
+          end
+          
+          request({
+            'Action'  => 'AssignPrivateIpAddresses',
+            'NetworkInterfaceId' => network_interface_id,
+            :parser   => Fog::Parsers::Compute::AWS::AssignPrivateIpAddresses.new
+          }.merge(options))
+        end
+
+      end
+
+      class Mock
+
+        def assign_private_ip_addresses(network_interface_id, options={})
+          if options['PrivateIpAddresses'] && options['SecondaryPrivateIpAddressCount']
+            raise Fog::Compute::AWS::Error.new("You may specify secondaryPrivateIpAddressCount or specific secondary private IP addresses, but not both.")
+          end
+          
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            'requestId' => Fog::AWS::Mock.request_id,
+            'return' => true
+          }
+          response
+        end
+
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Fog
         # * RouteTableId<~String> - The ID of the route table for the route.
         # * DestinationCidrBlock<~String> - The CIDR address block used for the destination match. Routing decisions are based on the most specific match.
         # * GatewayId<~String> - The ID of an Internet gateway attached to your VPC.
-        # * InstanceId<~String> - he ID of a NAT instance in your VPC. The operation fails if you specify an instance ID unless exactly one network interface is attached.
+        # * InstanceId<~String> - The ID of a NAT instance in your VPC. The operation fails if you specify an instance ID unless exactly one network interface is attached.
         # * NetworkInterfaceId<~String> - The ID of a network interface.
         #
         # === Returns

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

@@ -43,7 +43,7 @@ module Fog
           options = {}
           for key in ['ExecutableBy', 'ImageId', 'Owner']
             if filters.is_a?(Hash) && filters.key?(key)
-              options[key] = filters.delete(key)
+              options.merge!(Fog::AWS.indexed_request_param(key, filters.delete(key)))
             end
           end
           params = Fog::AWS.indexed_filters(filters).merge!(options)

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

@@ -46,6 +46,14 @@ module Fog
         def describe_subnets(filters = {})
           subnets = self.data[:subnets]
 
+          # Transition from pending to available
+          subnets.each do |subnet|
+            case subnet['state']
+              when 'pending'
+                subnet['state'] = 'available'
+            end
+          end
+
           if filters['subnet-id']
             subnets = subnets.reject {|subnet| subnet['subnetId'] != filters['subnet-id']}
           end

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

@@ -43,6 +43,14 @@ module Fog
         def describe_vpcs(filters = {})
           vpcs = self.data[:vpcs]
 
+          # Transition from pending to available
+          vpcs.each do |vpc|
+            case vpc['state']
+              when 'pending'
+                vpc['state'] = 'available'
+            end
+          end
+
           if filters['vpc-id']
             vpcs = vpcs.reject {|vpc| vpc['vpcId'] != filters['vpc-id']}
           end

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

@@ -0,0 +1,59 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/basic'
+
+        # Modifies the specified attribute of the specified VPC.
+        #
+        # ==== Parameters
+        # * vpc_id<~String> - The ID of the VPC.
+        # * options<~Hash>:
+        #   * enableDnsSupport<~Boolean> - Indicates whether DNS resolution is supported for the VPC. If this attribute is true, the Amazon DNS
+        #     server resolves DNS hostnames for your instances to their corresponding IP addresses; otherwise, it does not.
+        #   * enableDnsHostnames<~Boolean> - Indicates whether the instances launched in the VPC get DNS hostnames. If this attribute is true, 
+        #     instances in the VPC get DNS hostnames; otherwise, they do not. You can only set enableDnsHostnames to true if you also set the 
+        #     EnableDnsSupport attribute to true.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'requestId'<~String> - Id of request
+        #     * 'return'<~Boolean> - success?
+        #
+        # {Amazon API Reference}[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-ModifyVpcAttribute.html]
+        def modify_vpc_attribute(vpc_id, options = {})
+          request({
+            'Action'             => 'ModifyVpcAttribute',
+            'VpcId'              => vpc_id,
+            :idempotent          => true,
+            :parser              => Fog::Parsers::Compute::AWS::Basic.new
+          }.merge!(options))
+        end
+
+      end
+
+      class Mock
+
+        def modify_vpc_attribute(vpc_id, options = {})
+          response = Excon::Response.new
+          if options.size == 0
+            raise Fog::Compute::AWS::Error.new("InvalidParameterCombination => No attributes specified.")
+          elsif options.size > 1
+            raise Fog::Compute::AWS::Error.new("InvalidParameterCombination =>  InvalidParameterCombination => Fields for multiple attribute types specified: #{options.keys.join(', ')}")
+          elsif self.data[:vpcs].select{|x| x['vpcId'] == vpc_id}.size
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'return'    => true
+            }
+            response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The vpc '#{vpc_id}' does not exist.")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -141,6 +141,7 @@ module Fog
           if (zone = self.data[:zones][zone_id])
             response.status = 200
 
+            change_id = Fog::AWS::Mock.change_id
             change_batch.each do |change|
               case change[:action]
               when "CREATE"
@@ -149,12 +150,23 @@ module Fog
                 end
 
                 if zone[:records][change[:type]][change[:name]].nil?
+                  # raise change.to_s if change[:resource_records].nil?
+                  zone[:records][change[:type]][change[:name]] = 
+                  if change[:alias_target]
+                    record = {
+                      :alias_target => change[:alias_target]
+                    }
+                  else
+                    record = {
+                      :ttl => change[:ttl].to_s,
+                    }
+                  end
                   zone[:records][change[:type]][change[:name]] = {
+                    :change_id => change_id,
+                    :resource_records => change[:resource_records] || [],
                     :name => change[:name],
-                    :type => change[:type],
-                    :ttl => change[:ttl],
-                    :resource_records => change[:resource_records]
-                  }
+                    :type => change[:type]
+                  }.merge(record)
                 else
                   errors << "Tried to create resource record set #{change[:name]}. type #{change[:type]}, but it already exists"
                 end
@@ -166,12 +178,16 @@ module Fog
             end
 
             if errors.empty?
+              change = {
+                :id => change_id,
+                :status => 'PENDING',
+                :submitted_at => Time.now.utc.iso8601
+              }
+              self.data[:changes][change[:id]] = change
               response.body = {
-                'ChangeInfo' => {
-                  'Id' => "/change/#{Fog::AWS::Mock.change_id}",
-                  'Status' => 'INSYNC',
-                  'SubmittedAt' => Time.now.utc.iso8601
-                }
+                'Id' => change[:id],
+                'Status' => change[:status],
+                'SubmittedAt' => change[:submitted_at]
               }
               response
             else
@@ -184,6 +200,7 @@ module Fog
             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
 

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

@@ -60,6 +60,9 @@ module Fog
         require 'time'
 
         def create_hosted_zone(name, options = {})
+          # Append a trailing period to the name if absent.
+          name = name + "." unless name.end_with?(".")
+
           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
@@ -77,6 +80,12 @@ module Fog
               :comment => options[:comment],
               :records => {}
             }
+            change = {
+              :id => Fog::AWS::Mock.change_id,
+              :status => 'PENDING',
+              :submitted_at => Time.now.utc.iso8601
+            }
+            self.data[:changes][change[:id]] = change
             response.body = {
               'HostedZone' => {
                 'Id' => zone_id,
@@ -85,9 +94,9 @@ module Fog
                 'Comment' => options[:comment]
               },
               'ChangeInfo' => {
-                'Id' => "/change/#{Fog::AWS::Mock.change_id}",
-                'Status' => 'INSYNC',
-                'SubmittedAt' => Time.now.utc.iso8601
+                'Id' => change[:id],
+                'Status' => change[:status],
+                'SubmittedAt' => change[:submitted_at]
               },
               'NameServers' => Fog::AWS::Mock.nameservers
             }

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

@@ -34,6 +34,39 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        require 'time'
+
+        def delete_hosted_zone(zone_id)
+          response = Excon::Response.new
+          key = [zone_id, "/hostedzone/#{zone_id}"].find{|k| !self.data[:zones][k].nil?}
+          if key
+            change = {
+              :id => Fog::AWS::Mock.change_id,
+              :status => 'INSYNC',
+              :submitted_at => Time.now.utc.iso8601
+            }
+            self.data[:changes][change[:id]] = change
+            response.status = 200
+            response.body = {
+              'ChangeInfo' => {
+                'Id' => change[:id],
+                'Status' => change[:status],
+                'SubmittedAt' => change[:submitted_at]
+              }
+            }
+            self.data[:zones].delete(key)
+            response
+          else
+            response.status = 404
+            response.body = "<?xml version=\"1.0\"?><ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchHostedZone</Code><Message>The specified hosted zone does not exist.</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+        end
+      end
+
     end
   end
 end

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

@@ -33,6 +33,32 @@ module Fog
         end
 
       end
+
+      class Mock
+        def get_change(change_id)
+          response = Excon::Response.new
+          # find the record with matching change_id
+          # records = data[:zones].values.map{|z| z[:records].values.map{|r| r.values}}.flatten
+          change = self.data[:changes][change_id]
+
+          if change
+            response.status = 200
+            submitted_at = Time.parse(change[:submitted_at])
+            response.body = {
+              'Id' => change[:id],
+              # set as insync after some time
+              'Status' => (submitted_at + Fog::Mock.delay) < Time.now ? 'INSYNC' : change[:status],
+              'SubmittedAt' => change[:submitted_at]
+            }
+            response
+          else
+            response.status = 404
+            response.body = "<?xml version=\"1.0\"?><ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchChange</Code><Message>Could not find resource with ID: #{change_id}</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+        end
+      end
+
     end
   end
 end

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

@@ -55,7 +55,7 @@ module Fog
             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>"
+            response.body = "<?xml version=\"1.0\"?><ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchHostedZone</Code><Message>The specified hosted zone does not exist.</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
             raise(Excon::Errors.status_error({:expects => 200}, response))
           end
         end

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

@@ -53,12 +53,7 @@ module Fog
       class Mock
 
         def list_hosted_zones(options = {})
-
-          if options[:max_items].nil?
-            maxitems = 100
-          else
-            maxitems = options[:max_items]
-          end
+          maxitems = [options[:max_items]||100,100].min
 
           if options[:marker].nil?
             start = 0
@@ -82,8 +77,8 @@ module Fog
               }
             end,
             'Marker' => options[:marker].to_s,
-            'MaxItems' => options[:max_items].to_s,
-            'IsTruncated' => truncated.to_s
+            'MaxItems' => maxitems,
+            'IsTruncated' => truncated
           }
 
           if truncated

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

@@ -60,6 +60,74 @@ module Fog
         end
 
       end
+
+      class Mock
+
+        def list_resource_record_sets(zone_id, options = {})
+          maxitems = [options[:max_items]||100,100].min
+
+          response = Excon::Response.new
+
+          zone = self.data[:zones][zone_id]
+          if zone.nil?
+            response.status = 404
+            response.body = "<?xml version=\"1.0\"?>\n<ErrorResponse xmlns=\"https://route53.amazonaws.com/doc/2012-02-29/\"><Error><Type>Sender</Type><Code>NoSuchHostedZone</Code><Message>No hosted zone found with ID: #{zone_id}</Message></Error><RequestId>#{Fog::AWS::Mock.request_id}</RequestId></ErrorResponse>"
+            raise(Excon::Errors.status_error({:expects => 200}, response))
+          end
+
+          if options[:type]
+            records = zone[:records][options[:type]].values
+          else
+            records = zone[:records].values.map{|r| r.values}.flatten
+          end
+
+          # sort for pagination
+          records.sort! { |a,b| a[:name].gsub(zone[:name],"") <=> b[:name].gsub(zone[:name],"") }
+
+          if options[:name]
+            name = options[:name].gsub(zone[:name],"")
+            records = records.select{|r| r[:name].gsub(zone[:name],"") >= name }
+            require 'pp'
+          end
+
+          next_record  = records[maxitems]
+          records      = records[0, maxitems]
+          truncated    = !next_record.nil?
+
+          response.status = 200
+          response.body = {
+            'ResourceRecordSets' => records.map do |r|
+              if r[:alias_target]
+                record = {
+                  'AliasTarget' => {
+                    'HostedZoneId' => r[:alias_target][:hosted_zone_id],
+                    'DNSName' => r[:alias_target][:dns_name]
+                  }
+                }
+              else
+                record = {
+                  'TTL' => r[:ttl]
+                }
+              end
+              {
+                'ResourceRecords' => r[:resource_records],
+                'Name' => r[:name],
+                'Type' => r[:type]
+              }.merge(record)
+            end,
+            'MaxItems' => maxitems,
+            'IsTruncated' => truncated
+          }
+
+          if truncated
+            response.body['NextRecordName'] = next_record[:name]
+            response.body['NextRecordType'] = next_record[:type]
+          end
+
+          response
+        end
+
+      end
     end
   end
 end