aws-sdk 1.1.3 → 1.1.4

data/lib/aws/ec2.rb

@@ -11,21 +11,8 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/common'
-require 'aws/service_interface'
-require 'aws/ec2/client'
-require 'aws/ec2/instance_collection'
-require 'aws/ec2/security_group_collection'
-require 'aws/ec2/elastic_ip_collection'
-require 'aws/ec2/key_pair_collection'
-require 'aws/ec2/tag_collection'
-require 'aws/ec2/region_collection'
-require 'aws/ec2/availability_zone_collection'
-require 'aws/ec2/image_collection'
-require 'aws/ec2/volume_collection'
-require 'aws/ec2/snapshot_collection'
-require 'aws/ec2/reserved_instances_collection'
-require 'aws/ec2/reserved_instances_offering_collection'
+require 'aws/core'
+require 'aws/ec2/config'
 
 module AWS
 
@@ -244,7 +231,51 @@ module AWS
   #
   class EC2
 
-    include ServiceInterface
+    AWS.register_autoloads(self) do
+      autoload :Attachment, 'attachment'
+      autoload :AttachmentCollection, 'attachment_collection'
+      autoload :AvailabilityZone, 'availability_zone'
+      autoload :AvailabilityZoneCollection, 'availability_zone_collection'
+      autoload :BlockDeviceMappings, 'block_device_mappings'
+      autoload :Client, 'client'
+      autoload :Collection, 'collection'
+      autoload :ConfigTransform, 'config_transform'
+      autoload :ElasticIp, 'elastic_ip'
+      autoload :ElasticIpCollection, 'elastic_ip_collection'
+      autoload :Errors, 'errors'
+      autoload :FilteredCollection, 'filtered_collection'
+      autoload :HasPermissions, 'has_permissions'
+      autoload :Image, 'image'
+      autoload :ImageCollection, 'image_collection'
+      autoload :Instance, 'instance'
+      autoload :InstanceCollection, 'instance_collection'
+      autoload :KeyPair, 'key_pair'
+      autoload :KeyPairCollection, 'key_pair_collection'
+      autoload :PermissionCollection, 'permission_collection'
+      autoload :Region, 'region'
+      autoload :RegionCollection, 'region_collection'
+      autoload :Request, 'request'
+      autoload :ReservedInstances, 'reserved_instances'
+      autoload :ReservedInstancesCollection, 'reserved_instances_collection'
+      autoload :ReservedInstancesOffering, 'reserved_instances_offering'
+      autoload :ReservedInstancesOfferingCollection, 
+        'reserved_instances_offering_collection'
+      autoload :Resource, 'resource'
+      autoload :ResourceObject, 'tag_collection'
+      autoload :ResourceTagCollection, 'resource_tag_collection'
+      autoload :SecurityGroup, 'security_group'
+      autoload :SecurityGroupCollection, 'security_group_collection'
+      autoload :Snapshot, 'snapshot'
+      autoload :SnapshotCollection, 'snapshot_collection'
+      autoload :Tag, 'tag'
+      autoload :TagCollection, 'tag_collection'
+      autoload :TaggedCollection, 'tagged_collection'
+      autoload :TaggedItem, 'tagged_item'
+      autoload :Volume, 'volume'
+      autoload :VolumeCollection, 'volume_collection'
+    end
+
+    include Core::ServiceInterface
 
     # @return [InstanceCollection] A collection representing all instances
     def instances

data/lib/aws/ec2/attachment.rb

@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/resource'
-
 module AWS
   class EC2
 

data/lib/aws/ec2/attachment_collection.rb

@@ -11,11 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/ec2/volume'
-require 'aws/ec2/instance'
-require 'aws/ec2/attachment'
-
 module AWS
   class EC2
 
@@ -25,7 +20,7 @@ module AWS
     # @see Volume
     class AttachmentCollection
 
-      include Model
+      include Core::Model
       include Enumerable
 
       attr_reader :volume

data/lib/aws/ec2/availability_zone.rb

@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/ec2/resource'
-
 module AWS
   class EC2
 

data/lib/aws/ec2/availability_zone_collection.rb

@@ -11,9 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/ec2/collection'
-require 'aws/ec2/availability_zone'
-
 module AWS
   class EC2
 

data/lib/aws/ec2/client.rb

@@ -11,20 +11,17 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/base_client'
-require 'aws/configured_client_methods'
-require 'aws/ec2/request'
-require 'aws/ec2/client/xml'
-require 'aws/ec2/errors'
-require 'aws/inflection'
-
 module AWS
   class EC2
 
     # @private
-    class Client < BaseClient
+    class Client < Core::Client
+
+      AWS.register_autoloads(self) do
+        autoload :XML, 'xml'
+      end
 
-      include ConfiguredClientMethods
+      include Core::ConfiguredClientMethods
 
       API_VERSION = '2011-02-28'
 

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

@@ -11,17 +11,14 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/base_client'
-require 'aws/configured_xml_grammars'
-
 module AWS
   class EC2
-    class Client < BaseClient
+    class Client < Core::Client
       module XML
 
-        include ConfiguredXmlGrammars
+        include Core::ConfiguredXmlGrammars
 
-        BaseError = XmlGrammar.customize do
+        BaseError = Core::XmlGrammar.customize do
           element "Errors" do
             ignore
             element("Error") { ignore }

data/lib/aws/ec2/collection.rb

@@ -11,16 +11,13 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/ec2/filtered_collection'
-
 module AWS
   class EC2
 
     # @private
     class Collection
 
-      include Model
+      include Core::Model
       include Enumerable
       include FilteredCollection
 

data/lib/aws/ec2/config.rb

@@ -0,0 +1,18 @@
+# Copyright 2011 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.
+
+AWS::Core::Configuration.module_eval do
+
+  add_service 'EC2', 'ec2', 'ec2.amazonaws.com'
+
+end

data/lib/aws/ec2/elastic_ip.rb

@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/ec2/resource'
-
 module AWS
   class EC2
 

data/lib/aws/ec2/elastic_ip_collection.rb

@@ -11,10 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/ec2/collection'
-require 'aws/ec2/elastic_ip'
-
 module AWS
   class EC2
     class ElasticIpCollection < Collection

data/lib/aws/ec2/errors.rb

@@ -11,9 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/lazy_error_classes'
-require 'aws/ec2/client/xml'
-
 module AWS
   class EC2
 
@@ -22,7 +19,7 @@ module AWS
 
       BASE_ERROR_GRAMMAR = Client::XML::BaseError
 
-      include LazyErrorClasses
+      include Core::LazyErrorClasses
 
     end
   end

data/lib/aws/ec2/has_permissions.rb

@@ -11,8 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/ec2/permission_collection'
-
 module AWS
   class EC2
 

data/lib/aws/ec2/image.rb

@@ -11,11 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/ec2/resource'
-require 'aws/ec2/tagged_item'
-require 'aws/ec2/has_permissions'
-require 'aws/ec2/instance_collection'
-
 module AWS
   class EC2
 

data/lib/aws/ec2/image_collection.rb

@@ -11,12 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/ec2/collection'
-require 'aws/ec2/tagged_collection'
-require 'aws/ec2/image'
-require 'aws/ec2/block_device_mappings'
-
 module AWS
   class EC2
 

data/lib/aws/ec2/instance.rb

@@ -11,14 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/inflection'
-require 'aws/ec2/tagged_item'
-require 'aws/model'
-require 'aws/cacheable'
-require 'aws/ec2/resource'
-require 'aws/ec2/key_pair'
-require 'aws/ec2/image'
-
 module AWS
   class EC2
 
@@ -146,6 +138,12 @@ module AWS
     # @attr_reader [String] client_token Idempotency token you
     #   provided when you launched the instance.
     #
+    # @attr_reader [String,nil] vpc_id Instances launched in a VPC have
+    #   a vpc_id.  Normal EC2 instances return nil.
+    #
+    # @attr_reader [String,nil] subnet_id Instances launched in a VPC have
+    #   a subnet_id.  Normal EC2 instances return nil.
+    #
     class Instance < Resource
 
       include TaggedItem
@@ -234,6 +232,7 @@ module AWS
       describe_call_attribute :root_device_name, :static => true
 
       describe_call_attribute :block_device_mapping
+
       protected :block_device_mapping
       
       describe_call_attribute :instance_lifecycle, :to_sym => true
@@ -256,6 +255,10 @@ module AWS
 
       describe_call_attribute :key_name, :static => true
 
+      describe_call_attribute :vpc_id, :static => true
+
+      describe_call_attribute :subnet_id, :static => true
+
       attribute :status do
         translates_output{|state| state.name.tr("-","_").to_sym }
       end
@@ -315,7 +318,7 @@ module AWS
       # them is returned per :describe_instance_attribute call.
       mutable_describe_attributes.values.each do |attr|
 
-        attr_opt_name = Inflection.class_name(attr.get_as.to_s)
+        attr_opt_name = Core::Inflection.class_name(attr.get_as.to_s)
         attr_opt_name = attr_opt_name[0,1].downcase + attr_opt_name[1..-1]
 
         provider(:describe_instance_attribute) do |provider|
@@ -410,6 +413,17 @@ module AWS
         end
       end
 
+      # @return [Boolean] Returns true if the instance has dedicated tenancy.
+      #   This will be false for all non-VPC instances.  Dedicated Tenancy
+      #   comes at extra cost.
+      def dedicated_tenancy?
+        if p = placement
+          p.tenancy == 'dedicated'
+        else
+          false
+        end
+      end
+
       # @return [Image] The AMI used to launch the instance.
       def image
         Image.new(image_id, :config => config)

data/lib/aws/ec2/instance_collection.rb

@@ -11,11 +11,6 @@
 # ANY KIND, either express or implied. See the License for the specific
 # language governing permissions and limitations under the License.
 
-require 'aws/model'
-require 'aws/ec2/tagged_collection'
-require 'aws/ec2/collection'
-require 'aws/ec2/instance'
-require 'aws/ec2/block_device_mappings'
 require 'base64'
 require 'uuidtools'
 
@@ -72,6 +67,12 @@ module AWS
       #     }
       #   })
       #
+      # @example Launching in an Amazon VPC subnet
+      #
+      #   ec2.instances.create(
+      #     :image_id => "ami-8c1fece5",
+      #     :subnet => "subnet-abc123ef")
+      #
       # @param [Hash] options Options for new instance.  +:image_id+ is
       #   the only required option.
       #
@@ -123,10 +124,15 @@ module AWS
       #   use.  Note: Launching public images without a key pair ID
       #   will leave them inaccessible.
       #
-      # @option options [Array] :security_groups The names of the
-      #   security groups that will be used to determine network
-      #   access rules for the instances.  You may pass instances of
-      #   {SecurityGroup} as well.
+      # @option options [Array] :security_groups Security groups are used
+      #   to determine network access rules for the instances.  
+      #   +:security_groups+ can be a single value or an array of values.
+      #   Values should be group name strings or {SecurityGroup} objects.
+      #
+      # @option options [Array<String>] :security_group_ids Security groups 
+      #   are used to determine network access rules for the instances.  
+      #   +:security_group_ids+ accepts a single ID or an array of security
+      #   group IDs.
       #
       # @option options [String] :user_data Arbitrary user data.  You
       #   do not need to encode this value.
@@ -163,6 +169,22 @@ 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 [String] :private_ip_address (nil) If you're using VPC,
+      #   you can optionally use this option to assign the instance a 
+      #   specific available IP address from the subnet (e.g., '10.0.0.25').
+      #   This option is not valid for instances launched outside a VPC (i.e.
+      #   those launched without the :subnet option).
+      #
+      # @option options [Boolean] :dedicated_tenancy (false) Instances
+      #   with dedicated tenancy will not share physical hardware with
+      #   instances outside their VPC.  *NOTE:* Dedicated tenancy
+      #   incurs an additional service charge.  This option is not
+      #   valid for instances launched outside a VPC (e.g. those
+      #   launched without the :subnet option).
+      #
       # @return [Instance or Array] If a single instance is being created, 
       #   this returns an {EC2::Instance} to represent the newly
       #   created instance.  Otherwise it returns an array of instance 
@@ -200,13 +222,23 @@ module AWS
           options[:monitoring_enabled]
         options.delete(:monitoring_enabled)
 
-        options[:placement] = {
-          :availability_zone => options[:availability_zone].to_s
-        } if options[:availability_zone]
-        options.delete(:availability_zone)
+        placement = {}
 
-        options[:security_groups] = group_opts(options[:security_groups]) if
-          options[:security_groups]
+        if options[:availability_zone]
+          placement[:availability_zone] = options[:availability_zone].to_s
+          options.delete(:availability_zone)
+        end
+
+        if options[:dedicated_tenancy]
+          placement[:tenancy] = 'dedicated' 
+          options.delete(:dedicated_tenancy)
+        end
+
+        options[:placement] = placement unless placement.empty?
+
+        options[:subnet_id] = options.delete(:subnet) if options[:subnet]
+
+        security_group_opts(options)
 
         options[:client_token] = UUIDTools::UUID.timestamp_create.to_s
 
@@ -263,19 +295,50 @@ module AWS
 
       # @private
       private
-      def group_opts(groups)
-        [groups].flatten.map do |g|
+      def security_group_opts options
+
+        ids = []
+        names = []
+
+        Array(options.delete(:security_group_ids)).each do |g|
+          ids << g
+        end
+
+        # this may be security group objects or names
+        Array(options.delete(:security_groups)).each do |g|
           case g
-          when SecurityGroup then g.name
-          when String        then g
+          when String        then names << g
+          when SecurityGroup then ids << g.id
           else
-            raise ArgumentError.new("members of security_groups must be "+
-                                    "strings or SecurityGroup objects")
+            raise ArgumentError, ':security_groups may only contain ' +
+              'security group names, ids or objects'
           end
         end
+
+        return if ids.empty? and names.empty?
+
+        if options[:subnet_id]
+
+          # vpc instances only accepts security group ids, so any group
+          # names must be converted to ids, which requires a service
+          # request
+          unless names.empty?
+            ec2 = EC2.new(:config => config)
+            groups = ec2.security_groups.filter('group-name', names)
+            ids += groups.collect{|g| g.id }
+          end
+          options[:security_group_ids] = ids
+
+        else
+
+          # non-vpc instances accept both group names and ids, so 
+          # we accept whichever
+          options[:security_groups] = names unless names.empty?
+          options[:security_group_ids] = ids unless ids.empty?
+
+        end
       end
 
     end
-
   end
 end