fog 1.5.0 → 1.6.0

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

@@ -11,6 +11,7 @@ module Fog
           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')
+          all_instances = filters.delete('includeAllInstances') || filters.delete('IncludeAllInstances')
 
           params = Fog::AWS.indexed_request_param('InstanceId', filters.delete('InstanceId'))
 
@@ -18,6 +19,7 @@ module Fog
 
           params['NextToken'] = next_token if next_token
           params['MaxResults'] = max_results if max_results
+          params['IncludeAllInstances'] = all_instances if all_instances
 
           request({
             'Action'    => 'DescribeInstanceStatus',

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

@@ -29,6 +29,7 @@ module Fog
         #             * 'status'<~String> - status of attached volume
         #             * 'volumeId'<~String> - Id of attached volume
         #           * 'dnsName'<~String> - public dns name, blank until instance is running
+        #           * 'ebsOptimized'<~Boolean> - Whether the instance is optimized for EBS I/O
         #           * 'imageId'<~String> - image id of ami used to launch instance
         #           * 'instanceId'<~String> - id of the instance
         #           * 'instanceState'<~Hash>:
@@ -206,11 +207,12 @@ module Fog
 
               reservation_set[instance['reservationId']] ||= {
                 'groupSet'      => instance['groupSet'],
+                'groupIds'      => instance['groupIds'],
                 'instancesSet'  => [],
                 'ownerId'       => instance['ownerId'],
                 'reservationId' => instance['reservationId']
               }
-              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
+              reservation_set[instance['reservationId']]['instancesSet'] << instance.reject{|key,value| !['amiLaunchIndex', 'architecture', 'blockDeviceMapping', 'clientToken', 'dnsName', 'ebsOptimized', 'iamInstanceProfile', 'imageId', 'instanceId', 'instanceState', 'instanceType', 'ipAddress', 'kernelId', 'keyName', 'launchTime', 'monitoring', 'networkInterfaces', 'ownerId', 'placement', 'platform', 'privateDnsName', 'privateIpAddress', 'productCodes', 'ramdiskId', 'reason', 'rootDeviceType', 'stateReason'].include?(key)}.merge('tagSet' => self.data[:tag_sets][instance['instanceId']])
             end
           end
 

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

@@ -37,16 +37,22 @@ module Fog
           }.merge!(params))
         end
       end
-      
+
       class Mock
         def describe_internet_gateways(filters = {})
-          Excon::Response.new.tap do |response|
-            response.status = 200
-            response.body = {
-              'requestId' => Fog::AWS::Mock.request_id,
-              'internetGatewaySet'    => self.data[:internet_gateways]
-            }
+          internet_gateways = self.data[:internet_gateways]
+
+          if filters['internet-gateway-id']
+            internet_gateways = internet_gateways.reject {|internet_gateway| internet_gateway['internetGatewayId'] != filters['internet-gateway-id']}
           end
+
+          Excon::Response.new(
+            :status => 200,
+            :body   => {
+              'requestId'           => Fog::AWS::Mock.request_id,
+              'internetGatewaySet'  => internet_gateways
+            }
+          )
         end
       end
     end

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

@@ -25,6 +25,7 @@ module Fog
         #         * 'imageId'<~String> - AMI for instance
         #         * 'instanceType'<~String> - type for instance
         #         * 'monitoring'<~Boolean> - monitoring status for instance
+        #         * 'subnetId'<~String> - VPC subnet ID for instance
         #       * 'productDescription'<~String> - general description of AMI
         #       * 'spotInstanceRequestId'<~String> - id of spot instance request
         #       * 'spotPrice'<~Float> - maximum price for instances to be launched

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

@@ -41,16 +41,22 @@ module Fog
           }.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'  => self.data[:subnets]
-            }
+          subnets = self.data[:subnets]
+
+          if filters['subnet-id']
+            subnets = subnets.reject {|subnet| subnet['subnetId'] != filters['subnet-id']}
           end
+
+          Excon::Response.new(
+            :status => 200,
+            :body   => {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'subnetSet' => subnets
+            }
+          )
         end
       end
     end

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

@@ -16,10 +16,12 @@ module Fog
         #     * 'volumeSet'<~Array>:
         #       * 'availabilityZone'<~String> - Availability zone for volume
         #       * 'createTime'<~Time> - Timestamp for creation
+        #       * 'iops'<~Integer> - Number of IOPS volume supports
         #       * 'size'<~Integer> - Size in GiBs for volume
         #       * 'snapshotId'<~String> - Snapshot volume was created from, if any
         #       * 'status'<~String> - State of volume
         #       * 'volumeId'<~String> - Reference to volume
+        #       * 'volumeType'<~String> - Type of volume
         #       * 'attachmentSet'<~Array>:
         #         * 'attachmentTime'<~Time> - Timestamp for attachment
         #         * 'deleteOnTermination'<~Boolean> - Whether or not to delete volume on instance termination

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

@@ -38,16 +38,22 @@ module Fog
           }.merge!(params))
         end
       end
-      
+
       class Mock
         def describe_vpcs(filters = {})
-          Excon::Response.new.tap do |response|
-            response.status = 200
-            response.body = {
+          vpcs = self.data[:vpcs]
+
+          if filters['vpc-id']
+            vpcs = vpcs.reject {|vpc| vpc['vpcId'] != filters['vpc-id']}
+          end
+
+          Excon::Response.new(
+            :status => 200,
+            :body   => {
               'requestId' => Fog::AWS::Mock.request_id,
-              'vpcSet'    => self.data[:vpcs]
+              'vpcSet'    => vpcs
             }
-          end
+          )
         end
       end
     end

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

@@ -24,6 +24,7 @@ module Fog
         #     * 'Ebs.DeleteOnTermination'<~String> - specifies whether or not to delete the volume on instance termination
         #   * 'LaunchSpecification.KeyName'<~String> - Name of a keypair to add to booting instances
         #   * 'LaunchSpecification.Monitoring.Enabled'<~Boolean> - Enables monitoring, defaults to disabled
+        #   * 'LaunchSpecification.SubnetId'<~String> - VPC subnet ID in which to launch the instance
         #   * 'LaunchSpecification.Placement.AvailabilityZone'<~String> - Placement constraint 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
@@ -47,6 +48,7 @@ module Fog
         #         * 'imageId'<~String> - AMI for instance
         #         * 'instanceType'<~String> - type for instance
         #         * 'monitoring'<~Boolean> - monitoring status for instance
+        #         * 'subnetId'<~String> - VPC subnet ID for instance
         #       * 'productDescription'<~String> - general description of AMI
         #       * 'spotInstanceRequestId'<~String> - id of spot instance request
         #       * 'spotPrice'<~Float> - maximum price for instances to be launched

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

@@ -44,6 +44,7 @@ module Fog
         #   * 'RamdiskId'<~String> - Id of ramdisk with which to launch
         #   * 'SubnetId'<~String> - VPC option to specify subnet to launch instance into
         #   * 'UserData'<~String> -  Additional data to provide to booting instances
+        #   * 'EbsOptimized'<~Boolean> - Whether the instance is optimized for EBS I/O
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -82,6 +83,7 @@ module Fog
         #         * 'reason'<~String> - reason for most recent state transition, or blank
         #         * 'rootDeviceName'<~String> - specifies how the root device is exposed to the instance
         #         * 'rootDeviceType'<~String> - root device type used by AMI in [ebs, instance-store]
+        #         * 'ebsOptimized'<~Boolean> - Whether the instance is optimized for EBS I/O
         #     * 'ownerId'<~String> - Id of owner
         #     * 'requestId'<~String> - Id of request
         #     * 'reservationId'<~String> - Id of reservation
@@ -137,6 +139,7 @@ module Fog
             instance_id = Fog::AWS::Mock.instance_id
             instance = {
               'amiLaunchIndex'      => i,
+              'architecture'        => 'i386',
               'blockDeviceMapping'  => [],
               'clientToken'         => options['clientToken'],
               'dnsName'             => nil,
@@ -152,12 +155,15 @@ module Fog
               'privateDnsName'      => nil,
               'productCodes'        => [],
               'reason'              => nil,
-              'rootDeviceType'      => 'instance-store'
+              'rootDeviceType'      => 'instance-store',
+              'ebsOptimized'        => options['EbsOptimized'] || false
             }
             instances_set << instance
             self.data[:instances][instance_id] = instance.merge({
-              'architecture'        => 'i386',
+              'groupIds'            => [],
               'groupSet'            => group_set,
+              'iamInstanceProfile'  => {},
+              'networkInterfaces'   => [],
               'ownerId'             => self.data[:owner_id],
               'privateIpAddress'    => nil,
               'reservationId'       => reservation_id,

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

@@ -106,8 +106,8 @@ module Fog
               alias_target_tag = ''
               if change_item[:alias_target]
                 # 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]
+                hosted_zone_id = change_item[:alias_target][:hosted_zone_id] || change_item[:alias_target][:HostedZoneId] || AWS.hosted_zone_for_alias_target(dns_name)
                 alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{hosted_zone_id}</HostedZoneId><DNSName>#{dns_name}</DNSName></AliasTarget>}
               end
 
@@ -186,6 +186,25 @@ module Fog
           end
         end
       end
+
+      def self.hosted_zone_for_alias_target(dns_name)
+        k = elb_hosted_zone_mapping.keys.find do |k|
+          dns_name =~ /\A.+\.#{k}\.elb\.amazonaws\.com\.?\z/
+        end
+        elb_hosted_zone_mapping[k]
+      end
+
+      def self.elb_hosted_zone_mapping
+        @elb_hosted_zone_mapping ||= {
+          "ap-northeast-1" => "Z2YN17T5R711GT",
+          "ap-southeast-1" => "Z1WI8VXHPB1R38",
+          "eu-west-1"      => "Z3NF1Z3NOM5OY2",
+          "sa-east-1"      => "Z2ES78Y61JGQKS",
+          "us-east-1"      => "Z3DZXE0Q79N41H",
+          "us-west-1"      => "Z1M58G0W56PQJA",
+          "us-west-2"      => "Z33MTJ483KN6FU",
+        }
+      end
     end
   end
 end

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -75,9 +75,9 @@ module Fog
           dns_name = Fog::AWS::ELB::Mock.dns_name(lb_name, @region)
           self.data[:load_balancers][lb_name] = {
             'AvailabilityZones' => availability_zones,
-            'Subnets' => options[:subnet_ids],
+            'Subnets' => options[:subnet_ids] || [],
             'Scheme' => options[:scheme].nil? ? 'internet-facing' : options[:scheme],
-            'SecurityGroups' => options[:security_groups],
+            'SecurityGroups' => options[:security_groups].nil? ? [] : options[:security_groups],
             'CanonicalHostedZoneName' => '',
             'CanonicalHostedZoneNameID' => '',
             'CreatedTime' => Time.now,

data/lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -108,7 +108,7 @@ module Fog
           }
 
           if next_marker
-            response.body['DescribeLoadBalancersResult']['NextMarker'] = next_marker
+            response.body['DescribeLoadBalancersResult']['NextMarker'] = next_marker.to_s
           end
 
           response

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

@@ -0,0 +1,35 @@
+module Fog
+  module AWS
+    class Glacier
+      class Real
+
+        # Abort an upload
+        #
+        # ==== Parameters
+        # * name<~String> Name of the vault to upload to
+        # * upload_id<~String> The id of the upload to complete
+        # * options<~Hash>
+        #   * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/amazonglacier/latest/dev/api-multipart-abort-upload.html
+        #
+        def abort_multipart_upload(vault_name, upload_id, options={})
+          account_id = options['account_id'] || '-'
+          path = "/#{account_id}/vaults/#{Fog::AWS.escape(vault_name)}/multipart-uploads/#{upload_id}"
+
+          request(
+            :expects  => 204,
+            :idempotent => true,
+            :headers => {},
+            :method   => :delete,
+            :path     => path
+          )
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+module Fog
+  module AWS
+    class Glacier
+      class Real
+
+        # Complete an upload
+        #
+        # ==== Parameters
+        # * name<~String> Name of the vault to upload to
+        # * upload_id<~String> The id of the upload to complete
+        # * total_size<~Integer> The total archive size
+        # * tree_hash<~String> the treehash for the archive
+        # * options<~Hash>
+        #   * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/amazonglacier/latest/dev/api-multipart-complete-upload.html
+        #
+        def complete_multipart_upload(vault_name, upload_id, total_size, tree_hash, options={})
+          account_id = options['account_id'] || '-'
+          path = "/#{account_id}/vaults/#{Fog::AWS.escape(vault_name)}/multipart-uploads/#{upload_id}"
+
+          headers = {
+            'x-amz-archive-size' => total_size.to_s,
+            'x-amz-sha256-tree-hash' => tree_hash
+          }
+
+          request(
+            :expects  => 201,
+            :idempotent => true,
+            :headers => headers,
+            :method   => :post,
+            :path     => path
+          )
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+module Fog
+  module AWS
+    class Glacier
+      class Real
+
+        # Upload an archive
+        #
+        # ==== Parameters
+        # * name<~String> Name of the vault to upload to
+        # * body<~String> The data to upload
+        # * options<~Hash>
+        #   * description<~String> - The archive description
+        #   * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/amazonglacier/latest/dev/api-archive-post.html
+        #
+        def create_archive(vault_name, body, options={})
+          account_id = options['account_id'] || '-'
+          path = "/#{account_id}/vaults/#{Fog::AWS.escape(vault_name)}/archives"
+
+          headers = {
+            'Content-Length' => body.bytesize.to_s,
+            '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']
+
+          request(
+            :expects  => 201,
+            :headers => headers,
+            :method   => :post,
+            :path     => path,
+            :body     => body
+          )
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,34 @@
+module Fog
+  module AWS
+    class Glacier
+      class Real
+
+        # This operation creates a new vault with the specified name.  .
+        #
+        # ==== Parameters
+        # * name<~String> 1-255 characters. must be unique within a region for an AWS account
+        # * options<~Hash>
+        #   * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/amazonglacier/latest/dev/api-vault-put.html
+        #
+        def create_vault(name,options={})
+          account_id = options['account_id'] || '-'
+          path = "/#{account_id}/vaults/#{Fog::AWS.escape(name)}"
+          request(options.merge({
+            :expects  => 201,
+            :idempotent => true,
+            :headers => {},
+            :method   => :put,
+            :path     => path,
+          }))
+        end
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,35 @@
+module Fog
+  module AWS
+    class Glacier
+      class Real
+
+        # Delete an archive
+        #
+        # ==== Parameters
+        # * name<~String> Name of the vault to delete
+        # * options<~Hash>
+        #   * account_id<~String> - The AWS account id. Defaults to the account owning the credentials making the request
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #
+        # ==== See Also
+        # http://docs.amazonwebservices.com/amazonglacier/latest/dev/api-vault-delete.html
+        #
+        def delete_archive(name,archive_id,options={})
+          account_id = options['account_id'] || '-'
+          path = "/#{account_id}/vaults/#{Fog::AWS.escape(name)}/archives/#{archive_id}"
+          request(
+            :expects  => 204,
+            :idempotent => true,
+            :headers => {},
+            :method   => :delete,
+            :path     => path
+          )
+        end
+      end
+
+    end
+  end
+end