fog-aws 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7ed98704279ce0f10689cfe548af6163b1ab02f
-  data.tar.gz: 2e2b92d7a351e877f6cfc012626e1b8dbdbbc73d
+  metadata.gz: 2a19f2beb9ccbc769e67d13f1439379dbe37d345
+  data.tar.gz: d2c335bd1b9b390d49ecfc3ca651611801e1b063
 SHA512:
-  metadata.gz: 1e59ea6e563f7bf85eabe38ac7d3507f5b7c4b6a0c9d205ff10d187052894a3bdb53c9299c97d929255ccdaf1142c71d0e03f0a7688a46d5bae71d4070c77018
-  data.tar.gz: e32073dbc8772718f1cd830226b6543023f5f543bb80b5a5f9a40c26c9fcf0b5ec024dae8e52258afdc8f6f367538fc4ec3b56a3c718b55125865b00c9dbb55d
+  metadata.gz: 292f539571c0e60a9cb39b999b2d3082c22dc49d664ef06aabab0adde68d6f40c8caf4a198ce1fc97ab47e77a82a564f65330c2fe7cb9525ab2134160a9fc225
+  data.tar.gz: 124b4a4d8ea72f661e3d98cf9c215871d56b377fb7d614973a5bab32384dcdd64a8ace0a5fee6fbdcb354a6b8473d2c49c9b1052aedb8d8f8bf324cda0a69e1d

data/.travis.yml

@@ -12,7 +12,7 @@ matrix:
   - rvm: 1.9.3
     gemfile: gemfiles/Gemfile-ruby-1.9
   - rvm: 2.0.0
-    gemfile: Gemfile
+    gemfile: gemfiles/Gemfile-ruby-2.0
   - rvm: 2.1.0
     gemfile: Gemfile
   - rvm: 2.1.1
@@ -51,4 +51,4 @@ env:
   global:
     secure: LlDKdKSRo3sEjQ55XesbOXhKZ3RrOtqoD1ZL8Wx39K3iVzeEV3Kc8HjDfEvo7R4pOc3BMTNJcputklVEPN0FkWGN7Py+OEtbHj3IZl0MX+KEWNk0gU+4+sgPrL1eXUQyMUSkCrBsKg08rPel4KMYUOXbtnLyUU9PDbBwm4LJYOc=
 after_success:
-  - bundle exec codeclimate-test-reporter
+  - bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -2,7 +2,21 @@
 
 ## [Unreleased](https://github.com/fog/fog-aws/tree/HEAD)
 
-[Full Changelog](https://github.com/fog/fog-aws/compare/v1.0.0...HEAD)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.1.0...HEAD)
+
+**Closed issues:**
+
+- Support for AWS Application Load Balancer \(ALB\) [\#335](https://github.com/fog/fog-aws/issues/335)
+
+**Merged pull requests:**
+
+- Better iam policies [\#339](https://github.com/fog/fog-aws/pull/339) ([ehowe](https://github.com/ehowe))
+- Pin nokogiri gem for Ruby 1.9 and Ruby 2.0 [\#337](https://github.com/fog/fog-aws/pull/337) ([sodabrew](https://github.com/sodabrew))
+- Fix parsing of the Reserved Instance 'recurringCharge' field and add 'scope' field [\#336](https://github.com/fog/fog-aws/pull/336) ([sodabrew](https://github.com/sodabrew))
+- Fixes / improvements for AutoScaling [\#334](https://github.com/fog/fog-aws/pull/334) ([lanej](https://github.com/lanej))
+
+## [v1.1.0](https://github.com/fog/fog-aws/tree/v1.1.0) (2016-12-16)
+[Full Changelog](https://github.com/fog/fog-aws/compare/v1.0.0...v1.1.0)
 
 **Closed issues:**
 

data/gemfiles/Gemfile-ruby-1.9

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem 'json', '~> 1.8'
 gem 'mime-types', '~> 2.6', '>= 2.6.2'
+gem 'nokogiri', '~> 1.6.8'
 
 gemspec :path => "../"

data/gemfiles/Gemfile-ruby-2.0

@@ -0,0 +1,7 @@
+
+source "https://rubygems.org"
+
+gem 'mime-types', '~> 3.1'
+gem 'nokogiri', '~> 1.6.8'
+
+gemspec :path => "../"

data/lib/fog/aws/auto_scaling.rb

@@ -164,7 +164,7 @@ module Fog
                   when 'ResourceInUse'
                     Fog::AWS::AutoScaling::ResourceInUse.slurp(error, match[:message])
                   when 'ValidationError'
-                    Fog::AWS::AutoScaling::ValidationError.slurp(error, match[:message])
+                    Fog::AWS::AutoScaling::ValidationError.slurp(error, CGI.unescapeHTML(match[:message]))
                   else
                     Fog::AWS::AutoScaling::Error.slurp(error, "#{match[:code]} => #{match[:message]}")
                   end

data/lib/fog/aws/iam.rb

@@ -99,6 +99,8 @@ module Fog
       collection  :access_keys
       model       :group
       collection  :groups
+      model       :instance_profile
+      collection  :instance_profiles
       model       :managed_policy
       collection  :managed_policies
       model       :policy
@@ -117,6 +119,7 @@ module Fog
 
             hash[key] = {
               :owner_id => owner_id,
+              :instance_profiles => {},
               :server_certificates => {},
               :access_keys => [{
                 "Status" => "Active",

data/lib/fog/aws/iam/default_policy_versions.json

@@ -2561,6 +2561,7 @@
           "Effect": "Allow",
           "Action": [
             "iam:GenerateCredentialReport",
+            "iam:GenerateServiceLastAccessedDetails",
             "iam:Get*",
             "iam:List*"
           ],

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

@@ -0,0 +1,40 @@
+module Fog
+  module AWS
+    class IAM
+      class InstanceProfile < Fog::Model
+        identity :name, :aliases => 'InstanceProfileName'
+
+        attribute :id,          :aliases => 'InstanceProfileId'
+        attribute :roles,       :aliases => 'Roles',              :type => :array
+        attribute :arn,         :aliases => 'Arn'
+        attribute :path,        :aliases => 'Path'
+        attribute :create_date, :aliases => 'CreateDate',         :type => :time
+
+        def add_role(role_name)
+          requires :identity
+          service.add_role_to_instance_profile(role_name, self.name)
+          true
+        end
+
+        def remove_role(role_name)
+          requires :identity
+          service.remove_role_from_instance_profile(role_name, self.name)
+          true
+        end
+
+        def destroy
+          requires :identity
+          service.delete_instance_profile(self.identity)
+          true
+        end
+
+        def save
+          requires :identity
+
+          data = service.create_instance_profile(self.name, self.path).body['InstanceProfile']
+          merge_attributes(data)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,24 @@
+require 'fog/aws/models/iam/instance_profile'
+
+module Fog
+  module AWS
+    class IAM
+      class InstanceProfiles < Fog::AWS::IAM::PagedCollection
+        model Fog::AWS::IAM::InstanceProfile
+
+        def all(options={})
+          body = service.list_instance_profiles(page_params(options)).body
+
+          merge_attributes(body)
+          load(body["InstanceProfiles"])
+        end
+
+        def get(identity)
+          new(service.get_instance_profile(identity).body["Role"])
+        rescue Excon::Errors::NotFound, Fog::AWS::IAM::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -8,6 +8,7 @@ module Fog
 
         attribute :username
         attribute :group_name
+        attribute :role_name
 
         model Fog::AWS::IAM::ManagedPolicy
 
@@ -16,6 +17,8 @@ module Fog
                    all_by_user(self.username, options)
                  elsif self.group_name
                    all_by_group(self.group_name, options)
+                 elsif self.role_name
+                   all_by_role(self.role_name, options)
                  else
                    all_policies(options)
                  end
@@ -51,6 +54,15 @@ module Fog
           end
         end
 
+        def all_by_role(role_name, options={})
+          body = service.list_attached_role_policies(role_name, page_params(options)).body
+          merge_attributes(body)
+
+          body['Policies'].map do |policy|
+            service.get_policy(policy['PolicyArn']).body['Policy']
+          end
+        end
+
         def all_policies(options={})
           body = service.list_policies(page_params(options)).body
           merge_attributes(body)

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

@@ -14,6 +14,8 @@ module Fog
         attribute :path,            :aliases => 'Path'
         attribute :updated_at,      :aliases => 'UpdateDate', :type => :time
 
+        attr_accessor :policy_document
+
         def attach(user_or_username)
           requires :arn
 
@@ -32,6 +34,24 @@ module Fog
           service.get_policy_version(self.arn, self.default_version).
             body['PolicyVersion']['Document']
         end
+
+        def reload
+          service.managed_policies.get(self.arn)
+        end
+
+        def save
+          requires :name, :policy_document
+
+          merge_attributes(service.create_policy(self.name, self.policy_document, self.path, self.description).body["Policy"])
+        end
+
+        def destroy
+          requires :arn
+
+          service.delete_policy(self.arn)
+
+          true
+        end
       end
     end
   end

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

@@ -20,6 +20,41 @@ module Fog
           true
         end
 
+        def attach(policy_or_arn)
+          requires :rolename
+
+          arn = if policy_or_arn.respond_to?(:arn)
+                  policy_or_arn.arn
+                else
+                  policy_or_arn
+                end
+
+          service.attach_role_policy(self.rolename, arn)
+        end
+
+        def detach(policy_or_arn)
+          requires :rolename
+
+          arn = if policy_or_arn.respond_to?(:arn)
+                  policy_or_arn.arn
+                else
+                  policy_or_arn
+                end
+
+          service.detach_role_policy(self.rolename, arn)
+        end
+
+        def attached_policies
+          requires :rolename
+
+          service.managed_policies(:role_name => self.rolename)
+        end
+
+        def instance_profiles
+          requires :rolename
+          service.instance_profiles.load(service.list_instance_profiles_for_role(self.rolename).body["InstanceProfiles"])
+        end
+
         def destroy
           requires :rolename
 

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

@@ -4,16 +4,15 @@ module Fog
       module AWS
         class DescribeReservedInstances < Fog::Parsers::Base
           def get_default_item
-            {'tagSet' => {}, 'recurringCharges' => {}}
+            {'tagSet' => {}, 'recurringCharges' => []}
           end
 
           def reset
             @context = []
-            # Note:  <recurringCharges> should also be handled as a set, but do not want to disrupt anyone relying on
-            # it currently being flatted
-            @contexts = ['reservedInstancesSet', 'tagSet']
+            @contexts = ['reservedInstancesSet', 'recurringCharges', 'tagSet']
             @reserved_instance = get_default_item
             @response = { 'reservedInstancesSet' => [] }
+            @charge = {}
             @tag = {}
           end
 
@@ -26,11 +25,11 @@ module Fog
 
           def end_element(name)
             case name
-            when 'availabilityZone', 'instanceType', 'productDescription', 'reservedInstancesId', 'state', 'offeringType', 'instanceTenancy'
+            when 'availabilityZone', 'instanceTenancy', 'instanceType', 'offeringType', 'productDescription', 'reservedInstancesId', 'scope', 'state'
               @reserved_instance[name] = value
             when 'duration', 'instanceCount'
               @reserved_instance[name] = value.to_i
-            when 'fixedPrice', 'amount', 'usagePrice'
+            when 'fixedPrice', 'usagePrice'
               @reserved_instance[name] = value.to_f
             when *@contexts
               @context.pop
@@ -39,10 +38,22 @@ module Fog
               when 'reservedInstancesSet'
                 @response['reservedInstancesSet'] << @reserved_instance
                 @reserved_instance = get_default_item
+              when 'recurringCharges'
+                @reserved_instance['recurringCharges'] << { 'frequency' => @charge['frequency'], 'amount' => @charge['amount'] }
+                @charge = {}
               when 'tagSet'
                 @reserved_instance['tagSet'][@tag['key']] = @tag['value']
                 @tag = {}
               end
+            when 'amount'
+              case @context.last
+              when 'reservedInstancesSet'
+                @reserved_instance[name] = value.to_f
+              when 'recurringCharges'
+                @charge[name] = value.to_f
+              end
+            when 'frequency'
+              @charge[name] = value
             when 'key', 'value'
               @tag[name] = value
             when 'requestId'

data/lib/fog/aws/requests/auto_scaling/create_auto_scaling_group.rb

@@ -72,11 +72,9 @@ module Fog
           end
 
           if tags = options.delete('Tags')
-            tags.each_with_index do |(key, value), i|
-              options["Tags.member.#{i+1}.Key"] = key.to_s # turns symbol into string
-              options["Tags.member.#{i+1}.Value"] = value
-            end
+            options.merge!(AWS.indexed_param("Tags.member.%d", [*tags]))
           end
+
           if termination_policies = options.delete('TerminationPolicies')
             options.merge!(AWS.indexed_param('TerminationPolicies.member.%d', [*termination_policies]))
           end

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

@@ -20,11 +20,15 @@ module Fog
         #       * 'instanceType'<~String> - type of instance
         #       * 'instanceCount'<~Integer> - number of reserved instances
         #       * 'productDescription'<~String> - reserved instance description
+        #       * 'recurringCharges'<~Array>:
+        #         * 'frequency'<~String> - frequency of a recurring charge while the reservation is active (only Hourly at this time)
+        #         * 'amount'<~Float> - recurring charge amount
         #       * 'reservedInstancesId'<~String> - id of the instance
+        #       * 'scope'<~String> - scope of the reservation (i.e. 'Availability Zone' or 'Region' - as of version 2016/11/15)
         #       * 'start'<~Time> - start time for reservation
         #       * 'state'<~String> - state of reserved instance purchase, in .[pending-payment, active, payment-failed, retired]
         #       * 'usagePrice"<~Float> - usage price of reserved instances, per hour
-        #       * 'end' - time reservation stopped being applied (i.e sold or canceled - as of version 2013/10/01)
+        #       * 'end'<~Time> - time reservation stopped being applied (i.e. sold or canceled - as of version 2013/10/01)
         #
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html]
         def describe_reserved_instances(filters = {})

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

@@ -27,6 +27,25 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def add_role_to_instance_profile(role_name, instance_profile_name)
+          response = Excon::Response.new
+
+          unless profile = self.data[:instance_profiles][instance_profile_name]
+            raise Fog::AWS::IAM::NotFound.new("Instance Profile #{instance_profile_name} cannot be found.")
+          end
+
+          unless role = self.data[:roles][role_name]
+            raise Fog::AWS::IAM::NotFound.new("Role #{role_name} cannot be found.")
+          end
+
+          profile["Roles"] << role_name
+
+          response.body = {"RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -46,6 +46,7 @@ module Fog
 
           group = self.data[:groups][group_name]
           group[:attached_policies] << policy_arn
+          managed_policy["AttachmentCount"] += 1
 
           Excon::Response.new.tap { |response|
             response.status = 200

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

@@ -20,13 +20,39 @@ module Fog
         #
         def attach_role_policy(role_name, policy_arn)
           request(
-            'Action'          => 'AttachRolePolicy',
-            'RoleName'       => role_name,
-            'PolicyArn'      => policy_arn,
-            :parser           => Fog::Parsers::AWS::IAM::Basic.new
+            'Action'    => 'AttachRolePolicy',
+            'RoleName'  => role_name,
+            'PolicyArn' => policy_arn,
+            :parser     => Fog::Parsers::AWS::IAM::Basic.new
           )
         end
       end
+
+      class Mock
+        def attach_role_policy(role_name, policy_arn)
+          response = Excon::Response.new
+          if policy_arn.nil?
+            raise Fog::AWS::IAM::ValidationError, "1 validation error detected: Value null at 'policyArn' failed to satisfy constraint: Member must not be null"
+          end
+
+          managed_policy = self.data[:managed_policies][policy_arn]
+
+          unless managed_policy
+            raise Fog::AWS::IAM::NotFound, "Policy #{policy_arn} does not exist."
+          end
+
+          unless self.data[:roles][role_name]
+            raise Fog::AWS::IAM::NotFound.new("The role with name #{role_name} cannot be found.")
+          end
+
+          role = self.data[:roles][role_name]
+          role[:attached_policies] ||= []
+          role[:attached_policies] << managed_policy['Arn']
+          managed_policy['AttachmentCount'] += 1
+          response.body = {"RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -46,6 +46,7 @@ module Fog
 
           user = self.data[:users][user_name]
           user[:attached_policies] << policy_arn
+          managed_policy['AttachmentCount'] += 1
 
           Excon::Response.new.tap { |response|
             response.status = 200

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

@@ -40,6 +40,26 @@ module Fog
           }.merge!(options))
         end
       end
+
+      class Mock
+        def create_instance_profile(instance_profile_name, path='/', options={})
+          response = Excon::Response.new
+
+          profile = {
+            "Arn"                 => "arn:aws:iam::#{Fog::AWS::Mock.owner_id}:instance-profile#{path}#{instance_profile_name}",
+            "CreateDate"          => Time.now.utc,
+            "InstanceProfileId"   => Fog::Mock.random_hex(21),
+            "InstanceProfileName" => instance_profile_name,
+            "Path"                => path,
+            "Roles"               => [],
+          }
+
+          self.data[:instance_profiles][instance_profile_name] = profile
+
+          response.body = {"InstanceProfile" => profile, "RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -35,13 +35,37 @@ module Fog
             'PolicyName'      => policy_name,
             'PolicyDocument'  => Fog::JSON.encode(policy_document),
             'Path'            => path,
-            'Description'     => description,  
+            'Description'     => description,
             :parser           => Fog::Parsers::AWS::IAM::SinglePolicy.new
           }.reject {|_, value| value.nil?})
         end
       end
 
-      
+      class Mock
+        def create_policy(policy_name, policy_document, path="/", description=nil)
+          response = Excon::Response.new
+
+          arn = "arn:aws:iam:#{Fog::AWS::Mock.owner_id}:policy/#{policy_name}"
+
+          policy = {
+            "Arn"              => arn,
+            "AttachmentCount"  => 0,
+            "CreateDate"       => Time.now.utc,
+            "DefaultVersionId" => "v1",
+            "Description"      => description,
+            "IsAttachable"     => true,
+            "Path"             => path,
+            "PolicyId"         => Fog::Mock.random_hex(21),
+            "PolicyName"       => policy_name,
+            "UpdateDate"       => Time.now.utc,
+          }
+
+          self.data[:managed_policies][arn] = policy
+
+          response.body = {"RequestId" => Fog::AWS::Mock.request_id, "Policy" => policy}
+          response
+        end
+      end
     end
   end
 end

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

@@ -25,6 +25,21 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def delete_instance_profile(instance_profile_name)
+          response = Excon::Response.new
+
+          unless profile = self.data[:instance_profiles][instance_profile_name]
+            raise Fog::AWS::IAM::NotFound.new("Instance Profile #{instance_profile_name} cannot be found.")
+          end
+
+          self.data[:instance_profiles].delete(instance_profile_name)
+
+          response.body = {"RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -25,6 +25,21 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def delete_policy(policy_arn)
+          response = Excon::Response.new
+          policy = self.data[:managed_policies][policy_arn]
+
+          if policy.nil?
+            raise Fog::AWS::IAM::NotFound.new("Policy #{policy_arn} does not exist or is not attachable.")
+          end
+
+          self.data[:managed_policies].delete(policy_arn)
+          response.body = {"RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -46,6 +46,7 @@ module Fog
 
           group = self.data[:groups][group_name]
           group[:attached_policies].delete(policy_arn)
+          managed_policy["AttachmentCount"] -= 1
 
           Excon::Response.new.tap { |response|
             response.status = 200

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

@@ -27,6 +27,33 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def detach_role_policy(role_name, policy_arn)
+          response = Excon::Response.new
+
+          if policy_arn.nil?
+            raise Fog::AWS::IAM::ValidationError, "1 validation error detected: Value null at 'policyArn' failed to satisfy constraint: Member must not be null"
+          end
+
+          managed_policy = self.data[:managed_policies][policy_arn]
+
+          unless managed_policy
+            raise Fog::AWS::IAM::NotFound, "Policy #{policy_arn} does not exist."
+          end
+
+          unless self.data[:roles].key?(role_name)
+            raise Fog::AWS::IAM::NotFound.new("The role with name #{role_name} cannot be found.")
+          end
+
+          role = self.data[:roles][role_name]
+          role[:attached_policies].delete(policy_arn)
+          managed_policy["AttachmentCount"] -= 1
+
+          response.body = {"RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -46,6 +46,7 @@ module Fog
 
           user = self.data[:users][user_name]
           user[:attached_policies].delete(policy_arn)
+          managed_policy["AttachmentCount"] -= 1
 
           Excon::Response.new.tap { |response|
             response.status = 200

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

@@ -35,6 +35,23 @@ module Fog
           })
         end
       end
+
+      class Mock
+        def get_instance_profile(instance_profile_name)
+          response = Excon::Response.new
+
+          instance_profile = self.data[:instance_profiles][instance_profile_name]
+          unless instance_profile
+            raise Fog::AWS::IAM::NotFound.new("Instance Profile #{instance_profile_name} cannot be found.")
+          end
+
+          instance_profile = instance_profile.dup
+          instance_profile["Roles"].map! { |r| self.data[:roles][r] }
+
+          response.body = {"InstanceProfile" => instance_profile, "RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

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

@@ -70,7 +70,8 @@ module Fog
           body = {
             'Policies'    => data,
             'IsTruncated' => truncated,
-            'RequestId'   => Fog::AWS::Mock.request_id
+            'RequestId'   => Fog::AWS::Mock.request_id,
+            'Marker'      => nil
           }
 
           if marker

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

@@ -43,6 +43,15 @@ module Fog
           }.merge!(options))
         end
       end
+
+      class Mock
+        def list_instance_profiles(options={})
+          response = Excon::Response.new
+          profiles = self.data[:instance_profiles].values
+          response.body = { "InstanceProfiles" => profiles, "IsTruncated" => false, "RequestId" => Fog::AWS::Mock.request_id }
+          response
+        end
+      end
     end
   end
 end

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

@@ -44,6 +44,16 @@ module Fog
           }.merge!(options))
         end
       end
+
+      class Mock
+        def list_instance_profiles_for_role(role_name, options={})
+          response = Excon::Response.new
+
+          profiles = self.data[:instance_profiles].values.select { |p| p["Roles"].include?(role_name) }
+          response.body = { "InstanceProfiles" => profiles, "IsTruncated" => false, "RequestId" => Fog::AWS::Mock.request_id }
+          response
+        end
+      end
     end
   end
 end

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

@@ -64,6 +64,10 @@ module Fog
                        self.data[:managed_policies].values
                      end
 
+          if options["PathPrefix"]
+            data_set = data_set.select { |p| p["Path"].match(/^#{options["PathPrefix"]}/) }
+          end
+
           data = data_set.slice!(0, limit || 100)
           truncated = data_set.size > 0
           marker = truncated && Base64.encode64("metadata/l/#{account_id}/#{UUID.uuid}")

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

@@ -28,6 +28,25 @@ module Fog
           )
         end
       end
+
+      class Mock
+        def remove_role_from_instance_profile(role_name, instance_profile_name)
+          response = Excon::Response.new
+
+          unless profile = self.data[:instance_profiles][instance_profile_name]
+            raise Fog::AWS::IAM::NotFound.new("Instance Profile #{instance_profile_name} cannot be found.")
+          end
+
+          unless role = self.data[:roles][role_name]
+            raise Fog::AWS::IAM::NotFound.new("Role #{role_name} cannot be found.")
+          end
+
+          profile["Roles"].delete(role_name)
+
+          response.body = {"RequestId" => Fog::AWS::Mock.request_id}
+          response
+        end
+      end
     end
   end
 end

data/lib/fog/aws/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module AWS
-    VERSION = "1.1.0"
+    VERSION = "1.2.0"
   end
 end

data/tests/models/iam/instance_profile_tests.rb

@@ -0,0 +1,18 @@
+Shindo.tests("Fog::AWS[:iam] | instance_profiles", ['aws', 'iam']) do
+  model_tests(Fog::AWS[:iam].instance_profiles, {:name => uniq_id('fog-instance-profile')}) do
+    @role = Fog::AWS[:iam].roles.create(:rolename => uniq_id('fog-role'))
+
+    tests("#add_role('#{@role.rolename}')") do
+      returns(true) { @instance.add_role(@role.rolename) }
+    end
+
+    returns(1) { @role.instance_profiles.count }
+    returns(@instance) { @role.instance_profiles.first }
+
+    tests("#remove_role('#{@role.rolename}')") do
+      returns(true) { @instance.remove_role(@role.rolename) }
+    end
+
+    @role.destroy
+  end
+end

data/tests/models/iam/managed_policies_tests.rb

@@ -22,7 +22,7 @@ Shindo.tests("Fog::Compute[:iam] | managed_policies", ['aws','iam']) do
       "Statement" => [
         {
           "Effect"   => "Allow",
-          "Action"   => [ "iam:GenerateCredentialReport", "iam:Get*", "iam:List*" ],
+          "Action"   => [ "iam:GenerateCredentialReport", "iam:GenerateServiceLastAccessedDetails", "iam:Get*", "iam:List*" ],
           "Resource" => "*"
         }
       ]
@@ -38,6 +38,8 @@ Shindo.tests("Fog::Compute[:iam] | managed_policies", ['aws','iam']) do
       user.attached_policies.map(&:identity) == [policy.identity]
     end
 
+    returns(1) { policy.reload.attachments}
+
     tests("#detach").succeeds do
       user.detach(policy)
 
@@ -56,6 +58,8 @@ Shindo.tests("Fog::Compute[:iam] | managed_policies", ['aws','iam']) do
       group.attached_policies.map(&:identity) == [policy.identity]
     end
 
+    returns(1) { policy.reload.attachments}
+
     tests("#detach").succeeds do
       group.detach(policy)
 
@@ -64,4 +68,22 @@ Shindo.tests("Fog::Compute[:iam] | managed_policies", ['aws','iam']) do
 
     group.destroy
   end
+
+  tests("roles") do
+    role = iam.roles.create(:rolename => uniq_id("fog-test-role"))
+
+    tests("#attach").succeeds do
+      role.attach(policy)
+      role.attached_policies.map(&:identity) == [policy.identity]
+    end
+
+    returns(1) { policy.reload.attachments}
+
+    tests("#detach").succeeds do
+      role.detach(policy)
+      role.attached_policies.map(&:identity) == []
+    end
+
+    role.destroy
+  end
 end

data/tests/requests/auto_scaling/auto_scaling_tests.rb

@@ -27,31 +27,33 @@ Shindo.tests('AWS::AutoScaling | auto_scaling_tests', ['aws', 'auto_scaling']) d
       Fog::AWS[:auto_scaling].create_auto_scaling_group(@asg_name, zones, @lc_name, max_size, min_size).body
     end
 
-    tests("#attach_load_balancers").formats(AWS::AutoScaling::Formats::BASIC) do
-      Fog::AWS[:auto_scaling].attach_load_balancers(@asg_name, 'LoadBalancerNames' => 'elb-test-fog').body
-    end
+    if Fog.mocking?
+      tests("#attach_load_balancers").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].attach_load_balancers(@asg_name, 'LoadBalancerNames' => 'elb-test-fog').body
+      end
 
-    tests("#detach_load_balancers").formats(AWS::AutoScaling::Formats::BASIC) do
-      Fog::AWS[:auto_scaling].detach_load_balancers(@asg_name, 'LoadBalancerNames' => 'elb-test-fog').body
-    end
+      tests("#detach_load_balancers").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].detach_load_balancers(@asg_name, 'LoadBalancerNames' => 'elb-test-fog').body
+      end
 
-    tests("#attach_load_balancer_target_groups").formats(AWS::AutoScaling::Formats::BASIC) do
-      Fog::AWS[:auto_scaling].attach_load_balancer_target_groups(@asg_name, 'TargetGroupARNs' => 'elb-test-fog').body
-    end
+      tests("#attach_load_balancer_target_groups").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].attach_load_balancer_target_groups(@asg_name, 'TargetGroupARNs' => 'elb-test-fog').body
+      end
 
-    tests("#detach_load_balancer_target_groups").formats(AWS::AutoScaling::Formats::BASIC) do
-      Fog::AWS[:auto_scaling].detach_load_balancer_target_groups(@asg_name, 'TargetGroupARNs' => 'elb-test-fog').body
-    end
+      tests("#detach_load_balancer_target_groups").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].detach_load_balancer_target_groups(@asg_name, 'TargetGroupARNs' => 'elb-test-fog').body
+      end
 
-    tests("#detach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
-      Fog::AWS[:auto_scaling].detach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
-    end
+      tests("#detach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].detach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
+      end
 
-    tests("#attach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
-      Fog::AWS[:auto_scaling].attach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
+      tests("#attach_instances").formats(AWS::AutoScaling::Formats::BASIC) do
+        Fog::AWS[:auto_scaling].attach_instances(@asg_name, 'InstanceIds' => 'i-deadbeef').body
+      end
     end
 
-   tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
+    tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do
       Fog::AWS[:auto_scaling].describe_auto_scaling_groups().body
     end
     tests("#describe_auto_scaling_groups").formats(AWS::AutoScaling::Formats::DESCRIBE_AUTO_SCALING_GROUPS) do

data/tests/requests/auto_scaling/model_tests.rb

@@ -60,7 +60,9 @@ Shindo.tests('AWS::AutoScaling | model_tests', ['aws', 'auto_scaling']) do
 
       tests('suspend processes') do
         asg.suspend_processes()
-        tests('processes suspended').returns([]) { asg.suspended_processes }
+        if Fog.mocking?
+          tests('processes suspended').returns([]) { asg.suspended_processes }
+        end
       end
 
       tests('resume processes') do

data/tests/requests/auto_scaling/tag_tests.rb

@@ -23,8 +23,8 @@ Shindo.tests('AWS::AutoScaling | tag requests', ['aws', 'auto_scaling']) do
     'Value'             => asg_name
   }
 
-  lc = Fog::AWS[:auto_scaling].create_launch_configuration(image_id[Fog::AWS[:auto_scaling].region], 't1.micro', lc_name)
-  asg = Fog::AWS[:auto_scaling].create_auto_scaling_group(asg_name, "#{Fog::AWS[:auto_scaling].region}a", lc_name, 0, 0, 'Tags' => [asg_tag])
+  Fog::AWS[:auto_scaling].create_launch_configuration(image_id[Fog::AWS[:auto_scaling].region], 't1.micro', lc_name)
+  Fog::AWS[:auto_scaling].create_auto_scaling_group(asg_name, "#{Fog::AWS[:auto_scaling].region}a", lc_name, 0, 0, 'Tags' => [asg_tag])
 
   tests('raises') do
     tests("#create_or_update_tags(empty)").raises(Fog::AWS::AutoScaling::ValidationError) do

data/tests/requests/iam/helper.rb

@@ -131,6 +131,24 @@ Xb9WSr07saxZQbxBPQyTlb0Q9Tu2djAq2/o/nYD1/50/fXUTuWMB
         }],
         'IsTruncated' => Fog::Boolean
       )
+
+      INSTANCE_PROFILE = {
+        'Arn'                 => String,
+        'CreateDate'          => Time,
+        'InstanceProfileId'   => String,
+        'InstanceProfileName' => String,
+        'Path'                => String,
+        'Roles'               => Array
+      }
+
+      INSTANCE_PROFILE_RESULT = BASIC.merge(
+        'InstanceProfile' => INSTANCE_PROFILE
+      )
+
+      LIST_INSTANCE_PROFILE_RESULT = BASIC.merge(
+        "IsTruncated" => Fog::Boolean,
+        "InstanceProfiles" => [INSTANCE_PROFILE]
+      )
     end
   end
 end

data/tests/requests/iam/instance_profile_tests.rb

@@ -0,0 +1,44 @@
+include AWS::IAM::Formats
+
+Shindo.tests("AWS::IAM | instance profile requests", ['aws']) do
+  tests('success') do
+    profile_name = uniq_id('fog-instance-profile')
+    @instance_profile_count = Fog::AWS[:iam].list_instance_profiles.body["InstanceProfiles"].count
+
+    tests("#create_instance_profile('#{profile_name}')").formats(INSTANCE_PROFILE_RESULT) do
+      Fog::AWS[:iam].create_instance_profile(profile_name).body
+    end
+
+    tests("#list_instance_profiles").formats(LIST_INSTANCE_PROFILE_RESULT) do
+      body = Fog::AWS[:iam].list_instance_profiles.body
+      returns(@instance_profile_count + 1) { body["InstanceProfiles"].count }
+      body
+    end
+
+    tests("#get_instance_profile('#{profile_name}')").formats(INSTANCE_PROFILE_RESULT) do
+      Fog::AWS[:iam].get_instance_profile(profile_name).body
+    end
+
+    @role = Fog::AWS[:iam].roles.create(:rolename => uniq_id('instance-profile-role'))
+
+    tests("#add_role_to_instance_profile('#{@role.rolename}', '#{profile_name}')").formats(BASIC) do
+      Fog::AWS[:iam].add_role_to_instance_profile(@role.rolename, profile_name).body
+    end
+
+    tests("#list_instance_profiles_for_role('#{@role.rolename}')").formats(LIST_INSTANCE_PROFILE_RESULT) do
+      body = Fog::AWS[:iam].list_instance_profiles_for_role(@role.rolename).body
+      returns(1) { body["InstanceProfiles"].count }
+      body
+    end
+
+    tests("#remove_role_from_instance_profile('#{@role.rolename}', '#{profile_name}')").formats(BASIC) do
+      Fog::AWS[:iam].remove_role_from_instance_profile(@role.rolename, profile_name).body
+    end
+
+    @role.destroy
+
+    tests("#delete_instance_profile('#{profile_name}')").formats(BASIC) do
+      Fog::AWS[:iam].delete_instance_profile(profile_name).body
+    end
+  end
+end

data/tests/requests/iam/managed_policy_tests.rb

@@ -1,6 +1,5 @@
 Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
 
-  pending if Fog.mocking?
   Fog::AWS[:iam].create_group('fog_policy_test_group')
   Fog::AWS[:iam].create_user('fog_policy_test_user')
   Fog::AWS[:iam].create_role('fog_policy_test_role', Fog::AWS::IAM::EC2_ASSUME_ROLE_POLICY)
@@ -8,16 +7,16 @@ Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
   tests('success') do
     @policy = {'Version' => '2012-10-17', "Statement" => [{"Effect" => "Deny", "Action" => "*", "Resource" => "*"}]}
     @policy_format = {
-      'Arn'        => String,
-      'AttachmentCount' => Integer,
-      'Description' => String,
+      'Arn'              => String,
+      'AttachmentCount'  => Integer,
+      'Description'      => Fog::Nullable::String,
       'DefaultVersionId' => String,
-      'IsAttachable' => Fog::Boolean,
-      'Path'       => String,
-      'PolicyId'     => String,
-      'PolicyName'   => String,
-      'CreateDate' => Time,
-      'UpdateDate' => Time
+      'IsAttachable'     => Fog::Boolean,
+      'Path'             => String,
+      'PolicyId'         => String,
+      'PolicyName'       => String,
+      'CreateDate'       => Time,
+      'UpdateDate'       => Time
     }
 
     create_policy_format = {
@@ -28,8 +27,8 @@ Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
     list_policies_format = {
       'RequestId' => String,
       'Policies' => [@policy_format],
-      'Marker' => String,
-      'IsTruncated' => Fog::Boolean      
+      'Marker' => Fog::Nullable::String,
+      'IsTruncated' => Fog::Boolean
     }
 
     attached_policy_format = {
@@ -39,7 +38,7 @@ Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
 
     list_managed_policies_format = {
         'RequestId' => String,
-        'AttachedPolicies' => [attached_policy_format]
+        'Policies' => [attached_policy_format]
     }
 
     tests("#create_policy('fog_policy')").formats(create_policy_format) do
@@ -74,7 +73,7 @@ Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
       Fog::AWS[:iam].attach_group_policy('fog_policy_test_group', @policy_arn).body
     end
 
-    tests("#list_attach_group_policies()").formats(fog_policy_test_group) do
+    tests("#list_attach_group_policies()").formats(list_managed_policies_format) do
       Fog::AWS[:iam].list_attached_group_policies('fog_policy_test_group').body
     end
 
@@ -83,11 +82,11 @@ Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
     end
 
     tests("#attach_role_policy()").formats(AWS::IAM::Formats::BASIC) do
-      Fog::AWS[:iam].attach_role_policy('fog_policy_test_role', @policy_arn).body
+      body = Fog::AWS[:iam].attach_role_policy('fog_policy_test_role', @policy_arn).body
     end
 
-    tests("#list_attach_role_policies()").formats(fog_policy_test_group) do
-      Fog::AWS[:iam].attach_role_policies('fog_policy_test_role').body
+    tests("#list_attached_role_policies()").formats(list_managed_policies_format) do
+      Fog::AWS[:iam].list_attached_role_policies('fog_policy_test_role').body
     end
 
     tests("#detach_role_policy()").formats(AWS::IAM::Formats::BASIC) do
@@ -97,7 +96,7 @@ Shindo.tests('AWS::IAM | managed policy requests', ['aws']) do
     tests("#delete_policy()").formats(AWS::IAM::Formats::BASIC) do
       Fog::AWS[:iam].delete_policy(@policy_arn).body
     end
-   
+
   end
 
   tests('failure') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-aws
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Josh Lane
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-16 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -146,6 +146,7 @@ files:
 - gemfiles/Gemfile-edge
 - gemfiles/Gemfile-ruby-1.8.7
 - gemfiles/Gemfile-ruby-1.9
+- gemfiles/Gemfile-ruby-2.0
 - lib/fog/aws.rb
 - lib/fog/aws/auto_scaling.rb
 - lib/fog/aws/beanstalk.rb
@@ -283,6 +284,8 @@ files:
 - lib/fog/aws/models/iam/access_keys.rb
 - lib/fog/aws/models/iam/group.rb
 - lib/fog/aws/models/iam/groups.rb
+- lib/fog/aws/models/iam/instance_profile.rb
+- lib/fog/aws/models/iam/instance_profiles.rb
 - lib/fog/aws/models/iam/managed_policies.rb
 - lib/fog/aws/models/iam/managed_policy.rb
 - lib/fog/aws/models/iam/policies.rb
@@ -1488,6 +1491,7 @@ files:
 - tests/models/glacier/model_tests.rb
 - tests/models/iam/access_keys_tests.rb
 - tests/models/iam/groups_tests.rb
+- tests/models/iam/instance_profile_tests.rb
 - tests/models/iam/managed_policies_tests.rb
 - tests/models/iam/policies_tests.rb
 - tests/models/iam/roles_tests.rb
@@ -1597,6 +1601,7 @@ files:
 - tests/requests/iam/group_policy_tests.rb
 - tests/requests/iam/group_tests.rb
 - tests/requests/iam/helper.rb
+- tests/requests/iam/instance_profile_tests.rb
 - tests/requests/iam/login_profile_tests.rb
 - tests/requests/iam/managed_policy_tests.rb
 - tests/requests/iam/mfa_tests.rb