fog 1.24.0 → 1.25.0

data/lib/fog/aws/parsers/elb/describe_load_balancer_attributes.rb

@@ -15,6 +15,8 @@ module Fog
               @connection_draining = {}
             when 'CrossZoneLoadBalancing'
               @cross_zone_load_balancing = {}
+            when 'ConnectionSettings'
+              @connection_settings = {}
             end
           end
 
@@ -26,6 +28,8 @@ module Fog
               elsif @connection_draining
                 @connection_draining['Enabled'] = value == 'true' ? true : false
               end
+            when 'IdleTimeout'
+              @connection_settings['IdleTimeout'] = value.to_i
             when 'Timeout'
               if @connection_draining
                 @connection_draining['Timeout'] = value.to_i
@@ -36,6 +40,9 @@ module Fog
             when 'CrossZoneLoadBalancing'
               @response['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['CrossZoneLoadBalancing'] = @cross_zone_load_balancing
               @cross_zone_load_balancing = nil
+            when 'ConnectionSettings'
+              @response['DescribeLoadBalancerAttributesResult']['LoadBalancerAttributes']['ConnectionSettings'] = @connection_settings
+              @connection_settings = nil
             when 'RequestId'
               @response['ResponseMetadata'][name] = value
             end

data/lib/fog/aws/parsers/elb/describe_tags.rb

@@ -0,0 +1,26 @@
+module Fog
+  module Parsers
+    module Compute
+      module AWS
+        class DescribeTags < Fog::Parsers::Base
+          def reset
+            @tag = {}
+            @response = { 'tagSet' => [] }
+          end
+
+          def end_element(name)
+            case name
+            when 'resourceId', 'resourceType', 'key', 'value'
+              @tag[name] = value
+            when 'item'
+              @response['tagSet'] << @tag
+              @tag = {}
+            when 'requestId'
+              @response[name] = value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/elb/tag_list_parser.rb

@@ -0,0 +1,57 @@
+module Fog
+  module Parsers
+    module AWS
+      module ELB
+        # parses an XML-formatted list of resource tags from AWS
+        class TagListParser < Fog::Parsers::Base
+
+          # each tag is modeled as a String pair (2-element Array)
+          def reset
+            @this_key   = nil
+            @this_value = nil
+            @tags       = Hash.new
+            @response   = { 'DescribeTagsResult' => { 'LoadBalancers' => [] }, 'ResponseMetadata' => {} }
+            @in_tags = false
+          end
+
+          def start_element(name, attrs = [])
+            super
+            case name
+              when 'member'
+                unless @in_tags
+                  @load_balancer_name = nil
+                  @tags = {}
+                end
+              when 'Tags'
+                @in_tags = true
+            end
+          end
+
+          def end_element(name)
+            super
+            case name
+              when 'member'
+                if @in_tags
+                  @tags[@this_key] = @this_value
+                  @this_key, @this_value = nil, nil
+                else
+                  @response['DescribeTagsResult']['LoadBalancers'] << { 'Tags' => @tags, 'LoadBalancerName' => @load_balancer_name }
+                end
+              when 'Key'
+                @this_key = value
+              when 'Value'
+                @this_value = value
+              when 'LoadBalancerName'
+                @load_balancer_name = value
+              when 'RequestId'
+                @response['ResponseMetadata'][name] = value
+              when 'Tags'
+                @in_tags = false
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/parsers/storage/get_bucket_website.rb

@@ -2,9 +2,11 @@ module Fog
   module Parsers
     module Storage
       module AWS
+
+        # http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketGETwebsite.html
         class GetBucketWebsite < Fog::Parsers::Base
           def reset
-            @response = { 'ErrorDocument' => {}, 'IndexDocument' => {} }
+            @response = { 'ErrorDocument' => {}, 'IndexDocument' => {}, 'RedirectAllRequestsTo' => {} }
           end
 
           def end_element(name)
@@ -13,6 +15,8 @@ module Fog
               @response['ErrorDocument'][name] = value
             when 'Suffix'
               @response['IndexDocument'][name] = value
+            when 'HostName'
+              @response['RedirectAllRequestsTo'][name] = value
             end
           end
         end

data/lib/fog/aws/rds.rb

@@ -115,7 +115,7 @@ module Fog
           @use_iam_profile = options[:use_iam_profile]
           @region = options[:region] || 'us-east-1'
 
-          unless ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].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
@@ -157,7 +157,6 @@ module Fog
         # * ELB object with connection to AWS.
         def initialize(options={})
           @use_iam_profile = options[:use_iam_profile]
-          setup_credentials(options)
           @instrumentor       = options[:instrumentor]
           @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.rds'
           @connection_options     = options[:connection_options] || {}
@@ -170,6 +169,8 @@ module Fog
           @scheme     = options[:scheme]      || 'https'
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
           @version    = options[:version] || '2013-05-15'
+
+          setup_credentials(options)
         end
 
         def owner_id
@@ -188,7 +189,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,'rds')
         end
 
         def request(params)
@@ -197,33 +198,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            => @version
+              :version            => @version,
+              :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/region_methods.rb

@@ -2,7 +2,7 @@ module Fog
   module AWS
     module RegionMethods
       def validate_aws_region host, region
-        if host.end_with?('.amazonaws.com') and not ['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1'].include?(region)
+        if host.end_with?('.amazonaws.com') && !['ap-northeast-1', 'ap-southeast-1', 'ap-southeast-2', 'eu-west-1', 'us-east-1', 'us-west-1', 'us-west-2', 'sa-east-1', 'us-gov-west-1', 'eu-central-1'].include?(region)
           raise ArgumentError, "Unknown region: #{region.inspect}"
         end
       end

data/lib/fog/aws/requests/dynamodb/put_item.rb

@@ -30,7 +30,7 @@ module Fog
 
           request(
             :body       => Fog::JSON.encode(body),
-            :headers    => {'x-amz-target' => 'DynamoDB_20111205.PutItem'}
+            :headers    => {'x-amz-target' => 'DynamoDB_20120810.PutItem'}
           )
         end
       end

data/lib/fog/aws/requests/elb/add_tags.rb

@@ -0,0 +1,46 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        # adds tags to a load balancer instance
+        # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_AddTags.html
+        # ==== Parameters
+        # * elb_id <~String> - name of the ELB instance to be tagged
+        # * tags <~Hash> A Hash of (String) key-value pairs
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def add_tags(elb_id, tags)
+          keys    = tags.keys.sort
+          values  = keys.map {|key| tags[key]}
+          request({
+              'Action'                     => 'AddTags',
+              'LoadBalancerNames.member.1' => elb_id,
+              :parser                      => Fog::Parsers::AWS::ELB::Empty.new,
+            }.merge(Fog::AWS.indexed_param('Tags.member.%d.Key', keys)).
+              merge(Fog::AWS.indexed_param('Tags.member.%d.Value', values)))
+        end
+
+      end
+
+      class Mock
+
+        def add_tags(elb_id, tags)
+          response = Excon::Response.new
+          if server = self.data[:load_balancers][elb_id]
+            self.data[:tags][elb_id].merge! tags
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+            }
+            response
+          else
+            raise Fog::AWS::ELB::NotFound.new("Elastic load balancer #{elb_id} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elb/create_load_balancer.rb

@@ -146,6 +146,8 @@ module Fog
 
                              default_sg
                            end
+          self.data[:tags] ||= {}
+          self.data[:tags][lb_name] = {}
 
           self.data[:load_balancers][lb_name] = {
             'AvailabilityZones' => availability_zones,
@@ -172,7 +174,8 @@ module Fog
             'ListenerDescriptions' => listeners,
             'LoadBalancerAttributes' => {
               'ConnectionDraining' => {'Enabled' => false, 'Timeout' => 300},
-              'CrossZoneLoadBalancing' => {'Enabled' => false}
+              'CrossZoneLoadBalancing' => {'Enabled' => false},
+              'ConnectionSettings' => {'IdleTimeout' => 60}
             },
             'LoadBalancerName' => lb_name,
             'Policies' => {

data/lib/fog/aws/requests/elb/describe_load_balancer_attributes.rb

@@ -21,6 +21,9 @@ module Fog
         #           * 'Timeout'<~Integer> - max time (in seconds) to keep existing conns open before deregistering instances.
         #         * 'CrossZoneLoadBalancing'<~Hash>
         #           * 'Enabled'<~Boolean> - whether crosszone load balancing is enabled
+        #         * 'ConnectionSettings'<~Hash>
+        #           * 'IdleTimeout'<~Integer> - time (in seconds) the connection is allowed to be idle (no data has been sent over the connection) before it is closed by the load balancer.
+
         def describe_load_balancer_attributes(lb_name)
           request({
             'Action'  => 'DescribeLoadBalancerAttributes',

data/lib/fog/aws/requests/elb/describe_tags.rb

@@ -0,0 +1,56 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        require 'fog/aws/parsers/elb/tag_list_parser'
+
+        # returns a Hash of tags for a load balancer
+        # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_DescribeTags.html
+        # ==== Parameters
+        # * elb_id <~String> - name(s) of the ELB instance whose tags are to be retrieved (allows 1-20 of them)
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def describe_tags(elb_ids)
+          request({
+              'Action' => 'DescribeTags',
+              :parser  => Fog::Parsers::AWS::ELB::TagListParser.new
+            }.merge(Fog::AWS.indexed_param('LoadBalancerNames.member.%d', elb_ids))
+          )
+        end
+        # def describe_tags(filters = {})
+        #   params = Fog::AWS.indexed_filters(filters)
+        #   request({
+        #     'Action'    => 'DescribeTags',
+        #     :idempotent => true,
+        #     :parser     => Fog::Parsers::Compute::AWS::DescribeTags.new
+        #   }.merge!(params))
+        # end
+
+      end
+
+      class Mock
+
+        def describe_tags(elb_id)
+          response = Excon::Response.new
+
+          if server = self.data[:load_balancers][elb_id]
+            response.status = 200
+            ##{"DescribeTagsResult"=>{"LoadBalancers"=>[{"Tags"=>{"Name"=>"2esakowski-test-opsworks-elb"}, "LoadBalancerName"=>"esakowski-test-opsworks"}]}}
+            response.body = {"DescribeTagsResult"=>{"LoadBalancers"=>[{"Tags"=>self.data[:tags][elb_id], "LoadBalancerName"=>elb_id}]}}
+
+#            response.body = {
+#              "DescribeTagsResult" =>
+#               {"TagDescriptions" => self.data[:tags][elb_id]}
+#            }
+            response
+          else
+            raise Fog::AWS::ELB::NotFound.new("Elastic load balancer #{elb_id} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/elb/modify_load_balancer_attributes.rb

@@ -6,8 +6,12 @@ module Fog
 
         # Sets attributes of the load balancer
         #
-        # Currently the only attributes that can be set are whether CrossZoneLoadBalancing
-        # or ConnectionDraining are enabled. You can also set the Timeout for ConnectionDraining.
+        # The following attributes can be set:
+        # * CrossZoneLoadBalancing (enable/disable)
+        # * ConnectionDraining (enable/disable and timeout)
+        # * Idle Connection Timeouts
+        #
+        # Still requires: AccessLog configuration
         #
         # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_ModifyLoadBalancerAttributes.html
         # ==== Parameters
@@ -18,6 +22,8 @@ module Fog
         #     * 'Timeout'<~Integer> max time to keep existing conns open before deregistering instances
         #   * 'CrossZoneLoadBalancing'<~Hash>:
         #     * 'Enabled'<~Boolean> whether to enable cross zone load balancing
+        #   * 'ConnectionSettings'<~Hash>:
+        #     * 'IdleTimeout'<~Integer> time (in seconds) the connection is allowed to be idle (no data has been sent over the connection) before it is closed by the load balancer.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -38,7 +44,7 @@ module Fog
         def modify_load_balancer_attributes(lb_name, attributes)
           raise Fog::AWS::ELB::NotFound unless load_balancer = self.data[:load_balancers][lb_name]
 
-          if attributes['CrossZoneLoadBalancing'] || attributes['ConnectionDraining']
+          if attributes['CrossZoneLoadBalancing'] || attributes['ConnectionDraining'] || attributes['ConnectionSettings']
             load_balancer['LoadBalancerAttributes'].merge! attributes
           end
 

data/lib/fog/aws/requests/elb/remove_tags.rb

@@ -0,0 +1,46 @@
+module Fog
+  module AWS
+    class ELB
+      class Real
+
+        # removes tags from an elastic load balancer instance
+        # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/APIReference/API_RemoveTags.html
+        # ==== Parameters
+        # * elb_id <~String> - name of the ELB instance whose tags are to be retrieved
+        # * keys <~Array> A list of String keys for the tags to remove
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        def remove_tags(elb_id, keys)
+          request(
+            { 'Action'                      => 'RemoveTags',
+              # Note: there is a discrepancy in the API docs in the ID parameter name between the write-up and the example.
+              # Who knows which way the fix will go, if any is ever made? In any case, this works.
+              'LoadBalancerNames.member.1'  => elb_id,
+              :parser => Fog::Parsers::AWS::ELB::Empty.new,
+            }.merge(Fog::AWS.indexed_param('Tags.member.%d.Key', keys))
+          )
+        end
+
+      end
+
+      class Mock
+
+        def remove_tags(elb_id, keys)
+          response = Excon::Response.new
+          if server = self.data[:load_balancers][elb_id]
+            keys.each {|key| self.data[:tags][elb_id].delete key}
+            response.status = 200
+            response.body = {
+              "ResponseMetadata"=>{ "RequestId"=> Fog::AWS::Mock.request_id }
+            }
+            response
+          else
+            raise Fog::AWS::ELB::NotFound.new("Elastic load balancer #{elb_id} not found")
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/storage/copy_object.rb

@@ -28,7 +28,7 @@ module Fog
         # @see http://docs.amazonwebservices.com/AmazonS3/latest/API/RESTObjectCOPY.html
         #
         def copy_object(source_bucket_name, source_object_name, target_bucket_name, target_object_name, options = {})
-          headers = { 'x-amz-copy-source' => "/#{source_bucket_name}/#{CGI.escape(source_object_name)}" }.merge!(options)
+          headers = { 'x-amz-copy-source' => "/#{source_bucket_name}#{object_to_path(source_object_name)}" }.merge!(options)
           request({
             :expects  => 200,
             :headers  => headers,