fog 1.24.0 → 1.25.0

data/lib/fog/aws/elb.rb

@@ -44,6 +44,9 @@ module Fog
       request :detach_load_balancer_from_subnets
       request :apply_security_groups_to_load_balancer
       request :set_load_balancer_policies_for_backend_server
+      request :add_tags
+      request :describe_tags
+      request :remove_tags
 
       model_path 'fog/aws/models/elb'
       model      :load_balancer
@@ -81,11 +84,11 @@ module Fog
 
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
 
           @region = options[:region] || 'us-east-1'
+          setup_credentials(options)
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2'].include?(@region)
+          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-central-1', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(@region)
             raise ArgumentError, "Unknown region: #{@region.inspect}"
           end
         end
@@ -93,6 +96,9 @@ module Fog
         def setup_credentials(options)
           @aws_access_key_id     = options[:aws_access_key_id]
           @aws_secret_access_key = options[:aws_secret_access_key]
+
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,@region,'elasticloadbalancing')
+
         end
 
         def data
@@ -125,21 +131,23 @@ module Fog
         # ==== Returns
         # * ELB object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.elb'
 
           options[:region] ||= 'us-east-1'
-          @host = options[:host] || "elasticloadbalancing.#{options[:region]}.amazonaws.com"
+          @region = options[:region]
+          @host = options[:host] || "elasticloadbalancing.#{@region}.amazonaws.com"
           @path       = options[:path]        || '/'
           @persistent = options[:persistent]  || false
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
+          setup_credentials(options)
+
         end
 
         def reload
@@ -154,7 +162,7 @@ module Fog
           @aws_session_token      = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,@region,'elasticloadbalancing')
         end
 
         def request(params)
@@ -163,33 +171,34 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = Fog::AWS.signed_params(
+          body, headers = Fog::AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-              :aws_access_key_id  => @aws_access_key_id,
               :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
+              :signer             => @signer,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2012-06-01'
+              :version            => '2012-06-01',
+              :method             => 'POST'
           }
           )
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => headers,
             :idempotent => idempotent,
             :method     => 'POST',
             :parser     => parser

data/lib/fog/aws/emr.rb

@@ -62,7 +62,6 @@ module Fog
         # * EMR object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.emr'
@@ -74,7 +73,9 @@ module Fog
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
           @region = options[:region]
+          setup_credentials(options)
         end
 
         def reload
@@ -89,7 +90,7 @@ module Fog
           @aws_session_token      = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
-          @hmac = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key, @region, 'elasticmapreduce')
         end
 
         def request(params)
@@ -98,12 +99,13 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = Fog::AWS.signed_params(
+          body, headers = Fog::AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-              :aws_access_key_id  => @aws_access_key_id,
+              :signer             => @signer,
               :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
+              :method             => 'POST',
               :host               => @host,
               :path               => @path,
               :port               => @port,
@@ -113,18 +115,18 @@ module Fog
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => headers,
             :idempotent => idempotent,
             :method     => 'POST',
             :parser     => parser

data/lib/fog/aws/iam.rb

@@ -173,10 +173,8 @@ module Fog
         # ==== Returns
         # * IAM object with connection to AWS.
         def initialize(options={})
-          require 'fog/core/parser'
 
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
           @connection_options     = options[:connection_options] || {}
           @instrumentor           = options[:instrumentor]
           @instrumentor_name      = options[:instrumentor_name] || 'fog.aws.iam'
@@ -186,6 +184,9 @@ module Fog
           @port       = options[:port]        || 443
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
+
+          setup_credentials(options)
+
         end
 
         def reload
@@ -200,7 +201,8 @@ module Fog
           @aws_session_token      = options[:aws_session_token]
           @aws_credentials_expire_at = options[:aws_credentials_expire_at]
 
-          @hmac                   = Fog::HMAC.new('sha256', @aws_secret_access_key)
+          #global services that have no region are signed with the us-east-1 region
+          @signer = Fog::AWS::SignatureV4.new( @aws_access_key_id, @aws_secret_access_key,'us-east-1','iam')
         end
 
         def request(params)
@@ -208,34 +210,35 @@ module Fog
           idempotent  = params.delete(:idempotent)
           parser      = params.delete(:parser)
 
-          body = Fog::AWS.signed_params(
+          body, headers = Fog::AWS.signed_params_v4(
             params,
+            { 'Content-Type' => 'application/x-www-form-urlencoded' },
             {
-              :aws_access_key_id  => @aws_access_key_id,
+              :signer             => @signer,
               :aws_session_token  => @aws_session_token,
-              :hmac               => @hmac,
               :host               => @host,
               :path               => @path,
               :port               => @port,
-              :version            => '2010-05-08'
+              :version            => '2010-05-08',
+              :method             => 'POST'
             }
           )
 
           if @instrumentor
             @instrumentor.instrument("#{@instrumentor_name}.request", params) do
-              _request(body, idempotent, parser)
+              _request(body, headers, idempotent, parser)
             end
           else
-            _request(body, idempotent, parser)
+            _request(body, headers, idempotent, parser)
           end
         end
 
-        def _request(body, idempotent, parser)
+        def _request(body, headers, idempotent, parser)
           @connection.request({
             :body       => body,
             :expects    => 200,
             :idempotent => idempotent,
-            :headers    => { 'Content-Type' => 'application/x-www-form-urlencoded' },
+            :headers    => headers,
             :method     => 'POST',
             :parser     => parser
           })

data/lib/fog/aws/models/compute/security_group.rb

@@ -11,6 +11,7 @@ module Fog
         attribute :ip_permissions_egress,  :aliases => 'ipPermissionsEgress'
         attribute :owner_id,        :aliases => 'ownerId'
         attribute :vpc_id,          :aliases => 'vpcId'
+        attribute :tags,            :aliases => 'tagSet'
 
         # Authorize access by another security group
         #
@@ -220,6 +221,36 @@ module Fog
           )
         end
 
+        # Reload a security group
+        #
+        #  >> g = AWS.security_groups.get(:name => "some_name")
+        #  >> g.reload
+        #
+        #  == Returns:
+        #
+        #  Up to date model or an exception
+
+        def reload
+          if group_id.nil?
+            super
+            service.delete_security_group(name)
+          else
+            requires :group_id
+
+            data = begin
+              collection.get_by_id(group_id)
+            rescue Excon::Errors::SocketError
+              nil
+            end
+
+            return unless data
+
+            merge_attributes(data.attributes)
+            self
+          end
+        end
+
+
         # Create a security group
         #
         #  >> g = AWS.security_groups.new(:name => "some_name", :description => "something")
@@ -236,6 +267,16 @@ module Fog
           data = service.create_security_group(name, description, vpc_id).body
           new_attributes = data.reject {|key,value| key == 'requestId'}
           merge_attributes(new_attributes)
+
+          if tags = self.tags
+            # expect eventual consistency
+            Fog.wait_for { self.reload rescue nil }
+            service.create_tags(
+              self.group_id,
+              tags
+            )
+          end
+
           true
         end
 

data/lib/fog/aws/models/elb/load_balancer.rb

@@ -16,6 +16,7 @@ module Fog
         attribute :security_groups,       :aliases => 'SecurityGroups'
         attribute :scheme,                :aliases => 'Scheme'
         attribute :vpc_id,                :aliases => 'VPCId'
+        attribute :tags,                  :aliases => 'tagSet'
 
         def initialize(attributes={})
           if attributes[:subnet_ids] ||= attributes['Subnets']
@@ -60,6 +61,17 @@ module Fog
           service.modify_load_balancer_attributes(id, 'CrossZoneLoadBalancing' => {'Enabled' => value})
         end
 
+        def connection_settings_idle_timeout
+          requires :id
+          service.describe_load_balancer_attributes(id).body['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['ConnectionSettings']['IdleTimeout']
+        end
+
+        def set_connection_settings_idle_timeout(timeout=60)
+          requires :id
+          attrs = {'IdleTimeout' => timeout}
+          service.modify_load_balancer_attributes(id,'ConnectionSettings' => attrs)
+        end
+
         def register_instances(instances)
           requires :id
           data = service.register_instances_with_load_balancer(instances, id).body['RegisterInstancesWithLoadBalancerResult']
@@ -174,6 +186,25 @@ module Fog
           true
         end
 
+        def tags
+          requires :id
+          service.describe_tags(id).
+            body['DescribeTagsResult']["LoadBalancers"][0]["Tags"]
+
+        end
+        def add_tags(new_tags)
+          requires :id
+          service.add_tags(id, new_tags)
+          tags
+        end
+
+        def remove_tags(tag_keys)
+          requires :id
+          service.remove_tags(id, tag_keys)
+          tags
+        end
+        
+
         def save
           requires :id
           requires :listeners

data/lib/fog/aws/models/glacier/archive.rb

@@ -44,7 +44,9 @@ module Fog
 
           hash = Fog::AWS::Glacier::TreeHash.new
 
-          body.rewind if body.respond_to?(:rewind)
+          if body.respond_to?(:rewind)
+            body.rewind  rescue nil
+          end
           offset = 0
           while (chunk = body.read(multipart_chunk_size)) do
             part_hash = hash.add_part(chunk)

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

@@ -17,7 +17,7 @@ module Fog
           requires :rolename
           requires :assume_role_policy_document
 
-          data = service.create_role(rolename, assume_role_policy_document).body["Role"]
+          data = service.create_role(rolename, assume_role_policy_document, path).body["Role"]
           merge_attributes(data)
           true
         end

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

@@ -20,7 +20,7 @@ module Fog
           role = nil
           begin
             role = service.roles.new( service.get_role( identity ).data[:body]["Role"] )
-          rescue Excon::Errors::NotFound # ignore not found error
+          rescue Excon::Errors::NotFound, Fog::AWS::IAM::NotFound # ignore not found error
           end
           role
         end

data/lib/fog/aws/models/storage/file.rb

@@ -149,7 +149,7 @@ module Fog
           new_public
         end
 
-        # Get pubically acessible url via http GET.
+        # Get publicly accessible url via http GET.
         # Checks permissions before creating.
         # Defaults to s3 subdomain or compliant bucket name
         #

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

@@ -8,8 +8,9 @@ module Fog
             @ip_permission = { 'groups' => [], 'ipRanges' => []}
             @ip_permission_egress = { 'groups' => [], 'ipRanges' => []}
             @ip_range = {}
-            @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [] }
+            @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [], 'tagSet' => {} }
             @response = { 'securityGroupInfo' => [] }
+            @tag = {}
           end
 
           def start_element(name, attrs = [])
@@ -23,70 +24,84 @@ module Fog
               @in_ip_permissions_egress = true
             when 'ipRanges'
               @in_ip_ranges = true
+            when 'tagSet'
+              @in_tag_set = true
             end
           end
 
           def end_element(name)
-            case name
-            when 'cidrIp'
-              @ip_range[name] = value
-            when 'fromPort', 'toPort'
-              if @in_ip_permissions_egress
-                @ip_permission_egress[name] = value.to_i
-              else
-                @ip_permission[name] = value.to_i
-              end
-            when 'groups'
-              @in_groups = false
-            when 'groupDescription', 'ownerId', 'vpcId'
-              @security_group[name] = value
-            when 'groupId','groupName'
-              if @in_groups
-                @group[name] = value
-              else
-                @security_group[name] = value
-              end
-            when 'ipPermissions'
-              @in_ip_permissions = false
-            when 'ipPermissionsEgress'
-              @in_ip_permissions_egress = false
-            when 'ipProtocol'
-              if @in_ip_permissions_egress
-                @ip_permission_egress[name] = value
-              else
-                @ip_permission[name] = value
+            if @in_tag_set
+              case name
+                when 'item'
+                  @security_group['tagSet'][@tag['key']] = @tag['value']
+                  @tag = {}
+                when 'key', 'value'
+                  @tag[name] = value
+                when 'tagSet'
+                  @in_tag_set = false
               end
-            when 'ipRanges'
-              @in_ip_ranges = false
-            when 'item'
-              if @in_groups
+            else
+              case name
+              when 'cidrIp'
+                @ip_range[name] = value
+              when 'fromPort', 'toPort'
                 if @in_ip_permissions_egress
-                  @ip_permission_egress['groups'] << @group
+                  @ip_permission_egress[name] = value.to_i
+                else
+                  @ip_permission[name] = value.to_i
+                end
+              when 'groups'
+                @in_groups = false
+              when 'groupDescription', 'ownerId', 'vpcId'
+                @security_group[name] = value
+              when 'groupId','groupName'
+                if @in_groups
+                  @group[name] = value
                 else
-                  @ip_permission['groups'] << @group
+                  @security_group[name] = value
                 end
-                @group = {}
-              elsif @in_ip_ranges
+              when 'ipPermissions'
+                @in_ip_permissions = false
+              when 'ipPermissionsEgress'
+                @in_ip_permissions_egress = false
+              when 'ipProtocol'
                 if @in_ip_permissions_egress
-                  @ip_permission_egress['ipRanges'] << @ip_range
+                  @ip_permission_egress[name] = value
                 else
-                  @ip_permission['ipRanges'] << @ip_range
+                  @ip_permission[name] = value
                 end
-                @ip_range = {}
-              elsif @in_ip_permissions
-                @security_group['ipPermissions'] << @ip_permission
-                @ip_permission = { 'groups' => [], 'ipRanges' => []}
-              elsif @in_ip_permissions_egress
-                @security_group['ipPermissionsEgress'] << @ip_permission_egress
-                @ip_permission_egress = { 'groups' => [], 'ipRanges' => []}
-              else
-                @response['securityGroupInfo'] << @security_group
-                @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [] }
+              when 'ipRanges'
+                @in_ip_ranges = false
+              when 'item'
+                if @in_groups
+                  if @in_ip_permissions_egress
+                    @ip_permission_egress['groups'] << @group
+                  else
+                    @ip_permission['groups'] << @group
+                  end
+                  @group = {}
+                elsif @in_ip_ranges
+                  if @in_ip_permissions_egress
+                    @ip_permission_egress['ipRanges'] << @ip_range
+                  else
+                    @ip_permission['ipRanges'] << @ip_range
+                  end
+                  @ip_range = {}
+                elsif @in_ip_permissions
+                  @security_group['ipPermissions'] << @ip_permission
+                  @ip_permission = { 'groups' => [], 'ipRanges' => []}
+                elsif @in_ip_permissions_egress
+                  @security_group['ipPermissionsEgress'] << @ip_permission_egress
+                  @ip_permission_egress = { 'groups' => [], 'ipRanges' => []}
+                else
+                  @response['securityGroupInfo'] << @security_group
+                  @security_group = { 'ipPermissions' => [], 'ipPermissionsEgress' => [], 'tagSet' => {} }
+                end
+              when 'requestId'
+                @response[name] = value
+              when 'userId'
+                @group[name] = value
               end
-            when 'requestId'
-              @response[name] = value
-            when 'userId'
-              @group[name] = value
             end
           end
         end