aws-sdk 1.3.5 → 1.3.6

data/lib/aws/core.rb

@@ -25,12 +25,12 @@ require 'aws/core/autoloader'
 # * {AWS::ELB}
 # * {AWS::IAM}
 # * {AWS::S3}
-# * {AWS::SimpleDB}
-# * {AWS::SimpleEmailService}
-# * {AWS::SimpleWorkflow}
 # * {AWS::SNS}
 # * {AWS::SQS}
 # * {AWS::STS}
+# * {AWS::SimpleDB}
+# * {AWS::SimpleEmailService}
+# * {AWS::SimpleWorkflow}
 #
 # = AWS::Record
 #
@@ -59,7 +59,7 @@ require 'aws/core/autoloader'
 module AWS
 
   # Current version of the AWS SDK for Ruby
-  VERSION = "1.3.5"
+  VERSION = "1.3.6"
 
   register_autoloads(self) do
     autoload :Errors, 'errors'

data/lib/aws/core/client.rb

@@ -234,6 +234,7 @@ module AWS
       private
       def rebuild_http_request response
         response.rebuild_request
+        response.retry_count += 1
       end
   
       private

data/lib/aws/core/client_logging.rb

@@ -53,8 +53,15 @@ module AWS
         status = response.http_response.status
         service = self.class.service_name
   
-        pattern = "[AWS %s %s %.06f] %s(%s)"
-        parts = [service, status, time.real, method_name, sanitize_options(options)]
+        pattern = "[AWS %s %s %.06f %d retries] %s(%s)"
+        parts = [
+          service, 
+          status, 
+          time.real, 
+          response.retry_count,
+          method_name, 
+          sanitize_options(options)]
+
         severity = :info
   
         if response.error

data/lib/aws/core/lazy_error_classes.rb

@@ -39,7 +39,7 @@ module AWS
         end
   
         def error_class(code)
-          module_eval("#{self}::#{code.gsub(".","::")}")
+          module_eval("#{self}::#{code.gsub('.Range','Range').gsub(".","::")}")
         end
   
         def included(mod)

data/lib/aws/core/response.rb

@@ -40,6 +40,10 @@ module AWS
   
       # @return [Boolean] true if the response is cached
       attr_accessor :cached
+
+      # @return [Integer] Returns the number of times the request
+      #   was retried.
+      attr_accessor :retry_count
   
       # @param [Http::Request] http_request
       # @param [Http::Response] http_request
@@ -47,6 +51,7 @@ module AWS
         @http_request = http_request
         @http_response = http_response
         @request_builder = block
+        @retry_count = 0
         rebuild_request if @request_builder && !http_request
       end
   

data/lib/aws/core/service_interface.rb

@@ -14,7 +14,6 @@
 module AWS
   module Core
 
-    # @private
     module ServiceInterface
 
       def self.included base
@@ -40,9 +39,11 @@ module AWS
       # @see AWS::Cofiguration
       #
       # @param [Hash] options
+      #
       # @option options [Configuration] :config An AWS::Configuration
       #   object to initialize this service interface object with.  Defaults
       #   to AWS.config when not provided.
+      #
       def initialize options = {}
         @config = options[:config]
         @config ||= AWS.config
@@ -50,7 +51,7 @@ module AWS
         @client = config.send(Inflection.ruby_name(self.class.to_s) + '_client')
       end
 
-      # @private
+      # @return [String]
       def inspect
         "<#{self.class}>"
       end

data/lib/aws/core/uri_escape.rb

@@ -24,8 +24,7 @@ module AWS
       # @private
       protected
       def escape value
-        value = value.encode("UTF-8") if
-          value.respond_to?(:encode)
+        value = value.encode("UTF-8") if value.respond_to?(:encode)
         CGI::escape(value.to_s).gsub('+', '%20')
       end
 

data/lib/aws/ec2.rb

@@ -240,6 +240,10 @@ module AWS
       autoload :Client, 'client'
       autoload :Collection, 'collection'
       autoload :ConfigTransform, 'config_transform'
+      autoload :CustomerGateway, 'customer_gateway'
+      autoload :CustomerGatewayCollection, 'customer_gateway_collection'
+      autoload :DHCPOptions, 'dhcp_options'
+      autoload :DHCPOptionsCollection, 'dhcp_options_collection'
       autoload :ElasticIp, 'elastic_ip'
       autoload :ElasticIpCollection, 'elastic_ip_collection'
       autoload :Errors, 'errors'
@@ -249,8 +253,14 @@ module AWS
       autoload :ImageCollection, 'image_collection'
       autoload :Instance, 'instance'
       autoload :InstanceCollection, 'instance_collection'
+      autoload :InternetGateway, 'internet_gateway'
+      autoload :InternetGatewayCollection, 'internet_gateway_collection'
       autoload :KeyPair, 'key_pair'
       autoload :KeyPairCollection, 'key_pair_collection'
+      autoload :NetworkACL, 'network_acl'
+      autoload :NetworkACLCollection, 'network_acl_collection'
+      autoload :NetworkInterface, 'network_interface'
+      autoload :NetworkInterfaceCollection, 'network_interface_collection'
       autoload :PermissionCollection, 'permission_collection'
       autoload :Region, 'region'
       autoload :RegionCollection, 'region_collection'
@@ -263,16 +273,26 @@ module AWS
       autoload :Resource, 'resource'
       autoload :ResourceObject, 'tag_collection'
       autoload :ResourceTagCollection, 'resource_tag_collection'
+      autoload :RouteTable, 'route_table'
+      autoload :RouteTableCollection, 'route_table_collection'
       autoload :SecurityGroup, 'security_group'
       autoload :SecurityGroupCollection, 'security_group_collection'
       autoload :Snapshot, 'snapshot'
       autoload :SnapshotCollection, 'snapshot_collection'
+      autoload :Subnet, 'subnet'
+      autoload :SubnetCollection, 'subnet_collection'
       autoload :Tag, 'tag'
       autoload :TagCollection, 'tag_collection'
       autoload :TaggedCollection, 'tagged_collection'
       autoload :TaggedItem, 'tagged_item'
       autoload :Volume, 'volume'
       autoload :VolumeCollection, 'volume_collection'
+      autoload :VPC, 'vpc'
+      autoload :VPCCollection, 'vpc_collection'
+      autoload :VPNConnection, 'vpn_connection'
+      autoload :VPNConnectionCollection, 'vpn_connection_collection'
+      autoload :VPNGateway, 'vpn_gateway'
+      autoload :VPNGatewayCollection, 'vpn_gateway_collection'
     end
 
     include Core::ServiceInterface
@@ -347,6 +367,65 @@ module AWS
       SnapshotCollection.new(:config => config)
     end
 
-  end
+    # @return [VPCCollection] A collection representing 
+    #   all VPCs in your account.
+    def vpcs
+      VPCCollection.new(:config => config)
+    end
+
+    # @return [SubnetCollection] Returns a collection that represents all
+    #   of the subnets associated with this account (across all VPCs).
+    def subnets
+      SubnetCollection.new(:config => config)
+    end
+
+    # @return [NetworkACLCollection] Returns a collection that represents
+    #   all of the network ACLs for this account.
+    def network_acls
+      NetworkACLCollection.new(:config => config)
+    end
 
+    # @return [RouteTableCollection] Returns a collection that represents
+    #   all of the route tables for this account.
+    def route_tables
+      RouteTableCollection.new(:config => config)
+    end
+
+    # @return [NetworkInterfaceCollection] Returns a collection that
+    #   represents all of the network interfaces for this account.
+    def network_interfaces
+      NetworkInterfaceCollection.new(:config => config)
+    end
+
+    # @return [InternetGatewayCollection] Returns a collection that
+    #   represents all of the internet gateways for this account.
+    def internet_gateways
+      InternetGatewayCollection.new(:config => config)
+    end
+
+    # @return [CustomerGatewayCollection] Returns a collection that
+    #   represents all of the customer gateways for this account.
+    def customer_gateways
+      CustomerGatewayCollection.new(:config => config)
+    end
+
+    # @return [VPNGatewayCollection] Returns a collection that
+    #   represents all of the vpn gateways for this account.
+    def vpn_gateways
+      VPNGatewayCollection.new(:config => config)
+    end
+
+    # @return [DHCPOptionsCollection] Returns a collection that
+    #   represents all of the dhcp options for this account.
+    def dhcp_options
+      DHCPOptionsCollection.new(:config => config)
+    end
+
+    # @return [VPNConnections] Returns a collection that
+    #   represents all of vpn connections for this account.
+    def vpn_connections
+      VPNConnectionCollection.new(:config => config)
+    end
+
+  end
 end

data/lib/aws/ec2/client.rb

@@ -23,27 +23,46 @@ module AWS
 
       include Core::ConfiguredClientMethods
 
-      API_VERSION = '2011-02-28'
+      API_VERSION = '2011-12-15'
 
       REQUEST_CLASS = EC2::Request
 
       # @private
       CACHEABLE_REQUESTS = Set[
-        :describe_instances,
-        :describe_instance_attribute,
-        :describe_images,
-        :describe_image_attribute,
-        :describe_volumes,
-        :describe_security_groups,
         :describe_addresses,
+        :describe_availability_zones,
+        :describe_bundle_tasks,
+        :describe_customer_gateways,
+        :describe_dhcp_options,
+        :describe_image_attribute,
+        :describe_images,
+        :describe_instances,
         :describe_key_pairs,
         :describe_regions,
-        :describe_availability_zones,
         :describe_reserved_instances,
         :describe_reserved_instances_offerings,
-        :describe_snapshots,
+        :describe_security_groups,
         :describe_snapshot_attribute,
-        :describe_tags
+        :describe_snapshots,
+        :describe_subnets,
+        :describe_volumes,
+        :describe_vpcs,
+        :describe_vpn_connections,
+        :describe_vpn_gateways,
+        :describe_instance_attribute,
+        :describe_spot_instance_requests,
+        :describe_spot_price_history,
+        :describe_spot_datafeed_subscription,
+        :describe_licenses,
+        :describe_placement_groups,
+        :describe_tags,
+        :describe_internet_gateways,
+        :describe_route_tables,
+        :describe_network_acls,
+        :describe_instance_status,
+        :describe_conversion_tasks,
+        :describe_network_interfaces,
+        :describe_network_interface_attribute,
       ]
 
       configure_client

data/lib/aws/ec2/client/xml.rb

@@ -27,6 +27,57 @@ module AWS
 
         define_configured_grammars
 
+        CustomizedDescribeNetworkInterfaces = DescribeNetworkInterfaces.customize do
+          element "networkInterfaceSet" do
+            rename "set"
+            element "item" do
+              element "groupSet" do
+                element "item" do
+                  rename :groups
+                end
+              end
+            end
+          end
+        end
+
+        CustomizedDescribeCustomerGateways = DescribeCustomerGateways.customize do
+          element "customerGatewaySet" do
+            element "item" do
+              element "type" do
+                rename :vpn_type
+              end
+            end
+          end
+        end
+
+        CustomizedDescribeVpnConnections = DescribeVpnConnections.customize do
+          element "vpnConnectionSet" do
+            element "item" do
+              element "type" do
+                rename :vpn_type
+              end
+            end
+          end
+        end
+
+        CustomizedCreateVpnGateway = CreateVpnGateway.customize do
+          element "vpnGateway" do
+            element "type" do
+              rename :vpn_type
+            end
+          end
+        end
+
+        CustomizedDescribeVpnGateways = DescribeVpnGateways.customize do
+          element "vpnGatewaySet" do
+            element "item" do
+              element "type" do
+                rename :vpn_type
+              end
+            end
+          end
+        end
+
         CustomizedDescribeSecurityGroups = DescribeSecurityGroups.customize do
           element "securityGroupInfo" do
             element "item" do
@@ -119,7 +170,6 @@ module AWS
         end
 
       end
-
     end
   end
 end

data/lib/aws/ec2/customer_gateway.rb

@@ -0,0 +1,90 @@
+# Copyright 2011-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
+module AWS
+  class EC2
+
+    # @attr_reader [Symbol] state Returns the gateway state (e.g. 
+    #   :pending, :available, :deleting, :deleted)
+    #
+    # @attr_reader [String] type The type of VPN connection the customer 
+    #   gateway supports (e.g. 'ipsec.1').
+    #
+    # @attr_reader [String] ip_address The Internet-routable IP address of 
+    #   the customer gateway's outside interface.
+    #
+    # @attr_reader [Integer] bgp_asn The customer gateway's Border Gateway 
+    #   Protocol (BGP) Autonomous System Number (ASN).
+    #
+    class CustomerGateway < Resource
+
+      include TaggedItem
+
+      # @private
+      def initialize customer_gateway_id, options = {}
+        @customer_gateway_id = customer_gateway_id
+        super
+      end
+
+      # @return [String]
+      attr_reader :customer_gateway_id
+
+      alias_method :id, :customer_gateway_id
+    
+      attribute :state, :to_sym => true
+
+      attribute :vpn_type, :static => true
+
+      attribute :ip_address, :static => true
+
+      attribute :bgp_asn, :static => true
+
+      populates_from(:create_customer_gateway) do |resp|
+        resp.customer_gateway if resp.customer_gateway.customer_gateway_id == id
+      end
+
+      populates_from(:describe_customer_gateways) do |resp|
+        resp.customer_gateway_set.find do |gateway| 
+          gateway.customer_gateway_id == customer_gateway_id
+        end
+      end
+
+      # @return [VPNConnectionCollection] Returns a collection
+      #   of VPC connections for this gateway.
+      def vpn_connections
+        connections = VPNConnectionCollection.new(:config => config)
+        connections.filter('customer-gateway-id', id)
+      end
+
+      # Deletes this customer gateway.
+      # @return [nil]
+      def delete
+        client_opts = {}
+        client_opts[:customer_gateway_id] = customer_gateway_id
+        client.delete_customer_gateway(client_opts)
+        nil
+      end
+
+      # @return [Boolean] Returns true if the gateway exists.
+      def exists?
+        begin
+          client.describe_customer_gateways(:customer_gateway_ids => [id])
+          true
+        rescue Errors::InvalidCustomerGatewayID::NotFound
+          false
+        end
+      end
+
+    end
+  end
+end