fog-aws 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b755e78b954c63b5857d91ec7054021ad448bf51
-  data.tar.gz: f9f118f04869ec1ec925fda14d3a896a7a48c40f
+  metadata.gz: 6fadd0502aac63d36fb75307b3f73c318aa7b761
+  data.tar.gz: 91359d42a5922d20b668da81fc7073bf0534a5ba
 SHA512:
-  metadata.gz: 824e71f7f75c19fd9e0d0fea083f3538f7f302f763d532eaa92f51d111e9bc4afaa4f406f88e856c19fcdda555ce4bbb5e40c6a8b860996ce1df06ccdc43d7be
-  data.tar.gz: 68e19eed81bd3f187ac2f39cc12b5a8389af3cc077d2ef2459392a6acfa2601b6732c79926392e10fc1cc7ff84d92cdf6ebc03b8613eac94dbe67f9aea0d7fd1
+  metadata.gz: 14e6301495abbdfeaf6f03a007495a4cbab38dedfd44bcea3871b97b5a284e0fd7503082cab5c495c54f8bf963b03157b0238a8c1541d77889bf4e9501589cef
+  data.tar.gz: 75d9dfc7a737ea2656f54fce0c2a49abf95f7daa6f6c45e07bc81e3ec95e479945273a55dd81706ebef896ec8579dafd05047bc7ee97532ab8308047e59bde61

data/lib/fog/aws/compute.rb

@@ -99,6 +99,7 @@ module Fog
       request :describe_dhcp_options
       request :describe_images
       request :describe_instances
+      request :describe_instance_attribute
       request :describe_internet_gateways
       request :describe_reserved_instances
       request :describe_instance_status

data/lib/fog/aws/iam.rb

@@ -162,8 +162,9 @@ module Fog
         end
 
         def initialize(options={})
-          @use_iam_profile = options[:use_iam_profile]
+          @use_iam_profile           = options[:use_iam_profile]
           @aws_credentials_expire_at = Time::now + 20
+
           setup_credentials(options)
         end
 
@@ -173,11 +174,16 @@ module Fog
 
         def reset_data
           self.class.data.delete(@aws_access_key_id)
+          current_user
         end
 
         def setup_credentials(options)
           @aws_access_key_id = options[:aws_access_key_id]
         end
+
+        def current_user
+          self.data[:users]["root"]
+        end
       end
 
       class Real
@@ -201,11 +207,11 @@ module Fog
         # ==== Returns
         # * IAM object with connection to AWS.
         def initialize(options={})
+          @use_iam_profile    = options[:use_iam_profile]
+          @connection_options = options[:connection_options] || {}
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.iam'
 
-          @use_iam_profile = options[:use_iam_profile]
-          @connection_options     = options[:connection_options] || {}
-          @instrumentor           = options[:instrumentor]
-          @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.iam'
           @host       = options[:host]        || 'iam.amazonaws.com'
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
@@ -215,7 +221,6 @@ module Fog
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
 
           setup_credentials(options)
-
         end
 
         def reload
@@ -225,14 +230,14 @@ module Fog
         private
 
         def setup_credentials(options)
-          @aws_access_key_id      = options[:aws_access_key_id]
-          @aws_secret_access_key  = options[:aws_secret_access_key]
-          @aws_session_token      = options[:aws_session_token]
+          @aws_access_key_id         = options[:aws_access_key_id]
+          @aws_secret_access_key     = options[:aws_secret_access_key]
+          @aws_session_token         = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
           #global services that have no region are signed with the us-east-1 region
           #the only exception is GovCloud, which requires the region to be explicitly specified as us-gov-west-1
-          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region,'iam')
+          @signer = Fog::AWS::SignatureV4.new(@aws_access_key_id, @aws_secret_access_key, @region, 'iam')
         end
 
         def request(params)

data/lib/fog/aws/models/iam/policies.rb

@@ -6,32 +6,30 @@ module Fog
       class Policies < Fog::Collection
         model Fog::AWS::IAM::Policy
 
-        def initialize(attributes = {})
-          @username = attributes[:username]
-          raise ArgumentError.new("Can't get a policy's user without a username") unless @username
-          super
-        end
+        attribute :username
 
         def all
+          requires :username
           # AWS method get_user_policy only returns an array of policy names, this is kind of useless,
           # that's why it has to loop through the list to get the details of each element. I don't like it because it makes this method slow
-          policy_names = service.list_user_policies(@username).body['PolicyNames'] # it returns an array
-          policies = []
-          policy_names.each do |policy_name|
-            policies << service.get_user_policy(policy_name,@username).body['Policy']
+          policy_names = service.list_user_policies(self.username).body['PolicyNames'] # it returns an array
+          policies = policy_names.map do |policy_name|
+            service.get_user_policy(policy_name, self.username).body['Policy']
           end
           load(policies) # data is an array of attribute hashes
         end
 
         def get(identity)
-          data = service.get_user_policy(identity,@username).body['Policy']
+          requires :username
+
+          data = service.get_user_policy(identity, self.username).body['Policy']
           new(data) # data is an attribute hash
         rescue Fog::AWS::IAM::NotFound
           nil
         end
 
         def new(attributes = {})
-          super({ :username => @username }.merge!(attributes))
+          super({ :username => self.username }.merge!(attributes))
         end
       end
     end

data/lib/fog/aws/models/iam/users.rb

@@ -16,6 +16,10 @@ module Fog
           load(data['Users']) # data is an array of attribute hashes
         end
 
+        def current
+          new(service.get_user.body['User'])
+        end
+
         def get(identity)
           data = service.get_user(identity).body['User']
           new(data) # data is an attribute hash

data/lib/fog/aws/parsers/compute/describe_instance_attribute.rb

@@ -0,0 +1,178 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class DescribeInstanceAttribute < Fog::Parsers::Base
+          def reset
+            @response                             = { }
+            @in_instanceType                      = false
+            @in_kernelId                          = false
+            @in_ramdiskId                         = false
+            @in_userData                          = false
+            @in_disableApiTermination             = false
+            @in_instanceInitiatedShutdownBehavior = false
+            @in_rootDeviceName                    = false
+            @in_blockDeviceMapping                = false
+            @in_productCodes                      = false
+            @in_ebsOptimized                      = false
+            @in_sriovNetSupport                   = false
+            @in_sourceDestCheck                   = false
+            @in_groupSet                          = false
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+            when 'instanceType'
+              @in_instanceType   = true
+            when 'kernel'
+              @in_kernel = true
+            when 'ramdisk'
+              @in_ramdisk = true
+            when 'userData'
+              @in_userData = true
+            when 'disableApiTermination'
+              @in_disableApiTermination = true
+            when 'instanceInitiatedShutdownBehavior'
+              @in_instanceInitiatedShutdownBehavior = true
+            when 'rootDeviceName'
+              @in_rootDeviceName = true
+            when 'blockDeviceMapping'
+              @in_blockDeviceMapping = true
+              @block_device_mapping = {}
+              unless @response.key?('blockDeviceMapping')
+                @response['blockDeviceMapping'] = []
+              end
+            when 'productCodes'
+              @in_productCodes = true
+              unless @response.key?('productCodes')
+                @response['productCodes'] = []
+              end
+            when 'ebsOptimized'
+              @in_ebsOptimized = true
+            when 'sriovNetSupport'
+              @in_sriovNetSupport = true
+            when 'sourceDestCheck'
+              @in_sourceDestCheck = true
+            when 'groupSet'
+              @in_groupSet = true
+              @group = {}
+              unless @response.key?('groupSet')
+                @response['groupSet'] = []
+              end
+            end
+          end
+
+          def end_element(name)
+            if @in_instanceType
+              case name
+              when 'value'
+                @response['instanceType'] = value
+              when 'instanceType'
+                @in_instanceType = false
+              end
+            elsif @in_kernel
+              case name
+              when 'value'
+                @response['kernelId'] = value
+              when 'kernel'
+                @in_kernelId = false
+              end
+            elsif @in_ramdisk
+              case name
+              when 'value'
+                @response['ramdiskId'] = value
+              when 'ramdisk'
+                @in_ramdiskId = false
+              end
+            elsif @in_userData
+              case name
+              when 'value'
+                @response['userData'] = value
+              when 'userData'
+                @in_userData = false
+              end
+            elsif @in_disableApiTermination
+              case name
+              when 'value'
+                @response['disableApiTermination'] = (value == 'true')
+              when 'disableApiTermination'
+                @in_disableApiTermination = false
+              end
+            elsif @in_instanceInitiatedShutdownBehavior
+              case name
+              when 'value'
+                @response['instanceInitiatedShutdownBehavior'] = value
+              when 'instanceInitiatedShutdownBehavior'
+                @in_instanceInitiatedShutdownBehavior = false
+              end
+            elsif @in_rootDeviceName
+              case name
+              when 'value'
+                @response['rootDeviceName'] = value
+              when 'rootDeviceName'
+                @in_rootDeviceName = false
+              end
+            elsif @in_blockDeviceMapping
+              case name
+              when 'item'
+                @response["blockDeviceMapping"] << @block_device_mapping
+                @block_device_mapping = {}
+              when 'volumeId', 'status', 'deviceName'
+                @block_device_mapping[name] = value
+              when 'attachTime'
+                @block_device_mapping['attachTime'] = Time.parse(value)
+              when 'deleteOnTermination'
+                @block_device_mapping['deleteOnTermination'] = (value == 'true')
+              when 'blockDeviceMapping'
+                @in_blockDeviceMapping = false
+              end
+            elsif @in_productCodes
+              @response['productCodes'] << value
+              case name
+              when 'productCodes'
+                @in_productCodes = false
+              end
+            elsif @in_ebsOptimized
+              case name
+              when 'value'
+                @response['ebsOptimized'] = (value == 'true')
+              when 'ebsOptimized'
+                @in_ebsOptimized = false
+              end
+            elsif @in_sriovNetSupport
+              case name
+              when 'value'
+                @response["sriovNetSupport"] = value
+              when "sriovNetSupport"
+                @in_sriovNetSupport = false
+              end
+            elsif @in_sourceDestCheck
+              case name
+              when 'value'
+                @response['sourceDestCheck'] = (value == 'true')
+              when 'sourceDestCheck'
+                @in_sourceDestCheck = false
+              end
+            elsif @in_groupSet
+              case name
+              when 'item'
+                @response['groupSet'] << @group
+                @group = {}
+              when 'groupId'
+                @group["groupId"] = value
+              when 'groupSet'
+                @in_groupSet = false
+              end
+            else
+              case name
+              when 'requestId', 'instanceId'
+                @response[name] = value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,87 @@
+module Fog
+  module Compute
+    class AWS
+      class Real
+        require 'fog/aws/parsers/compute/describe_instance_attribute'
+        # Describes an instance attribute value
+        #
+        # ==== Parameters
+        # * instance_id<~String>    - The ID of the instance you want to describe an attribute of
+        # * attribute<~String> - The attribute to describe, must be one of the following:
+        #    -'instanceType'
+        #    -'kernel'
+        #    -'ramdisk'
+        #    -'userData'
+        #    -'disableApiTermination'
+        #    -'instanceInitiatedShutdownBehavior'
+        #    -'rootDeviceName'
+        #    -'blockDeviceMapping'
+        #    -'productCodes'
+        #    -'sourceDestCheck'
+        #    -'groupSet'
+        #    -'ebsOptimized'
+        #    -'sriovNetSupport'
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        # * body<~Hash>:
+        # * 'requestId'<~String>                - Id of request
+        # * 'instanceId'<~String>               - The ID of the instance
+        # * 'instanceType'<~String>             - Instance type
+        # * 'kernelId'<~String>                 - The kernel ID
+        # * 'ramdiskId'<~String>                - The RAM disk ID
+        # * 'userData'<~String>                 - The Base64-encoded MIME user data
+        # * 'disableApiTermination'<~Boolean>   - If the value is true , you can't terminate the instance through the Amazon EC2 console, CLI, or API; otherwise, you can.
+        # * 'instanceInitiatedShutdownBehavior'<~String> - Indicates whether an instance stops or terminates when you initiate shutdown from the instance (using the operating system command for system shutdown)
+        # * 'rootDeviceName'<~String>           - The name of the root device (for example, /dev/sda1 or /dev/xvda )
+        # * 'blockDeviceMapping'<~List>        - The block device mapping of the instance
+        # * 'productCodes'<~List>               - A list of product codes
+        # * 'ebsOptimized'<~Boolean>            - Indicates whether the instance is optimized for EBS I/O
+        # * 'sriovNetSupport'<~String>          - The value to use for a resource attribute
+        # * 'sourceDestCheck'<~Boolean>         - Indicates whether source/destination checking is enabled. A value of true means checking is enabled, and false means checking is disabled. This value must be false for a NAT instance to perform NAT
+        # * 'groupSet'<~List>                     - The security groups associated with the instance
+        # (Amazon API Reference)[http://docs.aws.amazon.com/AWSEC2/latest/APIReference/API_DescribeInstanceAttribute.html]
+        def describe_instance_attribute(instance_id, attribute)
+          request(
+            'Action'       => 'DescribeInstanceAttribute',
+            'InstanceId'   => instance_id,
+            'Attribute'    => attribute,
+            :parser        => Fog::Parsers::Compute::AWS::DescribeInstanceAttribute.new
+          )
+        end
+      end
+
+      class Mock
+        def describe_instance_attribute(instance_id, attribute)
+          response = Excon::Response.new
+          if instance = self.data[:instances].values.find{ |i| i['instanceId'] == instance_id }
+            response.status = 200
+            response.body = {
+              'requestId' => Fog::AWS::Mock.request_id,
+              'instanceId'     => instance_id
+            }
+            case attribute
+            when 'kernel'
+              response.body[attribute] = instance["kernelId"]
+            when 'ramdisk'
+              response.body[attribute] = instance["ramdiskId"]
+            when 'disableApiTermination'
+              response.body[attribute] = false
+            when 'instanceInitiatedShutdownBehavior'
+              response.body['instanceInitiatedShutdownBehavior'] = 'stop'
+            when 'sourceDestCheck'
+              response.body[attribute] = true
+            when 'sriovNetSupport'
+              response.body[attribute] = 'simple'
+            else
+              response.body[attribute] = instance[attribute]
+            end
+          response
+          else
+            raise Fog::Compute::AWS::NotFound.new("The Instance '#{instance_id}' does not exist")
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/iam/create_user.rb

@@ -35,22 +35,22 @@ module Fog
 
       class Mock
         def create_user(user_name, path='/')
-          if data[:users].key? user_name
+          if data[:users].key?(user_name)
             raise Fog::AWS::IAM::EntityAlreadyExists.new "User with name #{user_name} already exists."
-          else
-            data[:users][user_name][:path] = path
-            Excon::Response.new.tap do |response|
-              response.status = 200
-              response.body = { 'User' => {
-                                           "UserId"     => data[:users][user_name][:user_id],
-                                           "Path"       => path,
-                                           "UserName"   => user_name,
-                                           "Arn"        => (data[:users][user_name][:arn]).strip,
-                                           "CreateDate" => data[:users][user_name][:created_at]
-                                           },
-                                'RequestId' => Fog::AWS::Mock.request_id
-                               }
-            end
+          end
+
+          data[:users][user_name][:path] = path
+
+          Excon::Response.new.tap do |response|
+            response.status = 200
+            response.body = { 'User' => {
+              "UserId"     => data[:users][user_name][:user_id],
+              "Path"       => path,
+              "UserName"   => user_name,
+              "Arn"        => (data[:users][user_name][:arn]).strip,
+            },
+            'RequestId' => Fog::AWS::Mock.request_id
+            }
           end
         end
       end

data/lib/fog/aws/requests/iam/get_user.rb

@@ -23,31 +23,55 @@ module Fog
         # ==== See Also
         # http://docs.amazonwebservices.com/IAM/latest/APIReference/API_Getuser.html
         #
-        def get_user(username, options = {})
-          request({
-            'Action'    => 'GetUser',
-            'UserName'  => username,
-            :parser     => Fog::Parsers::AWS::IAM::GetUser.new
-          }.merge!(options))
+        def get_user(username = nil, options = {})
+          params = {
+            'Action' => 'GetUser',
+            :parser  => Fog::Parsers::AWS::IAM::GetUser.new
+          }
+
+          if username
+            params.merge!('UserName' => username)
+          end
+
+          request(params.merge(options))
         end
       end
 
       class Mock
-        def get_user(user, options = {})
-          raise Fog::AWS::IAM::NotFound.new(
-            "The user with name #{user} cannot be found."
-          ) unless self.data[:users].key?(user)
-          Excon::Response.new.tap do |response|
-            response.body = {'User' =>  {
-                                          'UserId'     => data[:users][user][:user_id],
-                                          'Path'       => data[:users][user][:path],
-                                          'UserName'   => user,
-                                          'Arn'        => (data[:users][user][:arn]).strip,
-                                          'CreateDate' => data[:users][user][:created_at]
-                                        },
-                             'RequestId'   => Fog::AWS::Mock.request_id }
-            response.status = 200
+        def get_user(username = nil, options = {})
+          response  = Excon::Response.new
+          user_body = nil
+
+          if username.nil? # show current user
+            user = self.current_user
+
+            user_body = {
+              'UserId'     => user[:user_id],
+              'Arn'        => user[:arn].strip,
+              'CreateDate' => user[:created_at]
+            }
+
+          elsif !self.data[:users].key?(username)
+            raise Fog::AWS::IAM::NotFound.new("The user with name #{username} cannot be found.")
+          else
+            user = self.data[:users][username]
+
+            user_body = {
+              'UserId'     => user[:user_id],
+              'Path'       => user[:path],
+              'UserName'   => username,
+              'Arn'        => user[:arn].strip,
+              'CreateDate' => user[:created_at]
+            }
           end
+
+          response.status = 200
+          response.body = {
+            'User'      => user_body,
+            'RequestId' => Fog::AWS::Mock.request_id
+          }
+
+          response
         end
       end
     end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "0.2.2"
+    VERSION = "0.3.0"
   end
 end

data/tests/models/iam/users_tests.rb

@@ -38,6 +38,10 @@ Shindo.tests("Fog::Compute[:iam] | users", ['aws','iam']) do
     @iam.users.get(@user_one_name).id == @user_one_name
   end
 
+  tests('#current').succeeds do
+    @iam.users.current
+  end
+
   tests('#get',"returns nil if the user doesn't exists").succeeds do
     @iam.users.get('non-exists') == nil
   end

data/tests/requests/compute/instance_attrib_tests.rb

@@ -0,0 +1,168 @@
+Shindo.tests('Fog::Compute[:aws] | describe_instance_attribute request', ['aws']) do
+  @instance_attributes = [
+    'instanceType',
+    'kernel',
+    'ramdisk',
+    'userData',
+    'disableApiTermination',
+    'instanceInitiatedShutdownBehavior',
+    'rootDeviceName',
+    'blockDeviceMapping',
+    'productCodes',
+    'groupSet',
+    'ebsOptimized',
+    'sourceDestCheck',
+    'sriovNetSupport'
+  ]
+
+  @instance_attribute_common_format = {
+    "requestId"                         => String,
+    "instanceId"                        => String
+  }
+
+  @instance_attribute_format = {
+    "instanceType"                      => Fog::Nullable::String,
+    "kernelId"                          => Fog::Nullable::String,
+    "ramdiskId"                         => Fog::Nullable::String,
+    "userData"                          => Fog::Nullable::String,
+    "disableApiTermination"             => Fog::Nullable::Boolean,
+    "instanceInitiatedShutdownBehavior" => Fog::Nullable::String,
+    "rootDeviceName"                    => Fog::Nullable::String,
+    "blockDeviceMapping"                => [Fog::Nullable::Hash],
+    "productCodes"                      => Fog::Nullable::Array,
+    "ebsOptimized"                      => Fog::Nullable::Boolean,
+    "sriovNetSupport"                   => Fog::Nullable::String,
+    "sourceDestCheck"                   => Fog::Nullable::Boolean,
+    "groupSet"                          => [Fog::Nullable::Hash]
+  }
+
+  tests('success') do
+
+    # In mocking the groupSet attribute is returned as nil
+    if Fog.mocking?
+      @instance_attribute_format["groupSet"] = Fog::Nullable::Array
+    end
+    # Setting up the environment
+    @instance_id = nil
+    @ami = 'ami-79c0ae10'
+    key_name = 'fog-test-key'
+    @key = Fog::Compute[:aws].key_pairs.create(:name => key_name)
+    instance_type = "t1.micro"
+    @az = "us-east-1a"
+    vpc = Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/16')
+    subnet = Fog::Compute[:aws].subnets.create('vpc_id' => vpc.id, 'cidr_block' => '10.0.10.0/16', "availability_zone" => @az)
+    security_groups = Fog::Compute[:aws].security_groups.all
+    @launch_config = {
+      :image_id => @ami,
+      :flavor_id => instance_type,
+      :key_name => key_name,
+      :subnet_id => subnet.subnet_id,
+      :disable_api_termination => false
+    }
+    if !Fog.mocking?
+      security_group = security_groups.select { |group| group.vpc_id == vpc.id }
+      security_group_ids = security_group.collect { |group| group.group_id }
+      @launch_config[:security_group_ids] = security_group_ids
+      block_device_mapping = [{"DeviceName" => "/dev/sdp1", "VirtualName" => nil, "Ebs.VolumeSize" => 15}]
+      @launch_config[:block_device_mapping] = block_device_mapping
+    else
+      security_group_ids = [nil]
+      # In mocking the first device provided in block_device_mapping is set as the root device. There is no root device by default. So setting the root device here so that the tests for rootDeviceName and blockDeviceMapping attribute get passed
+      block_device_mapping = [{"DeviceName" => "/dev/sda1", "VirtualName" => nil, "Ebs.VolumeSize" => 15},{"DeviceName" => "/dev/sdp1", "VirtualName" => nil, "Ebs.VolumeSize" => 15}]
+      @launch_config[:block_device_mapping] = block_device_mapping
+    end
+
+
+
+    server = Fog::Compute[:aws].servers.create(@launch_config)
+    server.wait_for { ready? }
+    server.reload
+    @instance_id = server.id
+    ################
+    # BEGIN TESTS  #
+    ################
+    @instance_attributes.each do |attrib|
+      # Creating format schema for each attribute
+      describe_instance_attribute_format = @instance_attribute_common_format.clone
+      if attrib == "kernel"
+        key = "kernelId"
+      elsif attrib == "ramdisk"
+        key = "ramdiskId"
+      else
+        key = attrib
+      end
+      describe_instance_attribute_format[key] = @instance_attribute_format[key]
+      # Running format check
+      tests("#describe_instance_attribute('#{@instance_id}', #{attrib})").formats(describe_instance_attribute_format,false) do
+        Fog::Compute[:aws].describe_instance_attribute(@instance_id, attrib).body
+      end
+      # Running test to see proper instance Id is get in each response
+      tests("#describe_instance_attribute('#{@instance_id}', #{attrib})").returns(@instance_id) do
+        Fog::Compute[:aws].describe_instance_attribute(@instance_id, attrib).body['instanceId']
+      end
+    end
+
+    # Test for instanceType attribute
+    tests("#describe_instance_attribute(#{@instance_id}, 'instanceType')").returns(instance_type) do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'instanceType').body["instanceType"]
+    end
+    # Test for disableApiTermination attribute
+    tests("#describe_instance_attribute(#{@instance_id}, 'disableApiTermination')").returns(false) do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'disableApiTermination').body["disableApiTermination"]
+    end
+    # Test for instanceInitiatedShutdownBehavior attribute
+    tests("#describe_instance_attribute(#{@instance_id}, 'instanceInitiatedShutdownBehavior')").returns('stop') do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'instanceInitiatedShutdownBehavior').body["instanceInitiatedShutdownBehavior"]
+    end
+    # Test for rootDeviceName attribute
+    tests("#describe_instance_attribute(#{@instance_id}, 'rootDeviceName')").returns('/dev/sda1') do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'rootDeviceName').body["rootDeviceName"]
+    end
+    # Test to see there are two devices for blockDeviceMapping attribute
+    tests("#describe_instance_attribute(#{@instance_id}, 'blockDeviceMapping')").returns(2) do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'blockDeviceMapping').body["blockDeviceMapping"].count
+    end
+    # Test to check the device name /dev/sdp1 passed in block_device_mapping is returned correctly
+    tests("#describe_instance_attribute(#{@instance_id}, 'blockDeviceMapping')").returns("/dev/sdp1") do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'blockDeviceMapping').body["blockDeviceMapping"].last["deviceName"]
+    end
+    # Test for groupSet attribute
+    tests("#describe_instance_attribute(#{@instance_id}, 'groupSet')").returns(security_group_ids) do
+      group_set = Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'groupSet').body["groupSet"]
+      group_set.collect { |g| g["groupId"]}
+    end
+    # Test for sourceDestCheck attribute (This attribute is set only for VPC instances. So created the instance in a VPC during setup process)
+    tests("#describe_instance_attribute(#{@instance_id}, 'sourceDestCheck')").returns(true) do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'sourceDestCheck').body["sourceDestCheck"]
+    end
+    # Test for ebsOptimized attribute
+    tests("#describe_instance_attribute(#{@instance_id}, 'ebsOptimized')").returns(false) do
+      Fog::Compute[:aws].describe_instance_attribute(@instance_id, 'ebsOptimized').body["ebsOptimized"]
+    end
+    ###############
+    # END OF TEST #
+    ###############
+
+    # Tear down
+    if !Fog.mocking?
+      @key.destroy
+      server.destroy
+      until server.state == "terminated"
+        sleep 5 #Wait for the server to be terminated
+        server.reload
+      end
+      subnet.destroy
+      vpc.destroy
+    end
+
+  end
+
+  tests('failure') do
+    @instance_attributes.each do |attrib|
+      tests("#describe_instance_attribute('i-00000000', #{attrib})").raises(Fog::Compute::AWS::NotFound) do
+        Fog::Compute[:aws].describe_instance_attribute('i-00000000', attrib)
+      end
+    end
+  end
+
+end

data/tests/requests/iam/helper.rb

@@ -23,7 +23,7 @@ ACtzLycIhlMTmDr0xBeIBx3lpgw2K0+4oefMS8Z17eeZPeNodxnz56juJm81BZwt
 DF3qnnPyArLFx0HLB7wQdm9xYVIqQuLO+V6GRuOd+uSX//aDLDZhwbERf35hoyto
 Jfk4gX/qwuRFNy0vjQeTzdvhB1igG/w=
 -----END CERTIFICATE-----
-}
+    }
     # The public key for SERVER_CERT. Generated using the command:
     # openssl x509 -inform pem -in server-public.crt -pubkey -noout > server.pubkey
     SERVER_CERT_PUBLIC_KEY = "MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC0CR76sovjdmpWRmEaf8XaG+nGe7czhpdLKkau2b16VtSjkPctxPL5U4vaMxQUboLPr+9oL+9fSYN31VzDD4hyaeGoeI5fhnGeqk71kq5uHONBOQUMbZbBQ8PVd9Sdk+y9JJ6E5fC+GhLL5I+y2DK7syBzyymq1Wi6rPp1XXF7AQIDAQAB"
@@ -43,7 +43,7 @@ c0AQtoYBTJePxiYyd8i32ypkkK83ar+sFoxKO9jYwD1IkZax2xZ0aoTdMindQPR7
 Yjs+QiLmOHcbPqX+GHcCQERsSn0RjzKmKirDntseMB59BB/cEN32+gMDVsZuCfb+
 fOy2ZavFl13afnhbh2/AjKeDhnb19x/uXjF7JCUtwpA=
 -----END RSA PRIVATE KEY-----
-}
+    }
 
     # openssl pkcs8 -nocrypt -topk8 -in SERVER_CERT_PRIVATE_KEY.key -outform pem
     SERVER_CERT_PRIVATE_KEY_PKCS8 = %{-----BEGIN PRIVATE KEY-----
@@ -62,7 +62,7 @@ v6wWjEo72NjAPUiRlrHbFnRqhN0yKd1A9HtiOz5CIuY4dxs+pf4YdwJARGxKfRGP
 MqYqKsOe2x4wHn0EH9wQ3fb6AwNWxm4J9v587LZlq8WXXdp+eFuHb8CMp4OGdvX3
 H+5eMXskJS3CkA==
 -----END PRIVATE KEY-----
-}
+    }
 
     SERVER_CERT_PRIVATE_KEY_MISMATCHED = %{-----BEGIN RSA PRIVATE KEY-----
 MIIEowIBAAKCAQEAyITMqYJMzkPMcaC+x0W2hnZVW99RXzLR8RYyD3xo2AotdJKx
@@ -91,12 +91,46 @@ cxyt9QKBgF4bFLw1Iw2RBngQxIzoDbElEqme20FUyGGzyFQtxVwmwNr4OY5UzJzX
 7G6diyzGrvRX81Yw616ppKJUJVr/zRc13K+eRXXKtNpGkf35B+1NDDjjWZpIHqgx
 Xb9WSr07saxZQbxBPQyTlb0Q9Tu2djAq2/o/nYD1/50/fXUTuWMB
 -----END RSA PRIVATE KEY-----
-}
+    }
 
     module Formats
       BASIC = {
         'RequestId' => String
       }
+
+      USER = {
+        'Arn'        => String,
+        'Path'       => String,
+        'UserId'     => String,
+        'UserName'   => String,
+      }
+
+      CREATE_USER = BASIC.merge('User' => USER)
+
+      GET_USER = BASIC.merge('User' => USER.merge('CreateDate' => Time))
+
+      GET_CURRENT_USER = BASIC.merge(
+        'User' => {
+          'Arn'        => String,
+          'UserId'     => String,
+          'CreateDate' => Time
+        }
+      )
+
+      LIST_USER = BASIC.merge(
+        'Users' => [USER.merge('CreateDate' => Time)],
+        'IsTruncated' => Fog::Boolean
+      )
+
+      GROUPS = BASIC.merge(
+        'GroupsForUser' => [{
+          'Arn'       => String,
+          'GroupId'   => String,
+          'GroupName' => String,
+          'Path'      => String
+        }],
+        'IsTruncated' => Fog::Boolean
+      )
     end
   end
 end

data/tests/requests/iam/user_tests.rb

@@ -1,75 +1,48 @@
 Shindo.tests('AWS::IAM | user requests', ['aws']) do
 
-  Fog::AWS[:iam].create_group('fog_user_tests')
-
-  tests('success') do
-
-    @user_format = {
-      'User' => {
-        'Arn'        => String,
-        'Path'       => String,
-        'UserId'     => String,
-        'UserName'   => String,
-        'CreateDate' => Time
-      },
-      'RequestId' => String
-    }
+  begin
+    Fog::AWS[:iam].delete_group('fog_user_tests')
+  rescue Fog::AWS::IAM::NotFound
+  end
 
-    tests("#create_user('fog_user')").formats(@user_format) do
-      Fog::AWS[:iam].create_user('fog_user').body
-    end
+  begin
+    Fog::AWS[:iam].delete_user('fog_user').body
+  rescue Fog::AWS::IAM::NotFound
+  end
 
-    @users_format = {
-      'Users' => [{
-        'Arn'        => String,
-        'Path'       => String,
-        'UserId'     => String,
-        'UserName'   => String,
-        'CreateDate' => Time
-      }],
-      'IsTruncated' => Fog::Boolean,
-      'RequestId'   => String
-    }
+  Fog::AWS[:iam].create_group('fog_user_tests')
 
-    tests("#list_users").formats(@users_format) do
-      Fog::AWS[:iam].list_users.body
-    end
 
-    tests("#get_user").formats(@user_format) do
-      Fog::AWS[:iam].get_user('fog_user').body
-    end
+  tests("#create_user('fog_user')").data_matches_schema(AWS::IAM::Formats::CREATE_USER) do
+    Fog::AWS[:iam].create_user('fog_user').body
+  end
 
-    tests("#add_user_to_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do
-      Fog::AWS[:iam].add_user_to_group('fog_user_tests', 'fog_user').body
-    end
+  tests("#list_users").data_matches_schema(AWS::IAM::Formats::LIST_USER) do
+    Fog::AWS[:iam].list_users.body
+  end
 
-    @groups_format = {
-      'GroupsForUser' => [{
-        'Arn'       => String,
-        'GroupId'   => String,
-        'GroupName' => String,
-        'Path'      => String
-      }],
-      'IsTruncated' => Fog::Boolean,
-      'RequestId'   => String
-    }
+  tests("#get_user('fog_user')").data_matches_schema(AWS::IAM::Formats::GET_USER) do
+    Fog::AWS[:iam].get_user('fog_user').body
+  end
 
-    tests("#list_groups_for_user('fog_user')").formats(@groups_format) do
-      Fog::AWS[:iam].list_groups_for_user('fog_user').body
-    end
+  tests("#get_user").data_matches_schema(AWS::IAM::Formats::GET_CURRENT_USER) do
+    Fog::AWS[:iam].get_user.body
+  end
 
-    tests("#remove_user_from_group('fog_user_tests', 'fog_user')").formats(AWS::IAM::Formats::BASIC) do
-      Fog::AWS[:iam].remove_user_from_group('fog_user_tests', 'fog_user').body
-    end
+  tests("#add_user_to_group('fog_user_tests', 'fog_user')").data_matches_schema(AWS::IAM::Formats::BASIC) do
+    Fog::AWS[:iam].add_user_to_group('fog_user_tests', 'fog_user').body
+  end
 
-    tests("#delete_user('fog_user')").formats(AWS::IAM::Formats::BASIC) do
-      Fog::AWS[:iam].delete_user('fog_user').body
-    end
+  tests("#list_groups_for_user('fog_user')").data_matches_schema(AWS::IAM::Formats::GROUPS) do
+    Fog::AWS[:iam].list_groups_for_user('fog_user').body
+  end
 
+  tests("#remove_user_from_group('fog_user_tests', 'fog_user')").data_matches_schema(AWS::IAM::Formats::BASIC) do
+    Fog::AWS[:iam].remove_user_from_group('fog_user_tests', 'fog_user').body
   end
 
-  tests('failure') do
-    test('failing conditions')
+  tests("#delete_user('fog_user')").data_matches_schema(AWS::IAM::Formats::BASIC) do
+    Fog::AWS[:iam].delete_user('fog_user').body
   end
 
   Fog::AWS[:iam].delete_group('fog_user_tests')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -386,6 +386,7 @@ files:
 - lib/fog/aws/parsers/compute/describe_classic_link_instances.rb
 - lib/fog/aws/parsers/compute/describe_dhcp_options.rb
 - lib/fog/aws/parsers/compute/describe_images.rb
+- lib/fog/aws/parsers/compute/describe_instance_attribute.rb
 - lib/fog/aws/parsers/compute/describe_instance_status.rb
 - lib/fog/aws/parsers/compute/describe_instances.rb
 - lib/fog/aws/parsers/compute/describe_internet_gateways.rb
@@ -789,6 +790,7 @@ files:
 - lib/fog/aws/requests/compute/describe_classic_link_instances.rb
 - lib/fog/aws/requests/compute/describe_dhcp_options.rb
 - lib/fog/aws/requests/compute/describe_images.rb
+- lib/fog/aws/requests/compute/describe_instance_attribute.rb
 - lib/fog/aws/requests/compute/describe_instance_status.rb
 - lib/fog/aws/requests/compute/describe_instances.rb
 - lib/fog/aws/requests/compute/describe_internet_gateways.rb
@@ -1333,6 +1335,7 @@ files:
 - tests/requests/compute/dhcp_options_tests.rb
 - tests/requests/compute/helper.rb
 - tests/requests/compute/image_tests.rb
+- tests/requests/compute/instance_attrib_tests.rb
 - tests/requests/compute/instance_tests.rb
 - tests/requests/compute/internet_gateway_tests.rb
 - tests/requests/compute/key_pair_tests.rb