fog 1.23.0 → 1.24.0

data/lib/fog/aws/redshift.rb

@@ -6,7 +6,7 @@ module Fog
       extend Fog::AWS::CredentialFetcher::ServiceMethods
 
       requires :aws_access_key_id, :aws_secret_access_key
-      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at
+      recognizes :region, :host, :path, :port, :scheme, :persistent, :use_iam_profile, :aws_session_token, :aws_credentials_expire_at, :instrumentor, :instrumentor_name
 
       request_path 'fog/aws/requests/redshift'
 
@@ -78,6 +78,8 @@ module Fog
           @region = options[:region] || 'us-east-1'
           setup_credentials(options)
 
+          @instrumentor       = options[:instrumentor]
+          @instrumentor_name  = options[:instrumentor_name] || 'fog.aws.redshift'
           @connection_options     = options[:connection_options] || {}
           @host = options[:host] || "redshift.#{@region}.amazonaws.com"
           @version = '2012-12-01'
@@ -87,7 +89,7 @@ module Fog
           @scheme     = options[:scheme]      || 'https'
 
           @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options)
-       end
+        end
 
         private
         def setup_credentials(options)
@@ -111,9 +113,19 @@ module Fog
           params[:headers]['x-amz-redshift-version'] = @version
           params[:headers]['x-amz-security-token'] = @aws_session_token if @aws_session_token
           params[:headers]['Authorization'] = @signer.sign params, date
+          params[:parser] = parser
+
+          if @instrumentor
+            @instrumentor.instrument("#{@instrumentor_name}.request", params) do
+              _request(params, &block)
+            end
+          else
+            _request(params, &block)
+          end
+        end
 
-          response = @connection.request(params.merge(:parser => parser), &block)
-          response
+        def _request(params, &block)
+          @connection.request(params, &block)
         end
       end
     end

data/lib/fog/aws/region_methods.rb

@@ -1,8 +1,8 @@
 module Fog
   module AWS
     module RegionMethods
-      def validate_aws_region region
-        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)
+      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)
           raise ArgumentError, "Unknown region: #{region.inspect}"
         end
       end

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

@@ -39,6 +39,8 @@ module Fog
         #     market price.
         #   * 'UserData'<~String> - The user data available to the launched
         #     Amazon EC2 instances.
+        #   * 'EbsOptimized'<~Boolean> - Whether the instance is optimized for
+        #     EBS I/O. Not required, default false.
         #
         # ==== Returns
         # * response<~Excon::Response>:
@@ -82,6 +84,7 @@ module Fog
             'AssociatePublicIpAddress' => nil,
             'BlockDeviceMappings'     => [],
             'CreatedTime'             => Time.now.utc,
+            'EbsOptimized'            => false,
             'IamInstanceProfile'      => nil,
             'ImageId'                 => image_id,
             'InstanceMonitoring'      => {'Enabled' => true},

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

@@ -146,6 +146,9 @@ module Fog
             elsif state_reason_key = filter_key.split('state-reason-')[1]
               aliased_key = state_reason_aliases[state_reason_key]
               instance_set = instance_set.reject{|instance| ![*filter_value].include?(instance['stateReason'][aliased_key])}
+            elsif filter_key == "availability-zone"
+              aliased_key = aliases[filter_key]
+              instance_set = instance_set.reject{|instance| ![*filter_value].include?(instance['placement'][aliased_key])}
             elsif filter_key == "group-name"
               instance_set = instance_set.reject {|instance| !instance['groupSet'].include?(filter_value)}
             elsif filter_key == "group-id"

data/lib/fog/aws/requests/dns/change_resource_record_sets.rb

@@ -17,6 +17,12 @@ module Fog
         #     * name<~String>   - This must be a fully-specified name, ending with a final period
         #     * type<~String>   - A | AAAA | CNAME | MX | NS | PTR | SOA | SPF | SRV | TXT
         #     * ttl<~Integer>   - Time-to-live value - omit if using an alias record
+        #     * weight<~Integer>   - Time-to-live value - omit if using an alias record
+        #     * set_identifier<~String> - An identifier that differentiates among multiple resource record sets that have the same combination of DNS name and type.
+        #     * region<~String> - The Amazon EC2 region where the resource that is specified in this resource record set resides.  (Latency only)
+        #     * failover<~String> - To configure failover, you add the Failover element to two resource record sets. For one resource record set, you specify PRIMARY as the value for Failover; for the other resource record set, you specify SECONDARY.
+        #     * geo_location<~String XML> - A complex type currently requiring XML that lets you control how Amazon Route 53 responds to DNS queries based on the geographic origin of the query.
+        #     * health_check_id<~String> - If you want Amazon Route 53 to return this resource record set in response to a DNS query only when a health check is passing, include the HealthCheckId element and specify the ID of the applicable health check.
         #     * resource_records<~Array> - Omit if using an alias record
         #     * alias_target<~Hash> - Information about the domain to which you are redirecting traffic (Alias record sets only)
         #       * dns_name<~String> - The Elastic Load Balancing domain to which you want to reroute traffic
@@ -92,6 +98,15 @@ module Fog
                   region_tag += %Q{<Region>#{change_item[:region]}</Region>}
                 end
               end
+
+              failover_tag = if change_item[:failover]
+                %Q{<Failover>#{change_item[:failover]}</Failover>}
+              end
+
+              geolocation_tag = if change_item[:geo_location]
+                %Q{<GeoLocation>#{change_item[:geo_location]}</GeoLocation>}
+              end
+
               resource_records = change_item[:resource_records] || []
               resource_record_tags = ''
               resource_records.each do |record|
@@ -112,7 +127,11 @@ module Fog
                 alias_target_tag += %Q{<AliasTarget><HostedZoneId>#{hosted_zone_id}</HostedZoneId><DNSName>#{dns_name}</DNSName>#{evaluate_target_health_xml}</AliasTarget>}
               end
 
-              change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{set_identifier_tag}#{weight_tag}#{region_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}</ResourceRecordSet></Change>}
+              health_check_id_tag = if change_item[:health_check_id]
+                %Q{<HealthCheckId>#{change_item[:health_check_id]}</HealthCheckId>}
+              end
+
+              change_tags = %Q{<Change>#{action_tag}<ResourceRecordSet>#{name_tag}#{type_tag}#{set_identifier_tag}#{weight_tag}#{region_tag}#{failover_tag}#{geolocation_tag}#{ttl_tag}#{resource_tag}#{alias_target_tag}#{health_check_id_tag}</ResourceRecordSet></Change>}
               changes += change_tags
             end
 

data/lib/fog/aws/requests/dns/create_health_check.rb

@@ -0,0 +1,64 @@
+module Fog
+  module DNS
+    class AWS
+      class Real
+        require 'fog/aws/parsers/dns/health_check'
+
+        # This action creates a new health check.
+        # http://docs.aws.amazon.com/Route53/latest/APIReference/API_CreateHealthCheck.html
+        #
+        # ==== Parameters (options as symbols Hash)
+        # * ip_address<~String> - (optional if fqdn) The IPv4 IP address of the endpoint on which you want Amazon Route 53 to perform health checks
+        # * port<~Integer> - The port on the endpoint on which you want Amazon Route 53 to perform health checks
+        # * type<~String> - HTTP | HTTPS | HTTP_STR_MATCH | HTTPS_STR_MATCH | TCP
+        # * resource_path<~Stringy> - (required for all types except TCP) The path that you want Amazon Route 53 to request when performing health checks. The path can be any value for which your endpoint will return an HTTP status code of 2xx or 3xx when the endpoint is healthy
+        # * fqdn<~String> - (optional if ip_address) The value that you want Amazon Route 53 to pass in the Host header in all health checks except TCP health checks
+        # * search_string<~String> - If the value of Type is HTTP_STR_MATCH or HTTP_STR_MATCH, the string that you want Amazon Route 53 to search for in the response body from the specified resource
+        # * request_interval<~String> - 10 | 30 (optional) The number of seconds between the time that Amazon Route 53 gets a response from your endpoint and the time that it sends the next health-check request
+        # * failure_threshold<~Integer> - 1-10 (optional) The number of consecutive health checks that an endpoint must pass or fail for Amazon Route 53 to change the current status of the endpoint from unhealthy to healthy or vice versa
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'HealthCheck'<~Hash>
+        #       * 'Id'<~String> - The ID of the request
+        #       * 'CallerReference'<~String> - A unique string that identifies the request and that allows failed CreateHealthCheck requests to be retried without the risk of executing the operation twice.
+        #       * 'HealthCheckConfig'<~Hash>
+        #         * 'IPAddress'
+        #         * 'Port'
+        #         * 'Type'
+        #         * 'ResourcePath'
+        #         * 'FullyQualifiedDomainName'
+        #         * 'RequestInterval'
+        #         * 'FailureThreshold'
+        #   * status<~Integer> - 201 when successful
+
+        def create_health_check(ip_address, port, type, options = {})
+          version = @version
+          builder = Nokogiri::XML::Builder.new(:encoding => 'UTF-8') do
+            CreateHealthCheckRequest(:xmlns => "https://route53.amazonaws.com/doc/#{version}/") do
+              CallerReference options[:caller_reference] || "#{Time.now.to_i.to_s}-#{SecureRandom.hex(6)}"
+              HealthCheckConfig do
+                IPAddress ip_address unless ip_address.nil?
+                Port port
+                Type type
+                ResourcePath options[:resource_path] if options.has_key?(:resource_path)
+                FullyQualifiedDomainName options[:fqdn] if options.has_key?(:fqdn)
+                SearchString options[:search_string] if options.has_key?(:search_string)
+                RequestInterval options[:request_interval] if options.has_key?(:request_interval)
+                FailureThreshold options[:failure_threshold] if options.has_key?(:failure_threshold)
+              end
+            end
+          end
+
+          request({
+            :body    => builder.to_xml.to_s,
+            :expects => 201,
+            :method  => 'POST',
+            :path    => 'healthcheck',
+            :parser  => Fog::Parsers::DNS::AWS::HealthCheck.new
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dns/delete_health_check.rb

@@ -0,0 +1,24 @@
+module Fog
+  module DNS
+    class AWS
+      class Real
+        # This action deletes a health check.
+        # http://docs.aws.amazon.com/Route53/latest/APIReference/API_DeleteHealthCheck.html
+        #
+        # ==== Parameters
+        # * id<~String> - Health check ID
+        # === Returns
+        # * response<~Excon::Response>:
+        #   * status<~Integer> - 200 when successful
+
+        def delete_health_check(id)
+          request({
+            :expects => 200,
+            :method  => 'DELETE',
+            :path    => "healthcheck/#{id}"
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dns/get_health_check.rb

@@ -0,0 +1,41 @@
+module Fog
+  module DNS
+    class AWS
+      class Real
+        require 'fog/aws/parsers/dns/health_check'
+
+        # This action gets information about a specified health check.
+        #http://docs.aws.amazon.com/Route53/latest/APIReference/API_GetHealthCheck.html
+        #
+        # ==== Parameters
+        # * id<~String> - The ID of the health check
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'HealthCheck'<~Hash>:
+        #       * 'Id'<~String> -
+        #       * 'CallerReference'<~String>
+        #       * 'HealthCheckConfig'<~Hash>:
+        #         * 'IPAddress'<~String> -
+        #         * 'Port'<~String> -
+        #         * 'Type'<~String> -
+        #         * 'ResourcePath'<~String> -
+        #         * 'FullyQualifiedDomainName'<~String> -
+        #         * 'SearchString'<~String> -
+        #         * 'RequestInterval'<~Integer> -
+        #         * 'FailureThreshold'<~String> -
+        #       * 'HealthCheckVersion'<~Integer> -
+        #   * status<~Integer> - 200 when successful
+        def get_health_check(id)
+          request({
+            :expects => 200,
+            :parser  => Fog::Parsers::DNS::AWS::HealthCheck.new,
+            :method  => 'GET',
+            :path    => "healthcheck/#{id}"
+          })
+        end
+      end
+    end
+  end
+end

data/lib/fog/aws/requests/dns/list_health_checks.rb

@@ -0,0 +1,36 @@
+module Fog
+  module DNS
+    class AWS
+      class Real
+        require 'fog/aws/parsers/dns/list_health_checks'
+
+        # This action gets a list of the health checks that are associated with the current AWS account.
+        # http://docs.aws.amazon.com/Route53/latest/APIReference/API_ListHealthChecks.html
+        #
+        # === Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'HealthChecks'<~Array>:
+        #       * 'HealthCheck'<~Hash>:
+        #         * 'Id'<~String> -
+        #         * 'CallerReference'<~String>
+        #         * 'HealthCheckVersion'<~Integer> -
+        #     * 'Marker'<~String> -
+        #     * 'MaxItems'<~Integer> -
+        #     * 'IsTruncated'<~String> -
+        #     * 'NextMarker'<~String>
+        #   * status<~Integer> - 200 when successful
+
+        def list_health_checks
+          request({
+            :expects => 200,
+            :method  => 'GET',
+            :path    => "healthcheck",
+            :parser  => Fog::Parsers::DNS::AWS::ListHealthChecks.new
+          })
+        end
+      end
+    end
+  end
+end
+

data/lib/fog/aws/requests/dns/list_hosted_zones.rb

@@ -23,7 +23,7 @@ module Fog
         #     * 'Marker'<~String> -
         #     * 'MaxItems'<~Integer> -
         #     * 'IsTruncated'<~String> -
-        #     * 'NextMarket'<~String>
+        #     * 'NextMarker'<~String>
         #   * status<~Integer> - 200 when successful
         def list_hosted_zones(options = {})
           parameters = {}

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

@@ -0,0 +1,36 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+        require 'fog/aws/parsers/iam/basic'
+        # Add or update the account password policy
+        #
+        # ==== Parameters
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #
+        # ==== See Also
+        # http://docs.aws.amazon.com/IAM/latest/APIReference/API_UpdateAccountPasswordPolicy.html
+        #
+        def delete_account_password_policy
+          request({
+            'Action'          => 'DeleteAccountPasswordPolicy',
+            :parser           => Fog::Parsers::AWS::IAM::Basic.new
+          })
+        end
+      end
+
+      class Mock
+        def delete_account_password_policy
+          Excon::Response.new.tap do |response|
+            response.body = { 'RequestId' => Fog::AWS::Mock.request_id }
+            response.status = 200
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,36 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+        require 'fog/aws/parsers/iam/basic'
+        # Add or update the account password policy
+        #
+        # ==== Parameters
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #
+        # ==== See Also
+        # http://docs.aws.amazon.com/IAM/latest/APIReference/API_UpdateAccountPasswordPolicy.html
+        #
+        def get_account_password_policy()
+          request({
+            'Action'          => 'DeleteAccountPasswordPolicy',
+            :parser           => Fog::Parsers::AWS::IAM::Basic.new
+          })
+        end
+      end
+
+      class Mock
+        def get_account_password_policy()
+          Excon::Response.new.tap do |response|
+            response.body = { 'RequestId' => Fog::AWS::Mock.request_id }
+            response.status = 200
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,56 @@
+module Fog
+  module AWS
+    class IAM
+      class Real
+        require 'fog/aws/parsers/iam/basic'
+        # Add or update the account password policy
+        #
+        # ==== Parameters
+        #   *  MinimumPasswordLength<~integer> Minimum length to require for IAM user passwords.
+        #   *  MaxPasswordAge<~integer> The number of days that an IAM user password is valid.
+        #   *  PasswordReusePrevention<~integer> Specifies the number of previous passwords that IAM users are prevented from reusing.        
+        #   *  RequireSymbols<~boolean> Specifies whether to require symbols for IAM user passwords.
+        #   *  RequireNumbers<~boolean> Specifies whether to require numbers for IAM user passwords.
+        #   *  RequireUppercaseCharacters<~boolean> Specifies whether to require uppercase characters for IAM user passwords.
+        #   *  RequireLowercaseCharacters<~boolean> Specifies whether to require lowercase characters for IAM user passwords.
+        #   *  AllowUsersToChangePassword<~boolean> Specifies whether IAM users are allowed to change their own password.
+        #   *  HardExpiry<~boolean> Specifies whether IAM users are prevented from setting a new password after their password has expired.
+        #   *  ExpirePasswords<~boolean> Specifies whether IAM users are required to change their password after a specified number of days.
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #     * 'RequestId'<~String> - Id of the request
+        #
+        # ==== See Also
+        # http://docs.aws.amazon.com/IAM/latest/APIReference/API_UpdateAccountPasswordPolicy.html
+        #
+        def update_account_password_policy(minimum_password_length, max_password_age, password_reuse_prevention,require_symbols,require_numbers,require_uppercase_characters, require_lowercase_characters,allow_users_to_change_password, hard_expiry, expire_passwords)
+          request({
+            'Action'                      => 'UpdateAccountPasswordPolicy',
+            'MinimumPasswordLength'       => minimum_password_length,
+            'MaxPasswordAge'              => max_password_age,
+            'PasswordReusePrevention'     => password_reuse_prevention,
+            'RequireSymbols'              => require_symbols,
+            'RequireNumbers'              => require_numbers,
+            'RequireUppercaseCharacters'  => require_uppercase_characters,
+            'RequireLowercaseCharacters'  => require_lowercase_characters,
+            'AllowUsersToChangePassword'  => allow_users_to_change_password,
+            'HardExpiry'                  => hard_expiry,
+            'ExpirePasswords'             => expire_passwords,
+            :parser                       => Fog::Parsers::AWS::IAM::Basic.new
+          })
+        end
+      end
+
+      class Mock
+        def update_account_password_policy(minimum_password_length, max_password_age, password_reuse_prevention,require_symbols,require_numbers,require_uppercase_characters, require_lowercase_characters,allow_users_to_change_password, hard_expiry, expire_passwords)
+          Excon::Response.new.tap do |response|
+            response.body = { 'RequestId' => Fog::AWS::Mock.request_id }
+            response.status = 200
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Fog
+  module Storage
+    class AWS
+      class Real
+        # Get headers for an S3 bucket, used to verify if it exists and if you have permission to access it
+        #
+        # @param bucket_name [String] Name of bucket to read from
+        #
+        # @return [Excon::Response] 200 response implies it exists, 404 does not exist, 403 no permissions
+        #   * body [String] Empty
+        #   * headers [Hash]:
+        #     * Content-Type [String] - MIME type of object
+        #
+        # @see http://docs.aws.amazon.com/AmazonS3/latest/API/RESTBucketHEAD.html
+        #
+        def head_bucket(bucket_name)
+          unless bucket_name
+            raise ArgumentError.new('bucket_name is required')
+          end
+          request({
+            :expects    => 200,
+            :bucket_name => bucket_name,
+            :idempotent => true,
+            :method     => 'HEAD',
+          })
+        end
+      end
+
+      class Mock # :nodoc:all
+        def head_bucket(bucket_name)
+          response = get_bucket(bucket_name)
+          response.body = nil
+          response
+        end
+      end
+    end
+  end
+end