aws-sdk 1.3.5 → 1.3.6

data/lib/aws/ec2/customer_gateway_collection.rb

@@ -0,0 +1,73 @@
+# 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
+
+    class CustomerGatewayCollection < Collection
+
+      include TaggedCollection
+      include Core::Collection::Simple
+
+      # @param [Integer] bgp_asn The customer gateway's Border Gateway 
+      #   Protocol (BGP) Autonomous System Number (ASN).
+      #
+      # @param [String] ip_address The Internet-routable IP address for the 
+      #   customer gateway's outside interface. The address must be static.
+      #
+      # @param [Hash] options
+      # 
+      # @option options [String] :vpn_type ('ipsec.1') The type of VPN 
+      #   connection this customer gateway supports.
+      #
+      # @return [CustomerGateway]
+      #
+      def create bgp_asn, ip_address, options = {}
+
+        client_opts = {}
+        client_opts[:bgp_asn] = bgp_asn
+        client_opts[:public_ip] = ip_address
+        client_opts[:type] = options[:vpn_type] || 'ipsec.1'
+
+        resp = client.create_customer_gateway(client_opts)
+
+        CustomerGateway.new_from(:create_customer_gateway, 
+          resp.customer_gateway,
+          resp.customer_gateway.customer_gateway_id,
+          :config => config)
+
+      end
+
+      # @param [String] customer_gateway_id
+      # @return [CustomerGateway]
+      def [] customer_gateway_id
+        CustomerGateway.new(customer_gateway_id, :config => config)
+      end
+
+      protected
+
+      def _each_item options = {}, &block
+        response = filtered_request(:describe_customer_gateways, options, &block)
+        response.customer_gateway_set.each do |g|
+
+          gateway = CustomerGateway.new_from(:describe_customer_gateways, g, 
+            g.customer_gateway_id, :config => config)
+
+          yield(gateway)
+
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/dhcp_options.rb

@@ -0,0 +1,106 @@
+# 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
+
+    class DHCPOptions < Resource
+
+      include TaggedItem
+
+      # @private
+      def initialize dhcp_options_id, options = {}
+        @dhcp_options_id = dhcp_options_id
+        super
+      end
+
+      # @return [String]
+      attr_reader :dhcp_options_id
+
+      alias_method :id, :dhcp_options_id
+
+      attribute :dhcp_configuration_set, :static => true
+
+      protected :dhcp_configuration_set
+    
+      populates_from(:create_dhcp_options) do |resp|
+        resp.dhcp_options if resp.dhcp_options.dhcp_options_id == id
+      end
+
+      populates_from(:describe_dhcp_options) do |resp|
+        resp.dhcp_options_set.find do |dhcp_options| 
+          dhcp_options.dhcp_options_id == dhcp_options_id
+        end
+      end
+
+      # @return [Hash]
+      def configuration
+        dhcp_configuration_set.inject({}) do |config,opt|
+          key = opt.key.gsub(/-/, '_').to_sym
+          values = opt.value_set.map(&:value)
+          values = values.first if key == :domain_name
+          values = values.first.to_i if key == :netbios_node_type
+          config.merge(key => values)
+        end
+      end
+
+      # Associates this set of options to the given VPC.
+      # @param [VPC,String] vpc A {VPC} object or a vpc id string.
+      # @return [nil]
+      def associate vpc
+        client_opts = {}
+        client_opts[:dhcp_options_id] = dhcp_options_id
+        client_opts[:vpc_id] = vpc_id_option(vpc)
+        client.associate_dhcp_options(client_opts)
+        nil
+      end
+
+      # Deletes these DHCP options.  An error will be raised if these
+      # options are currently associated to a VPC.  To disassociate this
+      # set of options from a VPC, associate a different set of options
+      # with the VPC.
+      #
+      # @return [nil]
+      #
+      def delete
+        client_opts = {}
+        client_opts[:dhcp_options_id] = dhcp_options_id
+        client.delete_dhcp_options(client_opts)
+        nil
+      end
+      
+      # @return [VPCCollection] Returns a collection that represents
+      #   all VPCs currently using this dhcp options.
+      def vpcs
+        vpcs = VPCCollection.new(:config => config)
+        vpcs.filter('dhcp-options-id', dhcp_options_id)
+      end
+
+      # @return [Boolean] Returns true if the dhcp options exists.
+      def exists?
+        begin
+          get_resource
+          true
+        rescue Errors::InvalidDhcpOptionID::NotFound
+          false
+        end
+      end
+
+      protected
+      def vpc_id_option vpc
+        vpc.is_a?(VPC) ? vpc.vpc_id : vpc
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/dhcp_options_collection.rb

@@ -0,0 +1,87 @@
+# 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
+
+    class DHCPOptionsCollection < Collection
+
+      include TaggedCollection
+      include Core::Collection::Simple
+
+      # @param [Hash] options
+      #
+      # @option options [required,String] :domain_name A domain name of your
+      #   choice (e.g., example.com).
+      #
+      # @option options [Array<String>] :domain_name_servers
+      #   The IP addresses of domain name servers. You can specify up to 
+      #   four addresses.
+      #
+      # @option options [Array<String>] :ntp_servers 
+      #   The IP addresses of Network Time Protocol (NTP) servers. You can 
+      #   specify up to four addresses.
+      #
+      # @option options [Array<String>] :netbios_name_servers 
+      #   The IP addresses of NetBIOS name servers. You can specify up to 
+      #   four addresses.
+      #
+      # @option options [String] :netbios_node_type Value indicating the 
+      #   NetBIOS node type (1, 2, 4, or 8). For more information about the 
+      #   values, go to RFC 2132. We recommend you only use 2 at this time 
+      #   (broadcast and multicast are currently not supported).
+      #
+      def create options = {}
+
+        configurations = []
+        options.each_pair do |opt,values|
+          opt = opt.to_s.gsub(/_/, '-')
+          values = values.is_a?(Array) ? values : [values]
+          configurations << { :key => opt, :values => values.map(&:to_s) }
+        end
+
+        client_opts = {}
+        client_opts[:dhcp_configurations] = configurations
+
+        resp = client.create_dhcp_options(client_opts)
+
+        DHCPOptions.new_from(:create_dhcp_options, 
+          resp.dhcp_options,
+          resp.dhcp_options.dhcp_options_id,
+          :config => config)
+
+      end
+
+      # @param [String] dhcp_options_id
+      # @return [DHCPOptions]
+      def [] dhcp_options_id
+        DHCPOptions.new(dhcp_options_id, :config => config)
+      end
+
+      protected
+
+      def _each_item options = {}, &block
+        response = filtered_request(:describe_dhcp_options, options, &block)
+        response.dhcp_options_set.each do |opts|
+
+          options = DHCPOptions.new_from(:describe_dhcp_options, opts, 
+            opts.dhcp_options_id, :config => config)
+
+          yield(options)
+
+        end
+      end
+
+    end
+  end
+end

data/lib/aws/ec2/filtered_collection.rb

@@ -47,11 +47,36 @@ module AWS
         client.send(client_method, options)
       end
 
+      protected
+      def vpc_id_option options
+        vpc_id = options[:vpc]
+        vpc_id ||= options[:vpc_id]
+        vpc_id ||= filter_value_for('vpc-id')
+        vpc_id = vpc_id.id if vpc_id.is_a?(VPC)
+        vpc_id
+      end
+
+      protected
+      def subnet_id_option options
+        subnet_id = options.delete(:subnet)
+        subnet_id ||= options[:subnet_id]
+        subnet_id ||= filter_value_for('subnet-id')
+        subnet_id = subnet_id.id if subnet_id.is_a?(Subnet)
+        subnet_id
+      end
+
+      protected
+      def filter_value_for filter_name
+        @filters.each do |filter|
+          return filter[:values].first if filter[:name] == filter_name
+        end
+        nil
+      end
+
       # @private
       protected
       def preserved_options
-        { :config => config,
-          :filters => @filters }
+        { :config => config, :filters => @filters }
       end
 
       # @private

data/lib/aws/ec2/image.rb

@@ -128,6 +128,7 @@ module AWS
       attribute :hypervisor, :to_sym => true, :static => true
 
       attribute :block_device_mapping
+
       protected :block_device_mapping
 
       attribute :product_codes, :static => true do
@@ -231,12 +232,14 @@ module AWS
       #   image.add_product_codes ['ABCXYZ', 'MNOPQR']
       #
       # @param [Array<String>] product_codes 
+      #
       # @return [nil]
+      #
       def add_product_codes *product_codes
-        opts = {}
-        opts[:image_id] = self.id
-        opts[:product_codes] = product_codes.flatten
-        client.modify_image_attribute(opts)
+        client_opts = {}
+        client_opts[:image_id] = self.id
+        client_opts[:product_codes] = product_codes.flatten
+        client.modify_image_attribute(client_opts)
         nil
       end
 

data/lib/aws/ec2/instance.rb

@@ -274,11 +274,16 @@ module AWS
 
       mutable_describe_call_attribute :ramdisk_id, :set_as => :ramdisk
 
-      mutable_describe_call_attribute :source_dest_check?,
-        :as => :source_dest_check
+      mutable_describe_attribute :source_dest_check do
+        translates_output{|bool| bool == "true" }
+      end
+
+      alias_method :source_dest_check?, :source_dest_check
 
       mutable_describe_call_attribute :group_set
 
+      describe_call_attribute :network_interface_set
+
       mutable_describe_attribute(:user_data) do
         translates_output {|v| Base64.decode64(v) if v }
         translates_input {|v| Base64.encode64(v).strip }
@@ -351,6 +356,53 @@ module AWS
         provider.provides :monitoring
       end
 
+      # @return [VPC,nil] Returns the VPC this instance was launched in.
+      #   If this instance was not launched inside a VPC, nil is returned.
+      def vpc
+        if vpc_id
+          VPC.new(vpc_id, :config => config)
+        end
+      end
+      
+      # @return [Subnet,nil] Returns the VPC subnet this instance was
+      #   launched in.  Returns nil if this was not launched in a VPC.
+      def subnet
+        if subnet_id
+          Subnet.new(subnet_id, :vpc_id => vpc_id, :config => config)
+        end
+      end
+
+      # @return [Array<NetworkInterface>] Returns a list of elastic network
+      #   interfaces attached to this instance (VPC only).  Non-vpc
+      #   instance may not have attached network interfaces.
+      def network_interfaces
+        network_interface_set.collect do |ni|
+          NetworkInterface.new_from(:describe_network_interfaces, ni,
+            ni.network_interface_id, :config => config)
+        end
+      end
+
+      # Attaches a network interface to this instance (VPC only).
+      #
+      # @param [NetworkInterface,String] network_interface A network interface
+      #   (or network interface id string) to attach to this vpc instance.
+      #
+      # @param [Hash] options
+      #
+      # @option (see NetworkInterface#attach)
+      #
+      # @return [nil]
+      #
+      def attach_network_interface network_interface, options = {}
+        if network_interface.is_a?(NetworkInterface) 
+          network_interface.attach(self, options)
+        else
+          i = NetworkInterface.new(network_interface, :config => config)
+          i.attach(self, options)
+        end
+        nil
+      end
+
       # @return [Array<SecurityGroup>] Returns a list of security 
       #   groups the instance belongs to. 
       def security_groups

data/lib/aws/ec2/instance_collection.rb

@@ -169,8 +169,8 @@ module AWS
       #   Determines whether the instance stops or terminates on
       #   instance-initiated shutdown.
       #
-      # @option options [String] :subnet (nil) The ID of an EC2 VPC 
-      #   subnet to launch the instance in.
+      # @option options [Subnet,String] :subnet (nil) The VPC Subnet (or 
+      #   subnet id string) to launch the instance in.
       #
       # @option options [String] :private_ip_address (nil) If you're using VPC,
       #   you can optionally use this option to assign the instance a 
@@ -236,7 +236,9 @@ module AWS
 
         options[:placement] = placement unless placement.empty?
 
-        options[:subnet_id] = options.delete(:subnet) if options[:subnet]
+        if subnet_id = subnet_id_option(options)
+          options[:subnet_id] = subnet_id
+        end
 
         security_group_opts(options)
 

data/lib/aws/ec2/internet_gateway.rb

@@ -0,0 +1,122 @@
+# 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.
+
+require 'aws/ec2/internet_gateway/attachment'
+
+module AWS
+  class EC2
+
+    class InternetGateway < Resource
+
+      include TaggedItem
+
+      def initialize internet_gateway_id, options = {}
+        @internet_gateway_id = internet_gateway_id
+        super
+      end
+
+      # @return [String]
+      attr_reader :internet_gateway_id
+
+      alias_method :id, :internet_gateway_id
+    
+      attribute :vpc_id
+
+      attribute :attachment_set
+
+      protected :attachment_set
+
+      populates_from(:describe_internet_gateways) do |resp|
+        resp.internet_gateway_set.find do |gateway| 
+          gateway.internet_gateway_id == internet_gateway_id
+        end
+      end
+
+      # @return [Array<InternetGateway::Attachment>]
+      def attachments
+        attachment_set.map {|details| Attachment.new(self, details) }
+      end
+
+      # @return [VPC,nil] Returns the currently attached VPC, or nil
+      #   if this gateway has not been attached.
+      def vpc
+        if attachment = attachments.first  
+          attachment.vpc
+        end
+      end
+
+      # Attaches this internet gateway to the given VPC.  If this
+      # gateway is already attached to a different VPC, it will
+      # be detached from that one first.  If you pass nil, then
+      # this internet gateway will 
+      #
+      #   internet_gateway.vpc = 'vpc-123'
+      # 
+      # @param [VPC,String] vpc A {VPC} object or a vpc id string.
+      #
+      def vpc= vpc
+        if attachment = attachments.first
+          attachment.delete
+        end
+        attach(vpc) if vpc
+      end
+
+      # Attaches this internet gateway to the given VPC.
+      # @param [VPC,String] vpc A {VPC} object or a vpc id string.
+      # @return [nil]
+      def attach vpc
+        client_opts = {}
+        client_opts[:internet_gateway_id] = internet_gateway_id
+        client_opts[:vpc_id] = vpc_id_option(vpc)
+        client.attach_internet_gateway(client_opts)
+        nil
+      end
+
+      # Detaches this internet gateway from the given VPC.
+      # @param [VPC,String] vpc A {VPC} object or a vpc id string.
+      # @return [nil]
+      def detach vpc
+        client_opts = {}
+        client_opts[:internet_gateway_id] = internet_gateway_id
+        client_opts[:vpc_id] = vpc_id_option(vpc)
+        client.detach_internet_gateway(client_opts)
+        nil
+      end
+
+      # Deletes this internet gateway.
+      # @return [nil]
+      def delete
+        client_opts = {}
+        client_opts[:internet_gateway_id] = internet_gateway_id
+        client.delete_internet_gateway(client_opts)
+        nil
+      end
+
+      # @return [Boolean] Returns true if the gateway exists.
+      def exists?
+        begin
+          get_resource
+          true
+        rescue Errors::InvalidInternetGatewayID::NotFound
+          false
+        end
+      end
+
+      protected
+      def vpc_id_option vpc
+        vpc.is_a?(VPC) ? vpc.vpc_id : vpc
+      end
+
+    end
+  end
+end