aws-sdk 1.3.2 → 1.3.3

data/lib/aws/ec2/security_group.rb

@@ -190,7 +190,8 @@ module AWS
       #
       # If you use ELB to manage load balancers, then you need to add
       # ingress permissions to the security groups they route traffic into.
-      # You can do this by passing the {LoadBalancer} into authorize_ingress:
+      # You can do this by passing the {ELB::LoadBalancer} into 
+      # authorize_ingress:
       #
       #   load_balancer = AWS::ELB.new.load_balancers['web-load-balancer']
       #

data/lib/aws/ec2/security_group/ip_permission.rb

@@ -92,7 +92,7 @@ module AWS
 
         # @return [Boolean] Returns true if the other IpPermission matches
         #   this one.
-        def == other
+        def eql? other
           other.is_a?(IpPermission) and
           other.security_group == security_group and
           other.protocol == protocol and
@@ -101,8 +101,7 @@ module AWS
           other.groups == groups and
           other.egress == egress?
         end
-
-        alias_method :eql?, :==
+        alias_method :==, :eql?
 
         protected
         def update_sg method

data/lib/aws/elb/listener.rb

@@ -170,12 +170,12 @@ module AWS
       end
 
       # @private
-      def == other
+      def eql? other
         other.is_a?(Listener) and 
         other.load_balancer == load_balancer and
         other.port == port
       end
-      alias_method :eql?, :==
+      alias_method :==, :eql?
 
       protected
       def _description

data/lib/aws/iam.rb

@@ -161,6 +161,8 @@ module AWS
       autoload :UserGroupCollection,          'user_group_collection'
       autoload :UserPolicy,                   'user_policy'
       autoload :UserPolicyCollection,         'user_policy_collection'
+      autoload :VirtualMfaDeviceCollection,   'virtual_mfa_device_collection'
+      autoload :VirtualMfaDevice,             'virtual_mfa_device'
     end
 
     include Core::ServiceInterface
@@ -253,6 +255,21 @@ module AWS
       ServerCertificateCollection.new(:config => config)
     end
 
+    # Returns a collection that represents the virtual MFA devices
+    # that are not assigned to an IAM user.
+    #
+    #   iam = AWS::IAM.new
+    #   iam.virtual_mfa_devices.each do |cert|
+    #     # ...
+    #   end
+    #
+    # @return [VirtualMfaDeviceCollection] Returns a collection that
+    #   represents the virtual MFA devices that are not assigned to an
+    #   IAM user.
+    def virtual_mfa_devices
+      VirtualMfaDeviceCollection.new(:config => config)
+    end
+
     # Sets the account alias for this AWS account.
     # @param [String] account_alias
     # @return [String] Returns the account alias passed.

data/lib/aws/iam/client.rb

@@ -28,12 +28,15 @@ module AWS
       REQUEST_CLASS = IAM::Request
 
       # @private
-      CACHEABLE_REQUESTS = Set[:list_groups,
-                               :list_group_policies,
-                               :list_groups_for_user,
-                               :list_server_certificates,
-                               :get_group,
-                               :get_group_policy]
+      CACHEABLE_REQUESTS = Set[
+        :list_groups,
+        :list_group_policies,
+        :list_groups_for_user,
+        :list_server_certificates,
+        :list_virtual_mfa_devices,
+        :get_group,
+        :get_group_policy
+      ]
 
       configure_client
 

data/lib/aws/iam/mfa_device.rb

@@ -31,8 +31,10 @@ module AWS
       # @return [String] Returns the MFA device's serial number
       attr_reader :serial_number
 
-      # Deactivates the MFA device and removes it from association with the 
-      # user for which it was originally enabled.
+      # Deactivates the MFA device and removes it from association
+      # with the user for which it was originally enabled.  You must
+      # call {MFADeviceCollection#enable} to enable the device again.
+      #
       # @return [nil]
       def deactivate
         client.deactivate_mfa_device({

data/lib/aws/iam/mfa_device_collection.rb

@@ -63,11 +63,16 @@ module AWS
         MFADevice.new(user, serial_number)
       end
 
-      # Deletes all of the MFA devices in this collection.
+      # Deactivates all of the MFA devices in this collection.
+      # Virtual MFA devices in this collection will not be
+      # deleted. Instead they will be available in the
+      # {IAM#virtual_mfa_devices} collection so that they can either
+      # be deleted or enabled for different users.
+      #
       # @return [nil]
       def clear
         each do |device| 
-          device.delete
+          device.deactivate
         end
         nil
       end
@@ -104,7 +109,13 @@ module AWS
       def each_item response, &block
         response.mfa_devices.each do |item|
 
-          mfa_device = MFADevice.new(user, item.serial_number)
+          if item.serial_number =~ /^arn:/
+            mfa_device = VirtualMfaDevice.new_from(:list_mfa_devices, item,
+                                                   item.serial_number,
+                                                   :config => config)
+          else
+            mfa_device = MFADevice.new(user, item.serial_number)
+          end
 
           yield(mfa_device)
 

data/lib/aws/iam/user.rb

@@ -58,6 +58,16 @@ module AWS
     # In order to delete a user you must first remove it from all of its
     # groups and delete all of its signing certificates.  Once this is done:
     #
+    # @attr [String] user_name
+    #
+    # @attr [String] path
+    #
+    # @attr_reader [String] id
+    #
+    # @attr_reader [DateTime] create_date
+    #
+    # @attr_reader [String] arn
+    #
     class User < Resource
 
       prefix_update_attributes

data/lib/aws/iam/virtual_mfa_device.rb

@@ -0,0 +1,139 @@
+# 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 'base64'
+
+module AWS
+  class IAM
+
+    # @attr_reader [String] base_32_string_seed The Base32 seed defined as 
+    #   specified in RFC3548.  Only accessible on newly created 
+    #   devices. This value is Base64-encoded.
+    # 
+    # @attr_reader [Blob] qr_code_png A QR code PNG image that encodes 
+    #   otpauth://totp/$virtualMFADeviceName@$AccountName? secret=$Base32String 
+    #   where $virtualMFADeviceName is one of the create call arguments, 
+    #   AccountName is the user name if set (accountId otherwise), and 
+    #   Base32String is the seed in Base32 format.  Only accessible on newly
+    #   created devices. This value is Base64-encoded.
+    #
+    # @attr_reader [DateTime] enable_date When this device was enabled.
+    #   Returns nil if this device has not been enabled.
+    #
+    class VirtualMfaDevice < Resource
+
+      # @private
+      def initialize serial_number, options = {}
+        @serial_number = serial_number
+        super
+      end
+
+      # @return [String] Returns the virtual MFA device serial number (ARN).
+      attr_reader :serial_number
+
+      alias_method :arn, :serial_number
+
+      attribute :base_32_string_seed, :static => true
+
+      attribute :qr_code_png, :static => true
+
+      attribute :enable_date, :static => true
+
+      attribute :user_details, :as => :user
+
+      protected :user_details
+
+      # @return [User,nil] Returns the user this device was enabled
+      #   for, or nil if this device has not been enabled.
+      def user
+        if details = user_details
+          User.new(details.user_name, :config => config)
+        end
+      end
+
+      # Enables the MFA device and associates it with the specified user. 
+      # When enabled, the MFA device is required for every subsequent login 
+      # by the user name associated with the device.
+      # @param [User,String] user The user (or user name string) you want
+      #   to enable this device for.
+      # @param [String] code1 An authentication code emitted by the device.
+      # @param [String] code2 A subsequent authentication code emitted by 
+      #   the device.
+      def enable user, code1, code2
+
+        user_name = user.is_a?(User) ? user.name : user
+
+        client.enable_mfa_device(
+          :user_name => user_name,
+          :serial_number => serial_number,
+          :authentication_code_1 => format_auth_code(code1),
+          :authentication_code_2 => format_auth_code(code2))
+
+        nil
+
+      end
+
+      # @return [Boolean] Returns true if this device has been enabled
+      #   for a user.
+      def enabled?
+        !!enable_date
+      end
+
+      # Deactivates the MFA device and removes it from association with 
+      # the user for which it was originally enabled.
+      # @return [nil]
+      def deactivate
+        client_opts = {}
+        client_opts[:user_name] = user.name
+        client_opts[:serial_number] = serial_number
+        client.deactivate_mfa_device(client_opts)
+        nil
+      end
+      alias_method :disable, :deactivate
+
+      # Deletes this virtual MFA device.
+      # @return [nil]
+      def delete
+        client.delete_virtual_mfa_device(resource_options)
+        nil
+      end
+
+      populates_from :create_virtual_mfa_device do |resp|
+        if resp.virtual_mfa_device.serial_number == serial_number
+          resp.virtual_mfa_device 
+        end
+      end
+
+      populates_from :list_virtual_mfa_devices do |resp|
+        resp.virtual_mfa_devices.find { |d| d.serial_number == serial_number }
+      end
+
+      protected
+      def format_auth_code(code)
+        sprintf("%06d", code)
+      end
+
+      protected
+      def get_resource attr_name
+        client.list_virtual_mfa_devices
+      end
+
+      protected
+      def resource_identifiers
+        [[:serial_number, serial_number]]
+      end
+
+    end
+
+  end
+end

data/lib/aws/iam/virtual_mfa_device_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 IAM
+
+    class VirtualMfaDeviceCollection
+
+      include Collection
+
+      # Creates a new virtual MFA device for the AWS account. 
+      # After creating the virtual MFA, you can enable the device to an
+      # IAM user.
+      # 
+      # @param [String] name The name of the virtual MFA device. Name and path
+      #   together uniquely identify a virtual MFA device.
+      # @param [Hash] options
+      # @option [String] :path The path for the virtual MFA device.
+      # @return [VirtualMfaDevice]
+      def create name, options = {}
+
+        client_opts = options.dup
+        client_opts[:virtual_mfa_device_name] = name
+        resp = client.create_virtual_mfa_device(client_opts)
+
+        VirtualMfaDevice.new_from(
+          :create_virtual_mfa_device,
+          resp.virtual_mfa_device, 
+          resp.virtual_mfa_device.serial_number,
+          :config => config)
+
+      end
+
+      # Returns a virtual MFA device with the given serial number.
+      # @param [String] serial_number The serial number (ARN) of a virtual 
+      #   MFA device.
+      # @return [VirtualMfaDevice]
+      def [] serial_number
+        VirtualMfaDevice.new(serial_number, :config => config)
+      end
+
+      protected
+      def request_method; :list_virtual_mfa_devices; end
+
+      protected
+      def next_token_key; :marker; end
+
+      protected
+      def limit_key; :max_items; end
+
+      protected
+      def each_item(response)
+        response.virtual_mfa_devices.each do |d|
+          device = VirtualMfaDevice.new_from(
+            :list_mfa_devices, d, d.serial_number, :config => config)
+          yield(device)
+        end
+      end
+
+    end
+
+  end
+end

data/lib/aws/record/abstract_base.rb

@@ -202,6 +202,7 @@ module AWS
             raise 'unable to delete, this object has not been saved yet'
           end
         end
+        alias_method :destroy, :delete
   
         # @return [Boolean] Returns true if this instance object has been deleted.
         def deleted?

data/lib/aws/record/hash_model/attributes.rb

@@ -22,7 +22,7 @@ module AWS
         #
         # @example A standard string attribute
         #
-        #   class Recipe < AWS::Record::Model
+        #   class Recipe < AWS::Record::HashModel
         #     string_attr :name
         #   end
         #
@@ -31,7 +31,7 @@ module AWS
         #
         # @example A string attribute with +:set+ set to true
         #
-        #   class Recipe < AWS::Record::Model
+        #   class Recipe < AWS::Record::HashModel
         #     string_attr :tags, :set => true
         #   end
         #
@@ -48,7 +48,7 @@ module AWS
   
         # Adds an integer attribute to this class.
         #
-        #   class Recipe < AWS::Record::Model
+        #   class Recipe < AWS::Record::HashModel
         #     integer_attr :servings
         #   end
         #
@@ -65,7 +65,7 @@ module AWS
   
         # Adds a float attribute to this class.
         #
-        #   class Listing < AWS::Record::Model
+        #   class Listing < AWS::Record::HashModel
         #     float_attr :score
         #   end
         #
@@ -84,7 +84,7 @@ module AWS
         #
         # @example
         #
-        #   class Book < AWS::Record::Model
+        #   class Book < AWS::Record::HashModel
         #     boolean_attr :read
         #   end
         #
@@ -112,7 +112,7 @@ module AWS
         #
         # @example A standard datetime attribute
         #
-        #   class Recipe < AWS::Record::Model
+        #   class Recipe < AWS::Record::HashModel
         #     datetime_attr :invented
         #   end
         #
@@ -137,7 +137,7 @@ module AWS
         #
         # @example A standard date attribute
         #
-        #   class Person < AWS::Record::Model
+        #   class Person < AWS::Record::HashModel
         #     date_attr :birthdate
         #   end
         #
@@ -161,7 +161,7 @@ module AWS
         #
         # @example
         #
-        #   class Recipe < AWS::Record::Model
+        #   class Recipe < AWS::Record::HashModel
         #     timestamps
         #   end
         #