aws-sdk-core 2.7.11 → 2.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ff1a53dfe920acfd2e2793475c6830c2668a8c
-  data.tar.gz: b35f84a9076e22a30fb237cc61bbf5e155ac6acf
+  metadata.gz: 49fd678d04874002883367eef281b0a51ab8733c
+  data.tar.gz: 632c85e825d4bae5b595584116b35cb7306181c2
 SHA512:
-  metadata.gz: a126a087e6c7f537b41ca7c425bf3ad0a35122a832606e8b0d7cae4a86b7a0b333160068664f11d2e9f1224b918fd2766a87a9ca8a5c79e15593a1ae28d00ed2
-  data.tar.gz: bc2a0fe009755ef519716d01ff77b34adba5bda37fcfa3c11165f14e2465c29fcd33c022ba8e9427b1ff14c89a63b0e3a61d03f3bf3ba72143ca0638e3448071
+  metadata.gz: 451971284067ed6fed856141f710c98c54ff6f3abe9ec760ca7dd6f78c0d0550d79e4e57f29e2f7a46e57691ef419534f328af7a0f59b857947b447156232c52
+  data.tar.gz: 3744041eefa7ef6fe9a403c868add5e3c19735ff3ef1cefa509af8c0b5d09ac6d189abf09fb5140a14faefd7536da6f3cabd72df58440f30de49b654fb612008

data/apis/ec2/2016-11-15/api-2.json

@@ -2802,6 +2802,13 @@
         "modifying"
       ]
     },
+    "BillingProductList":{
+      "type":"list",
+      "member":{
+        "shape":"String",
+        "locationName":"item"
+      }
+    },
     "Blob":{"type":"blob"},
     "BlobAttributeValue":{
       "type":"structure",
@@ -11385,6 +11392,10 @@
           "shape":"String",
           "locationName":"ramdiskId"
         },
+        "BillingProducts":{
+          "shape":"BillingProductList",
+          "locationName":"BillingProduct"
+        },
         "RootDeviceName":{
           "shape":"String",
           "locationName":"rootDeviceName"

data/lib/aws-sdk-core/client_stubs.rb

@@ -50,8 +50,18 @@ module Aws
     #       buckets: [{ name: 'my-bucket' }]
     #     })
     #
-    #     client.list_buckets.buckets.map(&:name) #=> ['my-bucket']
-    #     #=> ['aws-sdk']
+    #     client.list_buckets.buckets.map(&:name)
+    #     #=> ['my-bucket']
+    #
+    # With a Resource class {#stub_responses} on the corresponding client:
+    #
+    #     s3 = Aws::S3::Resource.new(stub_responses: true)
+    #     s3.client.stub_responses(:list_buckets, {
+    #       buckets: [{ name: 'my-bucket' }]
+    #     })
+    #
+    #     s3.buckets.map(&:name)
+    #     #=> ['my-bucket']
     #
     # Lastly, default stubs can be configured via `Aws.config`:
     #
@@ -64,6 +74,9 @@ module Aws
     #     Aws::S3::Client.new.list_buckets.buckets.map(&:name)
     #     #=> ['my-bucket']
     #
+    #     Aws::S3::Resource.new.buckets.map(&:name)
+    #     #=> ['my-bucket']
+    #
     # ## Stubbing Errors
     #
     # When stubbing is enabled, the SDK will default to generate

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

@@ -9,7 +9,9 @@ Aws.add_service(:CloudFront, {
 module Aws
   module CloudFront
 
+    autoload :Signer, 'aws-sdk-core/cloudfront/signer.rb'
     autoload :UrlSigner, 'aws-sdk-core/cloudfront/url_signer.rb'
+    autoload :CookieSigner, 'aws-sdk-core/cloudfront/cookie_signer.rb'
 
   end
 end

data/lib/aws-sdk-core/cloudfront/cookie_signer.rb

@@ -0,0 +1,44 @@
+require 'base64'
+require 'uri'
+require 'time'
+require 'json'
+require 'openssl'
+
+module Aws
+  module CloudFront
+
+    # Allows you to create signed cookie for Amazon CloudFront resources
+    #
+    #     signer = Aws::CloudFront::CookieSigner.new(
+    #       key_pair_id: "cf-keypair-id",
+    #       private_key_path: "./cf_private_key.pem"
+    #     )
+    #     cookies = signer.signed_cookie(url,
+    #       policy: policy.to_json
+    #     )
+    #
+    class CookieSigner
+      include Signer
+
+      # create a signed Amazon CloudFront URL
+      # @param [String] url
+      # @option params [Time, DateTime, Date, String, Integer<timestamp>] :expires
+      # @option params [String<JSON>] :policy
+      def signed_cookie(url, params = {})
+        scheme, uri = scheme_and_uri(url)
+        signed_content = signature(
+          resource: resource(scheme, uri),
+          expires: time(params[:expires]),
+          policy: params[:policy]
+        )
+
+        cookie_parameters = {}
+        signed_content.each { |k, v|
+          cookie_parameters["CloudFront-#{k}"] = v.to_s.gsub("\n", '')
+        }
+        cookie_parameters
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,141 @@
+require 'base64'
+require 'uri'
+require 'time'
+require 'json'
+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)
+        @private_key = private_key(options)
+      end
+
+      private
+
+      def scheme_and_uri(url)
+        url_sections = url.split('://')
+        if url_sections.length < 2
+          raise ArgumentError, "Invaild URL:#{url}"
+        end
+        scheme = url_sections[0].gsub('*', '')
+        uri = "#{scheme}://#{url_sections[1]}"
+        [scheme, uri]
+      end
+
+      def time(expires)
+        case expires
+        when Time then expires.to_i
+        when DateTime, Date then expires.to_time.to_i
+        when String then Time.parse(expires).to_i
+        when Integer, NIL then expires
+        else
+          msg = "expected a time value for :expires, got `#{expires.class}'"
+          raise ArgumentError, msg
+        end
+      end
+
+      # create a relative signed URL for RTMP distribution
+      def rtmp_url(uri)
+        result = uri.path.gsub(' ', '/')
+        result[0] = ''
+        if uri.query
+          "#{result}?#{uri.query}"
+        else
+          result
+        end
+      end
+
+      # prepare resource for signing
+      def resource(scheme, url)
+        case scheme
+        when 'http', 'http*', 'https' then url
+        when 'rtmp'
+          url_info = URI.parse(url)
+          path = url_info.path
+          path[0] = ''
+          resource_content = "#{File.dirname(path)}/#{File.basename(path)}".gsub(' ', '/')
+          if url_info.query
+            "#{resource_content}?#{uri.query}"
+          else
+            resource_content
+          end
+        else
+          msg = "Invaild URI scheme:#{scheme}.Scheme must be one of: http, https or rtmp."
+          raise ArgumentError, msg
+        end
+      end
+
+      # create signed values that used to construct signed URLs or Set-Cookie parameters
+      # @option param [String] :resource
+      # @option param [Integer<timestamp>] :expires
+      # @option param [String<JSON>] :policy
+      def signature(params = {})
+        signature_content = {}
+        if params[:policy]
+          policy = params[:policy].gsub('/\s/s', '')
+          signature_content['Policy'] = encode(policy)
+        elsif params[:resource] && params[:expires]
+          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."
+          raise ArgumentError, msg
+        end
+
+        signature_content['Signature'] = encode(sign_policy(policy))
+        signature_content['Key-Pair-Id'] = @key_pair_id
+        signature_content
+      end
+
+      # create the signature string with policy signed
+      def sign_policy(policy)
+        key = OpenSSL::PKey::RSA.new(@private_key)
+        key.sign(OpenSSL::Digest::SHA1.new, policy)
+      end
+
+      # create canned policy that used for signing
+      def canned_policy(resource, expires)
+        json_hash = {
+          'Statement' => [
+            'Resource' => resource,
+              'Condition' => {
+                'DateLessThan' => {'AWS:EpochTime' => expires}
+              }
+          ]
+        }
+        JSON.dump(json_hash)
+      end
+
+      def encode(policy)
+        Base64.encode64(policy).gsub(/[+=\/]/, '+' => '-', '=' => '_', '/' => '~')
+      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]
+        end
+      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 }
+        else
+          msg = ":private_key or :private_key_path should be provided"
+          raise ArgumentError, msg
+        end
+      end
+
+    end
+  end
+end

data/lib/aws-sdk-core/cloudfront/url_signer.rb

@@ -18,35 +18,23 @@ module Aws
     #     )
     #
     class UrlSigner
-
-      # @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)
-        @private_key = private_key(options)
-      end
+      include Signer
 
       # create a signed Amazon CloudFront URL
       # @param [String] url
       # @option params [Time, DateTime, Date, String, Integer<timestamp>] :expires
       # @option params [String<JSON>] :policy
       def signed_url(url, params = {})
-        url_sections = url.split('://')
-        if url_sections.length < 2
-          raise ArgumentError, "Invaild URL:#{url}"
-        end
-        # removing wildcard character to get real scheme
-        scheme = url_sections[0].gsub('*', '')
-        uri = "#{scheme}://#{url_sections[1]}"
+        scheme, uri = scheme_and_uri(url)
         signed_content = signature(
-          :resource => resource(scheme, uri),
-          :expires => time(params[:expires]),
-          :policy => params[:policy]
+          resource: resource(scheme, uri),
+          expires: time(params[:expires]),
+          policy: params[:policy]
         )
 
         start_flag = URI.parse(uri).query ? '&' : '?'
-        uri = "#{uri}#{start_flag}#{signed_content}"
+        signature = signed_content.map{ |k, v| "#{k}=#{v}" }.join('&').gsub("\n", '')
+        uri = "#{uri}#{start_flag}#{signature}"
 
         if scheme == 'rtmp'
           rtmp_url(URI(uri))
@@ -55,115 +43,6 @@ module Aws
         end
       end
 
-      private
-
-      def time(expires)
-        case expires
-        when Time then expires.to_i
-        when DateTime, Date then expires.to_time.to_i
-        when String then Time.parse(expires).to_i
-        when Integer, NIL then expires
-        else
-          msg = "expected a time value for :expires, got `#{expires.class}'"
-          raise ArgumentError, msg
-        end
-      end
-
-      # create a relative signed URL for RTMP distribution
-      def rtmp_url(uri)
-        result = uri.path.gsub(' ', '/')
-        result[0] = ''
-        if uri.query
-          "#{result}?#{uri.query}"
-        else
-          result
-        end
-      end
-
-      # prepare resource for signing
-      def resource(scheme, url)
-        case scheme
-        when 'http', 'http*', 'https' then url
-        when 'rtmp'
-          url_info = URI.parse(url)
-          path = url_info.path
-          path[0] = ''
-          resource_content = "#{File.dirname(path)}/#{File.basename(path)}".gsub(' ', '/')
-          if url_info.query
-            "#{resource_content}?#{uri.query}"
-          else
-            resource_content
-          end
-        else
-          msg = "Invaild URI scheme:#{scheme}.Scheme must be one of: http, https or rtmp."
-          raise ArgumentError, msg
-        end
-      end
-
-      # create signed values that used to construct signed URLs
-      # @option param [String] :resource
-      # @option param [Integer<timestamp>] :expires
-      # @option param [String<JSON>] :policy
-      def signature(params = {})
-        signature_content = []
-        if params[:policy]
-          policy = params[:policy].gsub('/\s/s', '')
-          signature_content << "Policy=#{encode(policy)}"
-        elsif params[:resource] && params[:expires]
-          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."
-          raise ArgumentError, msg
-        end
-
-        signature_content << "Signature=#{encode(sign_policy(policy))}"
-        signature_content << "Key-Pair-Id=#{@key_pair_id}"
-        signature_content.join('&').gsub("\n", '')
-      end
-
-      # create the signature string with policy signed
-      def sign_policy(policy)
-        key = OpenSSL::PKey::RSA.new(@private_key)
-        key.sign(OpenSSL::Digest::SHA1.new, policy)
-      end
-
-      # create canned policy that used for signing
-      def canned_policy(resource, expires)
-        json_hash = {
-          'Statement' => [
-            'Resource' => resource,
-              'Condition' => {
-                'DateLessThan' => {'AWS:EpochTime' => expires}
-              }
-          ]
-        }
-        JSON.dump(json_hash)
-      end
-
-      def encode(policy)
-        Base64.encode64(policy).gsub(/[+=\/]/, '+' => '-', '=' => '_', '/' => '~')
-      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]
-        end
-      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 }
-        else
-          msg = ":private_key or :private_key_path should be provided"
-          raise ArgumentError, msg
-        end
-      end
-
     end
   end
 end

data/lib/aws-sdk-core/stubbing/protocols/rest.rb

@@ -40,7 +40,9 @@ module Aws
 
         def build_body(api, operation, data)
           rules = operation.output
-          if streaming?(rules)
+          if head_operation(operation)
+            ""
+          elsif streaming?(rules)
             data[rules[:payload]]
           elsif rules[:payload]
             body_for(api, operation, rules[:payload_member], data[rules[:payload]])
@@ -68,6 +70,10 @@ module Aws
           end
         end
 
+        def head_operation(operation)
+          operation.http_method == "HEAD"
+        end
+
       end
     end
   end

data/lib/aws-sdk-core/version.rb

@@ -1,3 +1,3 @@
 module Aws
-  VERSION = '2.7.11'
+  VERSION = '2.7.12'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-sdk-core
 version: !ruby/object:Gem::Version
-  version: 2.7.11
+  version: 2.7.12
 platform: ruby
 authors:
 - Amazon Web Services
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-17 00:00:00.000000000 Z
+date: 2017-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jmespath
@@ -399,6 +399,8 @@ files:
 - lib/aws-sdk-core/clouddirectory.rb
 - lib/aws-sdk-core/cloudformation.rb
 - lib/aws-sdk-core/cloudfront.rb
+- lib/aws-sdk-core/cloudfront/cookie_signer.rb
+- lib/aws-sdk-core/cloudfront/signer.rb
 - lib/aws-sdk-core/cloudfront/url_signer.rb
 - lib/aws-sdk-core/cloudhsm.rb
 - lib/aws-sdk-core/cloudsearch.rb