brightbox-cli 0.16.0 → 0.17.0

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/authorize_security_group_ingress.rb

@@ -13,11 +13,23 @@ module Fog
         #   * 'SourceSecurityGroupName'<~String> - Name of security group to authorize
         #   * 'SourceSecurityGroupOwnerId'<~String> - Name of owner to authorize
         #   or
-        #   * 'CidrIp' - CIDR range
-        #   * 'FromPort' - Start of port range (or -1 for ICMP wildcard)
-        #   * 'GroupName' - Name of group to modify
-        #   * 'IpProtocol' - Ip protocol, must be in ['tcp', 'udp', 'icmp']
-        #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
+        #   * 'CidrIp'<~String> - CIDR range
+        #   * 'FromPort'<~Integer> - Start of port range (or -1 for ICMP wildcard)
+        #   * 'IpProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp']
+        #   * 'ToPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
+        #   or
+        #   * 'IpPermissions'<~Array>:
+        #     * permission<~Hash>:
+        #       * 'FromPort'<~Integer> - Start of port range (or -1 for ICMP wildcard)
+        #       * 'Groups'<~Array>:
+        #         * group<~Hash>:
+        #           * 'GroupName'<~String> - Name of security group to authorize
+        #           * 'UserId'<~String> - Name of owner to authorize
+        #       * 'IpProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp']
+        #       * 'IpRanges'<~Array>:
+        #         * ip_range<~Hash>:
+        #           * 'CidrIp'<~String> - CIDR range
+        #       * 'ToPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -28,10 +40,15 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-AuthorizeSecurityGroupIngress.html]
         def authorize_security_group_ingress(group_name, options = {})
           if group_name.is_a?(Hash)
-            Fog::Logger.warning("Fog::AWS::Compute#authorize_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("Fog::AWS::Compute#authorize_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
             options = group_name
-            group_name = options['GroupName']
+            group_name = options.delete('GroupName')
+          end
+
+          if ip_permissions = options.delete('IpPermissions')
+            options.merge!(indexed_ip_permissions_params(ip_permissions))
           end
+
           request({
             'Action'    => 'AuthorizeSecurityGroupIngress',
             'GroupName' => group_name,
@@ -40,51 +57,69 @@ module Fog
           }.merge!(options))
         end
 
+        private
+
+        def indexed_ip_permissions_params(ip_permissions)
+          params = {}
+          ip_permissions.each_with_index do |permission, key_index|
+            key_index += 1
+            params[format('IpPermissions.%d.IpProtocol', key_index)] = permission['IpProtocol']
+            params[format('IpPermissions.%d.FromPort', key_index)] = permission['FromPort']
+            params[format('IpPermissions.%d.ToPort', key_index)] = permission['ToPort']
+            (permission['Groups'] || []).each_with_index do |group, group_index|
+              group_index += 1
+              params[format('IpPermissions.%d.Groups.%d.UserId', key_index, group_index)] = group['UserId']
+              params[format('IpPermissions.%d.Groups.%d.GroupName', key_index, group_index)] = group['GroupName']
+              params[format('IpPermissions.%d.Groups.%d.GroupId', key_index, group_index)] = group['GroupId']
+            end
+            (permission['IpRanges'] || []).each_with_index do |ip_range, range_index|
+              range_index += 1
+              params[format('IpPermissions.%d.IpRanges.%d.CidrIp', key_index, range_index)] = ip_range['CidrIp']
+            end
+          end
+          params.reject {|k, v| v.nil? }
+        end
+
       end
 
       class Mock
 
         def authorize_security_group_ingress(group_name, options = {})
           if group_name.is_a?(Hash)
-            Fog::Logger.warning("Fog::AWS::Compute#authorize_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("Fog::AWS::Compute#authorize_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
             options = group_name
-            group_name = options['GroupName']
+            group_name = options.delete('GroupName')
           end
 
+          verify_permission_options(options)
+
           response = Excon::Response.new
           group = self.data[:security_groups][group_name]
 
           if group
-            group['ipPermissions'] ||= []
-            if group_name && source_group_name = options['SourceSecurityGroupName']
-              ['tcp', 'udp'].each do |protocol|
-                group['ipPermissions'] << {
-                  'groups'      => [{'groupName' => source_group_name, 'userId' => (options['SourceSecurityGroupOwnerId'] || self.data[:owner_id]) }],
-                  'fromPort'    => 1,
-                  'ipRanges'    => [],
-                  'ipProtocol'  => protocol,
-                  'toPort'      => 65535
-                }
+            normalized_permissions = normalize_permissions(options)
+
+            normalized_permissions.each do |permission|
+              if matching_group_permission = find_matching_permission(group, permission)
+                if permission['groups'].any? {|pg| matching_group_permission['groups'].include?(pg) }
+                  raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                end
+
+                if permission['ipRanges'].any? {|pr| matching_group_permission['ipRanges'].include?(pr) }
+                  raise Fog::Compute::AWS::Error, "InvalidPermission.Duplicate => The permission '123' has already been authorized in the specified group"
+                end
               end
-              group['ipPermissions'] << {
-                'groups'      => [{'groupName' => source_group_name, 'userId' => (options['SourceSecurityGroupOwnerId'] || self.data[:owner_id]) }],
-                'fromPort'    => -1,
-                'ipRanges'    => [],
-                'ipProtocol'  => 'icmp',
-                'toPort'      => -1
-              }
-            else
-              group['ipPermissions'] << {
-                'groups'      => [],
-                'fromPort'    => options['FromPort'],
-                'ipRanges'    => [],
-                'ipProtocol'  => options['IpProtocol'],
-                'toPort'      => options['ToPort']
-              }
-              if options['CidrIp']
-                group['ipPermissions'].last['ipRanges'] << { 'cidrIp' => options['CidrIp'] }
+            end
+
+            normalized_permissions.each do |permission|
+              if matching_group_permission = find_matching_permission(group, permission)
+                matching_group_permission['groups'] += permission['groups']
+                matching_group_permission['ipRanges'] += permission['ipRanges']
+              else
+                group['ipPermissions'] << permission
               end
             end
+
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,
@@ -96,6 +131,76 @@ module Fog
           end
         end
 
+        private
+
+        def verify_permission_options(options)
+          if options.empty?
+            raise Fog::Compute::AWS::Error.new("InvalidRequest => The request received was invalid.")
+          end
+          if options['IpProtocol'] && !['tcp', 'udp', 'icmp'].include?(options['IpProtocol'])
+            raise Fog::Compute::AWS::Error.new("InvalidPermission.Malformed => Unsupported IP protocol \"#{options['IpProtocol']}\"  - supported: [tcp, udp, icmp]")
+          end
+          if options['IpProtocol'] && (!options['FromPort'] || !options['ToPort'])
+            raise Fog::Compute::AWS::Error.new("InvalidPermission.Malformed => TCP/UDP port (-1) out of range")
+          end
+          if options.has_key?('IpPermissions')
+            if !options['IpPermissions'].is_a?(Array) || options['IpPermissions'].empty?
+              raise Fog::Compute::AWS::Error.new("InvalidRequest => The request received was invalid.")
+            end
+            options['IpPermissions'].each {|p| verify_permission_options(p) }
+          end
+        end
+
+        def normalize_permissions(options)
+          normalized_permissions = []
+
+          if options['SourceSecurityGroupName']
+            ['tcp', 'udp'].each do |protocol|
+              normalized_permissions << {
+                'ipProtocol' => protocol,
+                'fromPort' => 1,
+                'toPort' => 65535,
+                'groups' => [{'groupName' => options['SourceSecurityGroupName'], 'userId' => options['SourceSecurityGroupOwnerId'] || self.data[:owner_id]}],
+                'ipRanges' => []
+              }
+            end
+            normalized_permissions << {
+              'ipProtocol' => 'icmp',
+              'fromPort' => -1,
+              'toPort' => -1,
+              'groups' => [{'groupName' => options['SourceSecurityGroupName'], 'userId' => options['SourceSecurityGroupOwnerId'] || self.data[:owner_id]}],
+              'ipRanges' => []
+            }
+          elsif options['CidrIp']
+            normalized_permissions << {
+              'ipProtocol' => options['IpProtocol'],
+              'fromPort' => Integer(options['FromPort']),
+              'toPort' => Integer(options['ToPort']),
+              'groups' => [],
+              'ipRanges' => [{'cidrIp' => options['CidrIp']}]
+            }
+          elsif options['IpPermissions']
+            options['IpPermissions'].each do |permission|
+              normalized_permissions << {
+                'ipProtocol' => permission['IpProtocol'],
+                'fromPort' => Integer(permission['FromPort']),
+                'toPort' => Integer(permission['ToPort']),
+                'groups' => (permission['Groups'] || []).map {|g| {'groupName' => g['GroupName'], 'userId' => g['UserId'] || self.data[:owner_id]} },
+                'ipRanges' => (permission['IpRanges'] || []).map {|r| { 'cidrIp' => r['CidrIp'] } }
+              }
+            end
+          end
+
+          normalized_permissions
+        end
+
+        def find_matching_permission(group, permission)
+          group['ipPermissions'].detect {|group_permission|
+            permission['ipProtocol'] == group_permission['ipProtocol'] &&
+            permission['fromPort'] == group_permission['fromPort'] &&
+            permission['toPort'] == group_permission['toPort'] }
+        end
+
       end
     end
   end

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/delete_security_group.rb

@@ -30,8 +30,33 @@ module Fog
 
       class Mock
         def delete_security_group(name)
+          if name == 'default'
+            raise Fog::Compute::AWS::Error.new("InvalidGroup.Reserved => The security group 'default' is reserved")
+          end
+
           response = Excon::Response.new
           if self.data[:security_groups][name]
+
+            used_by_groups = []
+            self.region_data.each do |access_key, key_data|
+              key_data[:security_groups].each do |group_name, group|
+                next if group == self.data[:security_groups][name]
+
+                group['ipPermissions'].each do |group_ip_permission|
+                  group_ip_permission['groups'].each do |group_group_permission|
+                    if group_group_permission['groupName'] == name &&
+                        group_group_permission['userId'] == self.data[:owner_id]
+                      used_by_groups << "#{key_data[:owner_id]}:#{group_name}"
+                    end
+                  end
+                end
+              end
+            end
+
+            unless used_by_groups.empty?
+              raise Fog::Compute::AWS::Error.new("InvalidGroup.InUse => Group #{self.data[:owner_id]}:#{name} is used by groups: #{used_by_groups.uniq.join(" ")}")
+            end
+
             self.data[:security_groups].delete(name)
             response.status = 200
             response.body = {

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/delete_tags.rb

@@ -28,7 +28,7 @@ module Fog
             index += 1 # should start at 1 instead of 0
             params.merge!("Tag.#{index}.Key" => key)
             unless tags[key].nil?
-              params.merge("Tag.#{index}.Value" => tags[key])
+              params.merge!("Tag.#{index}.Value" => tags[key])
             end
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_addresses.rb

@@ -21,7 +21,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAddresses.html]
         def describe_addresses(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -38,7 +38,7 @@ module Fog
 
         def describe_addresses(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_addresses with #{filters.class} param is deprecated, use describe_addresses('public-ip' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_availability_zones.rb

@@ -22,7 +22,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeAvailabilityZones.html]
         def describe_availability_zones(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -39,7 +39,7 @@ module Fog
 
         def describe_availability_zones(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_availability_zones with #{filters.class} param is deprecated, use describe_availability_zones('zone-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'public-ip' => [*filters]}
           end
 
@@ -55,6 +55,9 @@ module Fog
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "us-west-1", "zoneName" => "us-west-1c", "zoneState" => "available"},
 
+            {"messageSet" => [], "regionName" => "us-west-2", "zoneName" => "us-west-2a", "zoneState" => "available"},
+            {"messageSet" => [], "regionName" => "us-west-2", "zoneName" => "us-west-2b", "zoneState" => "available"},
+
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1a", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1b", "zoneState" => "available"},
             {"messageSet" => [], "regionName" => "eu-west-1", "zoneName" => "eu-west-1c", "zoneState" => "available"},

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_images.rb

@@ -60,7 +60,7 @@ module Fog
 
         def describe_images(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_images with #{filters.class} param is deprecated, use describe_images('image-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_images with #{filters.class} param is deprecated, use describe_images('image-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'image-id' => [*filters]}
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_instances.rb

@@ -55,7 +55,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html]
         def describe_instances(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'instance-id' => [*filters]}
           end
           params = {}
@@ -81,7 +81,7 @@ module Fog
 
         def describe_instances(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_instances with #{filters.class} param is deprecated, use describe_instances('instance-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'instance-id' => [*filters]}
           end
 
@@ -154,16 +154,25 @@ module Fog
             end
           end
 
+          brand_new_instances = instance_set.find_all do |instance|
+            instance['instanceState']['name'] == 'pending' &&
+              Time.now - instance['launchTime'] < Fog::Mock.delay * 2
+          end
+
+          # Error if filtering for a brand new instance directly
+          if (filters['instance-id'] || filters['instanceId']) && !brand_new_instances.empty?
+            raise Fog::Compute::AWS::NotFound.new("The instance ID '#{brand_new_instances.first['instanceId']}' does not exist")
+          end
+
+          # Otherwise don't include it in the list
+          instance_set = instance_set.reject {|instance| brand_new_instances.include?(instance) }
+
           response.status = 200
           reservation_set = {}
 
           instance_set.each do |instance|
             case instance['instanceState']['name']
             when 'pending'
-              if Time.now - instance['launchTime'] < Fog::Mock.delay * 2
-                raise Fog::Compute::AWS::NotFound.new("The instance ID '#{instance['instanceId']}' does not exist")
-              end
-
               if Time.now - instance['launchTime'] >= Fog::Mock.delay * 2
                 instance['ipAddress']         = Fog::AWS::Mock.ip_address
                 instance['originalIpAddress'] = instance['ipAddress']

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_key_pairs.rb

@@ -21,7 +21,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeKeyPairs.html]
         def describe_key_pairs(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'key-name' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -38,7 +38,7 @@ module Fog
 
         def describe_key_pairs(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_key_pairs with #{filters.class} param is deprecated, use describe_key_pairs('key-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'key-name' => [*filters]}
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_regions.rb

@@ -21,7 +21,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeRegions.html]
         def describe_regions(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'region-name' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -38,7 +38,7 @@ module Fog
 
         def describe_regions(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_regions with #{filters.class} param is deprecated, use describe_regions('region-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'region-name' => [*filters]}
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_reserved_instances.rb

@@ -29,7 +29,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeReservedInstances.html]
         def describe_reserved_instances(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_reserved_instances with #{filters.class} param is deprecated, use describe_reserved_instances('reserved-instances-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_reserved_instances with #{filters.class} param is deprecated, use describe_reserved_instances('reserved-instances-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'reserved-instances-id' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_security_groups.rb

@@ -31,7 +31,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSecurityGroups.html]
         def describe_security_groups(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'group-name' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -48,7 +48,7 @@ module Fog
 
         def describe_security_groups(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_security_groups with #{filters.class} param is deprecated, use describe_security_groups('group-name' => []) instead [light_black](#{caller.first})[/]")
             filters = {'group-name' => [*filters]}
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_snapshots.rb

@@ -27,11 +27,11 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeSnapshots.html]
         def describe_snapshots(filters = {}, options = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'snapshot-id' => [*filters]}
           end
           unless options.empty?
-            Fog::Logger.warning("describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead [light_black](#{caller.first})[/]")
           end
 
           for key in ['ExecutableBy', 'ImageId', 'Owner', 'RestorableBy']
@@ -54,11 +54,11 @@ module Fog
 
         def describe_snapshots(filters = {}, options = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_snapshots with #{filters.class} param is deprecated, use describe_snapshots('snapshot-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'snapshot-id' => [*filters]}
           end
           unless options.empty?
-            Fog::Logger.warning("describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_snapshots with a second param is deprecated, use describe_snapshots(options) instead [light_black](#{caller.first})[/]")
           end
 
           response = Excon::Response.new

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/describe_volumes.rb

@@ -31,7 +31,7 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeVolumes.html]
         def describe_volumes(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
           params = Fog::AWS.indexed_filters(filters)
@@ -48,7 +48,7 @@ module Fog
 
         def describe_volumes(filters = {})
           unless filters.is_a?(Hash)
-            Fog::Logger.warning("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("describe_volumes with #{filters.class} param is deprecated, use describe_volumes('volume-id' => []) instead [light_black](#{caller.first})[/]")
             filters = {'volume-id' => [*filters]}
           end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/modify_instance_attribute.rb

@@ -34,7 +34,7 @@ module Fog
         end
 
         def modify_instance_attributes(instance_id, attributes)
-          Fog::Logger.warning("modify_instance_attributes method is deprecated, use 'modify_instance_attribute' instead")
+          Fog::Logger.deprecation("modify_instance_attributes method is deprecated, use 'modify_instance_attribute' instead")
           modify_instance_attribute(instance_id, attributes)
         end
 

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/compute/revoke_security_group_ingress.rb

@@ -8,15 +8,28 @@ module Fog
         # Remove permissions from a security group
         #
         # ==== Parameters
-        # * 'GroupName'<~String> - Name of group
+        # * group_name<~String> - Name of group
         # * options<~Hash>:
         #   * 'SourceSecurityGroupName'<~String> - Name of security group to authorize
         #   * 'SourceSecurityGroupOwnerId'<~String> - Name of owner to authorize
         #   or
-        #   * 'CidrIp' - CIDR range
-        #   * 'FromPort' - Start of port range (or -1 for ICMP wildcard)
-        #   * 'IpProtocol' - Ip protocol, must be in ['tcp', 'udp', 'icmp']
-        #   * 'ToPort' - End of port range (or -1 for ICMP wildcard)
+        #   * 'CidrIp'<~String> - CIDR range
+        #   * 'FromPort'<~Integer> - Start of port range (or -1 for ICMP wildcard)
+        #   * 'IpProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp']
+        #   * 'ToPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
+        #   or
+        #   * 'IpPermissions'<~Array>:
+        #     * permission<~Hash>:
+        #       * 'FromPort'<~Integer> - Start of port range (or -1 for ICMP wildcard)
+        #       * 'Groups'<~Array>:
+        #         * group<~Hash>:
+        #           * 'GroupName'<~String> - Name of security group to authorize
+        #           * 'UserId'<~String> - Name of owner to authorize
+        #       * 'IpProtocol'<~String> - Ip protocol, must be in ['tcp', 'udp', 'icmp']
+        #       * 'IpRanges'<~Array>:
+        #         * ip_range<~Hash>:
+        #           * 'CidrIp'<~String> - CIDR range
+        #       * 'ToPort'<~Integer> - End of port range (or -1 for ICMP wildcard)
         #
         # === Returns
         # * response<~Excon::Response>:
@@ -27,10 +40,15 @@ module Fog
         # {Amazon API Reference}[http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-query-RevokeSecurityGroupIngress.html]
         def revoke_security_group_ingress(group_name, options = {})
           if group_name.is_a?(Hash)
-            Fog::Logger.warning("Fog::AWS::Compute#revoke_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("Fog::AWS::Compute#revoke_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
             options = group_name
-            group_name = options['GroupName']
+            group_name = options.delete('GroupName')
+          end
+
+          if ip_permissions = options.delete('IpPermissions')
+            options.merge!(indexed_ip_permissions_params(ip_permissions))
           end
+
           request({
             'Action'    => 'RevokeSecurityGroupIngress',
             'GroupName' => group_name,
@@ -45,36 +63,30 @@ module Fog
 
         def revoke_security_group_ingress(group_name, options = {})
           if group_name.is_a?(Hash)
-            Fog::Logger.warning("Fog::AWS::Compute#revoke_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
+            Fog::Logger.deprecation("Fog::AWS::Compute#revoke_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated [light_black](#{caller.first})[/]")
             options = group_name
-            group_name = options['GroupName']
+            group_name = options.delete('GroupName')
           end
+
+          verify_permission_options(options)
+
           response = Excon::Response.new
           group = self.data[:security_groups][group_name]
+
           if group
-            if source_group_name = options['SourceSecurityGroupName']
-              group['ipPermissions'].delete_if do |permission|
-                if source_owner_id = options['SourceSecurityGroupOwnerId']
-                  permission['groups'].first['groupName'] == source_group_name && permission['groups'].first['userId'] == source_owner_id
-                else
-                  permission['groups'].first['groupName'] == source_group_name
+            normalized_permissions = normalize_permissions(options)
+
+            normalized_permissions.each do |permission|
+              if matching_permission = find_matching_permission(group, permission)
+                matching_permission['ipRanges'] -= permission['ipRanges']
+                matching_permission['groups'] -= permission['groups']
+
+                if matching_permission['ipRanges'].empty? && matching_permission['groups'].empty?
+                  group['ipPermissions'].delete(matching_permission)
                 end
               end
-            else
-              ingress = group['ipPermissions'].select {|permission|
-                permission['fromPort']    == options['FromPort'] &&
-                permission['ipProtocol']  == options['IpProtocol'] &&
-                permission['toPort']      == options['ToPort'] &&
-                (
-                  permission['ipRanges'].empty? ||
-                  (
-                    permission['ipRanges'].first &&
-                    permission['ipRanges'].first['cidrIp'] == options['CidrIp']
-                  )
-                )
-              }.first
-              group['ipPermissions'].delete(ingress)
             end
+
             response.status = 200
             response.body = {
               'requestId' => Fog::AWS::Mock.request_id,

data/lib/brightbox-cli/vendor/fog/lib/fog/aws/requests/elb/describe_load_balancers.rb

@@ -59,10 +59,10 @@ module Fog
             lb_names.map do |lb_name|
               lb = self.data[:load_balancers].find { |name, data| name == lb_name }
               raise Fog::AWS::ELB::NotFound unless lb
-              lb[1]
+              lb[1].dup
             end.compact
           else
-            self.data[:load_balancers].values
+            self.data[:load_balancers].map { |lb, values| values.dup }
           end
 
           response = Excon::Response.new
@@ -73,7 +73,7 @@ module Fog
               'RequestId' => Fog::AWS::Mock.request_id
             },
             'DescribeLoadBalancersResult' => {
-              'LoadBalancerDescriptions' => load_balancers
+              'LoadBalancerDescriptions' => load_balancers.map { |lb| lb['Instances'] = lb['Instances'].map { |i| i['InstanceId'] }; lb }
             }
           }