fog 1.1.2 → 1.2.0

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

@@ -0,0 +1,52 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/delete_vpc'
+
+        # Deletes a VPC. You must detach or delete all gateways or other objects
+        # that are dependent on the VPC first. For example, you must terminate
+        # all running instances, delete all VPC security groups (except the
+        # default), delete all the route tables (except the default), etc.
+        #
+        # ==== Parameters
+        # * vpc_id<~String> - The ID of the VPC you want to delete.
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String> - Id of request
+        # * 'return'<~Boolean> - Returns true if the request succeeds.
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-DeleteVpc.html]
+        def delete_vpc(vpc_id)
+          request(
+            'Action' => 'DeleteVpc',
+            'VpcId' => vpc_id,
+            :parser => Fog::Parsers::Compute::AWS::DeleteVpc.new
+          )
+        end
+      end
+      
+      class Mock
+        def delete_vpc(vpc_id)
+          Excon::Response.new.tap do |response|
+            if vpc_id
+              response.status = 200
+            
+              response.body = {
+                'requestId' => Fog::AWS::Mock.request_id,
+                'return' => true
+              }
+            else
+              message = 'MissingParameter => '
+              message << 'The request must contain the parameter vpc_id'
+              raise Fog::Compute::AWS::Error.new(message)
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -73,6 +73,8 @@ module Fog
             if permission_key = filter_key.split('ip-permission.')[1]
               if permission_key == 'group-name'
                 security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['groupName'])}}
+              elsif permission_key == 'group-id'
+                security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['groupId'])}}
               elsif permission_key == 'user-id'
                 security_group_info = security_group_info.reject{|security_group| !security_group['ipPermissions']['groups'].detect {|group| [*filter_value].include?(group['userId'])}}
               else

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

@@ -0,0 +1,66 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/describe_subnets'
+
+        # Describe all or specified subnets
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String> - Id of request
+        # * 'subnetSet'<~Array>:
+        # * 'subnetId'<~String> - The Subnet's ID
+        # * 'state'<~String> - The current state of the Subnet. ['pending', 'available']
+        # * 'vpcId'<~String> - The ID of the VPC the subnet is in
+        # * '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 instances are considered unavailable)
+        # * 'availabilityZone'<~String> - The Availability Zone the subnet is in.
+        # * 'tagSet'<~Array>: Tags assigned to the resource.
+        # * 'key'<~String> - Tag's key
+        # * 'value'<~String> - Tag's value
+        # * 'instanceTenancy'<~String> - The allowed tenancy of instances launched into the Subnet.
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-DescribeSubnets.html]
+        def describe_subnets(filters = {})
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("describe_subnets with #{filters.class} param is deprecated, use describe_subnets('subnet-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'subnet-id' => [*filters]}
+          end
+          params = Fog::AWS.indexed_filters(filters)
+          request({
+            'Action'    => 'DescribeSubnets',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::DescribeSubnets.new
+          }.merge!(params))
+        end
+      end
+      
+      class Mock
+        def describe_subnets(filters = {})
+          Excon::Response.new.tap do |response|
+            response.status = 200
+            response.body = {
+              'requestId'  => Fog::AWS::Mock.request_id,
+              'subnetSet'  => [
+                'subnetId'                 => Fog::AWS::Mock.request_id,
+                'state'                    => 'pending',
+                'vpcId'                    => Fog::AWS::Mock.request_id,
+                'cidrBlock'                => '10.255.255.0/24',
+                'availableIpAddressCount'  => 255,
+                'availabilityZone'         => 'us-east-1c',
+                'tagSet'                   => {}
+              ]
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/describe_volume_status'
+
+        # http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumeStatus.html
+        def describe_volume_status(filters = {})
+          raise ArgumentError.new("Filters must be a hash, but is a #{filters.class}.") unless filters.is_a?(Hash)
+          next_token = filters.delete('nextToken') || filters.delete('NextToken')
+          max_results = filters.delete('maxResults') || filters.delete('MaxResults')
+          volume_ids = filters.delete('VolumeId')
+
+          params = Fog::AWS.indexed_filters(filters)
+
+          params['NextToken'] = next_token if next_token
+          params['MaxResults'] = max_results if max_results
+
+          Array(volume_ids).inject(1) do |idx, vid|
+            params["VolumeId.#{idx}"] = vid
+            idx += 1
+          end
+
+          pp params
+          request({
+            'Action'    => 'DescribeVolumeStatus',
+            :idempotent => true,
+            :parser     => Fog::Parsers::Compute::AWS::DescribeVolumeStatus.new
+          }.merge!(params))
+        end
+      end
+
+      class Mock
+        def describe_volume_status(filters = {})
+          response = Excon::Response.new
+          response.status = 200
+
+          response.body = {
+            'volumeStatusSet' => [],
+            'requestId' => Fog::AWS::Mock.request_id
+          }
+
+          response
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,62 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+
+        require 'fog/aws/parsers/compute/describe_vpcs'
+
+        # Describe all or specified vpcs
+        #
+        # ==== Parameters
+        # * filters<~Hash> - List of filters to limit results with
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String> - Id of request
+        # * 'vpcSet'<~Array>:
+        # * 'vpcId'<~String> - The VPC's ID
+        # * 'state'<~String> - The current state of the VPC. ['pending', 'available']
+        # * 'cidrBlock'<~String> - The CIDR block the VPC covers.
+        # * 'dhcpOptionsId'<~String> - The ID of the set of DHCP options.
+        # * 'tagSet'<~Array>: Tags assigned to the resource.
+        # * 'key'<~String> - Tag's key
+        # * 'value'<~String> - Tag's value
+        # * 'instanceTenancy'<~String> - The allowed tenancy of instances launched into the VPC.
+        #
+        # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/2011-07-15/APIReference/index.html?ApiReference-query-DescribeVpcs.html]
+        def describe_vpcs(filters = {})
+          unless filters.is_a?(Hash)
+            Fog::Logger.warning("describe_vpcs with #{filters.class} param is deprecated, use describe_vpcs('vpc-id' => []) instead [light_black](#{caller.first})[/]")
+            filters = {'vpc-id' => [*filters]}
+          end
+          params = Fog::AWS.indexed_filters(filters)
+          request({
+            'Action' => 'DescribeVpcs',
+            :idempotent => true,
+            :parser => Fog::Parsers::Compute::AWS::DescribeVpcs.new
+          }.merge!(params))
+        end
+      end
+      
+      class Mock
+        def describe_vpcs(filters = {})
+          Excon::Response.new.tap do |response|
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'vpcSet'    => [
+                'vpcId'           => Fog::AWS::Mock.request_id,
+                'state'           => 'pending',
+                'cidrBlock'       => '10.255.255.0/24',
+                'dhcpOptionsId'   => Fog::AWS::Mock.request_id,
+                'instanceTenancy' => 'default',
+                'tagSet'          =>  {}
+              ]
+            }
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -41,14 +41,19 @@ module Fog
         def detach_volume(volume_id, options = {})
           response = Excon::Response.new
           response.status = 200
-          if (volume = self.data[:volumes][volume_id]) && !volume['attachmentSet'].empty?
-            data = volume['attachmentSet'].pop
-            volume['status'] = 'available'
-            response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id
-            }.merge!(data)
-            response
+          if (volume = self.data[:volumes][volume_id])
+            if !volume['attachmentSet'].empty?
+              data = volume['attachmentSet'].pop
+              volume['status'] = 'available'
+              response.status = 200
+              response.body = {
+                'requestId' => Fog::AWS::Mock.request_id
+              }.merge!(data)
+              response
+            else
+              # real response has spacing issue below
+              raise Fog::Compute::AWS::Error.new("IncorrectState => Volume '#{volume_id}'is in the 'available' state.")
+            end
           else
             raise Fog::Compute::AWS::NotFound.new("The volume '#{volume_id}' does not exist.")
           end

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

@@ -9,6 +9,7 @@ module Fog
         #
         # ==== Parameters
         # * public_ip<~String> - Public ip to assign to instance
+        # * association_id<~String> - Id associating eip to an network interface
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -17,12 +18,13 @@ module Fog
         #     * 'return'<~Boolean> - success?
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DisassociateAddress.html]
-        def disassociate_address(public_ip)
+        def disassociate_address(public_ip=nil, association_id=nil)
           request(
-            'Action'    => 'DisassociateAddress',
-            'PublicIp'  => public_ip,
-            :idempotent => true,
-            :parser     => Fog::Parsers::Compute::AWS::Basic.new
+            'Action'        => 'DisassociateAddress',
+            'PublicIp'      => public_ip,
+            'AssociationId' => association_id,
+            :idempotent     => true,
+            :parser         => Fog::Parsers::Compute::AWS::Basic.new
           )
         end
 

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

@@ -25,7 +25,8 @@ module Fog
         #   * 'LaunchSpecification.KeyName'<~String> - Name of a keypair to add to booting instances
         #   * 'LaunchSpecification.Monitoring.Enabled'<~Boolean> - Enables monitoring, defaults to disabled
         #   * 'LaunchSpecification.Placement.AvailabilityZone'<~String> - Placement constraint for instances
-        #   * 'LaunchSpecification.SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances
+        #   * 'LaunchSpecification.SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances, not supported in VPC
+        #   * 'LaunchSpecification.SecurityGroupId'<~Array> or <~String> - Id of security group(s) for instances, use this or LaunchSpecification.SecurityGroup
         #   * 'LaunchSpecification.UserData'<~String> -  Additional data to provide to booting instances
         #   * 'Type'<~String> - spot instance request type in ['one-time', 'persistent']
         #   * 'ValidFrom'<~Time> - start date for request
@@ -64,6 +65,9 @@ module Fog
           if security_groups = options.delete('LaunchSpecification.SecurityGroup')
             options.merge!(Fog::AWS.indexed_param('LaunchSpecification.SecurityGroup', [*security_groups]))
           end
+          if security_group_ids = options.delete('LaunchSpecification.SecurityGroupId')
+            options.merge!(Fog::AWS.indexed_param('LaunchSpecification.SecurityGroupId', [*security_group_ids]))
+          end
           if options['LaunchSpecification.UserData']
             options['LaunchSpecification.UserData'] = Base64.encode64(options['LaunchSpecification.UserData'])
           end

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

@@ -8,8 +8,10 @@ module Fog
         # Remove permissions from a security group
         #
         # ==== Parameters
-        # * group_name<~String> - Name of group
+        # * group_name<~String> - Name of group, optional (can also be specifed as GroupName in options)
         # * options<~Hash>:
+        #   * 'GroupName'<~String> - Name of security group to modify
+        #   * 'GroupId'<~String> - Id of security group to modify
         #   * 'SourceSecurityGroupName'<~String> - Name of security group to authorize
         #   * 'SourceSecurityGroupOwnerId'<~String> - Name of owner to authorize
         #   or
@@ -39,11 +41,7 @@ module Fog
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RevokeSecurityGroupIngress.html]
         def revoke_security_group_ingress(group_name, options = {})
-          if group_name.is_a?(Hash)
-            Fog::Logger.deprecation("Fog::AWS::Compute#revoke_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
-            options = group_name
-            group_name = options.delete('GroupName')
-          end
+          options = Fog::AWS.parse_security_group_options(group_name, options)
 
           if ip_permissions = options.delete('IpPermissions')
             options.merge!(indexed_ip_permissions_params(ip_permissions))
@@ -51,7 +49,6 @@ module Fog
 
           request({
             'Action'    => 'RevokeSecurityGroupIngress',
-            'GroupName' => group_name,
             :idempotent => true,
             :parser     => Fog::Parsers::Compute::AWS::Basic.new
           }.merge!(options))
@@ -62,18 +59,19 @@ module Fog
       class Mock
 
         def revoke_security_group_ingress(group_name, options = {})
-          if group_name.is_a?(Hash)
-            Fog::Logger.deprecation("Fog::AWS::Compute#revoke_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
-            options = group_name
-            group_name = options.delete('GroupName')
+          options = Fog::AWS.parse_security_group_options(group_name, options)
+          if options.key?('GroupName')
+            group_name = options['GroupName']
+          else
+            group_name = self.data[:security_groups].reject { |k,v| v['groupId'] != options['GroupId'] } .keys.first
           end
 
-          verify_permission_options(options)
-
           response = Excon::Response.new
           group = self.data[:security_groups][group_name]
 
           if group
+            verify_permission_options(options, group['vpcId'] != nil)
+
             normalized_permissions = normalize_permissions(options)
 
             normalized_permissions.each do |permission|

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

@@ -30,7 +30,8 @@ module Fog
         #     * 'Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
         #   * 'ClientToken'<~String> - unique case-sensitive token for ensuring idempotency
         #   * 'DisableApiTermination'<~Boolean> - specifies whether or not to allow termination of the instance from the api
-        #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (you must omit this parameter if using Virtual Private Clouds)
+        #   * 'SecurityGroup'<~Array> or <~String> - Name of security group(s) for instances (not supported for VPC)
+        #   * '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']
@@ -97,6 +98,9 @@ module Fog
           if security_groups = options.delete('SecurityGroup')
             options.merge!(Fog::AWS.indexed_param('SecurityGroup', [*security_groups]))
           end
+          if security_group_ids = options.delete('SecurityGroupId')
+            options.merge!(Fog::AWS.indexed_param('SecurityGroupId', [*security_group_ids]))
+          end
           if options['UserData']
             options['UserData'] = Base64.encode64(options['UserData'])
           end

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

@@ -13,11 +13,14 @@ module Fog
         #   * 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'
+        #       * 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> - 
-        #       * resource_record<~String>
+        #       * 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
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -29,43 +32,55 @@ module Fog
         #   * status<~Integer> - 201 when successful
         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 
+          # AWS methods return zone_ids that looks like '/hostedzone/id'.  Let the caller either use
           # that form or just the actual id (which is what this request needs)
           zone_id = zone_id.sub('/hostedzone/', '')
 
           optional_tags = ''
-          options.each { |option, value|
+          options.each do |option, value|
             case option
             when :comment
-              optional_tags+= "<Comment>#{value}</Comment>"
+              optional_tags += "<Comment>#{value}</Comment>"
             end
-          }
-          
+          end
+
           #build XML
           if change_batch.count > 0
-            
-            changes= "<ChangeBatch>#{optional_tags}<Changes>"
-            
-            change_batch.each { |change_item|
+
+            changes = "<ChangeBatch>#{optional_tags}<Changes>"
+
+            change_batch.each do |change_item|
               action_tag = %Q{<Action>#{change_item[:action]}</Action>}
-              name_tag = %Q{<Name>#{change_item[:name]}</Name>}
-              type_tag = %Q{<Type>#{change_item[:type]}</Type>}
-              ttl_tag = %Q{<TTL>#{change_item[:ttl]}</TTL>}
-              resource_records= change_item[:resource_records]
+              name_tag   = %Q{<Name>#{change_item[:name]}</Name>}
+              type_tag   = %Q{<Type>#{change_item[:type]}</Type>}
+
+              # TTL must be omitted if using an alias record
+              ttl_tag = ''
+              ttl_tag += %Q{<TTL>#{change_item[:ttl]}</TTL>} unless change_item[:alias_target]
+
+              resource_records = change_item[:resource_records] || []
               resource_record_tags = ''
-              resource_records.each { |record|
-                resource_record_tags+= %Q{<ResourceRecord><Value>#{record}</Value></ResourceRecord>}
-              }
-              resource_tag=  %Q{<ResourceRecords>#{resource_record_tags}</ResourceRecords>}
-              
-              change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{ttl_tag}#{resource_tag}</ResourceRecordSet></Change>}
-              changes+= change_tags
-            }          
-            
-            changes+= '</Changes></ChangeBatch>'
+              resource_records.each do |record|
+                resource_record_tags += %Q{<ResourceRecord><Value>#{record}</Value></ResourceRecord>}
+              end
+
+              # ResourceRecords must be omitted if using an alias record
+              resource_tag = ''
+              resource_tag += %Q{<ResourceRecords>#{resource_record_tags}</ResourceRecords>} if resource_records.any?
+
+              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>}
+              end
+
+              change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_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/2010-10-01/">#{changes}</ChangeResourceRecordSetsRequest>}
+          body = %Q{<?xml version="1.0" encoding="UTF-8"?><ChangeResourceRecordSetsRequest xmlns="https://route53.amazonaws.com/doc/2011-05-05/">#{changes}</ChangeResourceRecordSetsRequest>}
           request({
             :body       => body,
             :parser     => Fog::Parsers::DNS::AWS::ChangeResourceRecordSets.new,