aws-sdk-cloudfront 1.128.0 → 1.140.0

data/lib/aws-sdk-cloudfront/customizations.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# utility classes
 module Aws
   module CloudFront
     autoload :Signer, 'aws-sdk-cloudfront/signer'

data/lib/aws-sdk-cloudfront/endpoint_parameters.rb

@@ -13,22 +13,22 @@ module Aws::CloudFront
   # @!attribute use_dual_stack
   #   When true, use the dual-stack endpoint. If the configured endpoint does not support dual-stack, dispatching the request MAY return an error.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute use_fips
   #   When true, send this request to the FIPS-compliant regional endpoint. If the configured endpoint does not have a FIPS compliant endpoint, dispatching the request will return an error.
   #
-  #   @return [Boolean]
+  #   @return [boolean]
   #
   # @!attribute endpoint
   #   Override the endpoint used to send this request
   #
-  #   @return [String]
+  #   @return [string]
   #
   # @!attribute region
   #   The AWS region used to dispatch the request.
   #
-  #   @return [String]
+  #   @return [string]
   #
   EndpointParameters = Struct.new(
     :use_dual_stack,

data/lib/aws-sdk-cloudfront/signer.rb

@@ -7,25 +7,22 @@ require 'openssl'
 
 module Aws
   module CloudFront
-
     module Signer
-
       # @option options [String] :key_pair_id
       # @option options [String] :private_key
       # @option options [String] :private_key_path
       def initialize(options = {})
         @key_pair_id = key_pair_id(options)
-        @cipher = OpenSSL::Digest::SHA1.new
-        @private_key = OpenSSL::PKey::RSA.new(private_key(options))
+        @cipher = OpenSSL::Digest.new('SHA1')
+        @private_key = OpenSSL::PKey.read(private_key(options))
       end
 
       private
 
       def scheme_and_uri(url)
         url_sections = url.split('://', 2)
-        if url_sections.length < 2
-          raise ArgumentError, "Invalid URL:#{url}"
-        end
+        raise ArgumentError, "Invalid URL:#{url}" if url_sections.length < 2
+
         scheme = url_sections[0].delete('*')
         uri = "#{scheme}://#{url_sections[1]}"
         [scheme, uri]
@@ -69,7 +66,7 @@ module Aws
             resource_content
           end
         else
-          msg = "Invalid URI scheme:#{scheme}.Scheme must be one of: http, https or rtmp."
+          msg = "Invalid URI scheme:#{scheme}. Scheme must be one of: http, https or rtmp."
           raise ArgumentError, msg
         end
       end
@@ -87,7 +84,7 @@ module Aws
           policy = canned_policy(params[:resource], params[:expires])
           signature_content['Expires'] = params[:expires]
         else
-          msg = "Either a policy or a resource with an expiration time must be provided."
+          msg = 'Either a policy or a resource with an expiration time must be provided.'
           raise ArgumentError, msg
         end
 
@@ -106,37 +103,34 @@ module Aws
         json_hash = {
           'Statement' => [
             'Resource' => resource,
-              'Condition' => {
-                'DateLessThan' => {'AWS:EpochTime' => expires}
-              }
+            'Condition' => { 'DateLessThan' => { 'AWS:EpochTime' => expires } }
           ]
         }
         Aws::Json.dump(json_hash)
       end
 
       def encode(policy)
-        Base64.encode64(policy).gsub(/[+=\/]/, '+' => '-', '=' => '_', '/' => '~')
+        Base64.encode64(policy).gsub(%r{[+=/]}, '+' => '-', '=' => '_', '/' => '~')
       end
 
       def key_pair_id(options)
-        if options[:key_pair_id].nil? or options[:key_pair_id] == ''
-          raise ArgumentError, ":key_pair_id must not be blank"
-        else
-          options[:key_pair_id]
+        if options[:key_pair_id].nil? || (options[:key_pair_id] == '')
+          raise ArgumentError, ':key_pair_id must not be blank'
         end
+
+        options[:key_pair_id]
       end
 
       def private_key(options)
         if options[:private_key]
           options[:private_key]
         elsif options[:private_key_path]
-          File.open(options[:private_key_path], 'rb') { |f| f.read }
+          File.open(options[:private_key_path], 'rb', &:read)
         else
-          msg = ":private_key or :private_key_path should be provided"
+          msg = ':private_key or :private_key_path should be provided'
           raise ArgumentError, msg
         end
       end
-
     end
   end
 end