From 398aa7b10829011ea23986d439a7f77aef31d552 Mon Sep 17 00:00:00 2001 From: Michael Hale Date: Wed, 24 Jun 2015 16:41:21 -0400 Subject: [PATCH] Extract version --- lib/fog/aws/kinesis.rb | 1 + lib/fog/aws/requests/kinesis/create_stream.rb | 2 +- lib/fog/aws/requests/kinesis/delete_stream.rb | 2 +- lib/fog/aws/requests/kinesis/describe_stream.rb | 3 ++- lib/fog/aws/requests/kinesis/get_records.rb | 3 ++- lib/fog/aws/requests/kinesis/get_shard_iterator.rb | 3 ++- lib/fog/aws/requests/kinesis/list_streams.rb | 3 ++- lib/fog/aws/requests/kinesis/put_records.rb | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/lib/fog/aws/kinesis.rb b/lib/fog/aws/kinesis.rb index b7651bd24..06710ce8e 100644 --- a/lib/fog/aws/kinesis.rb +++ b/lib/fog/aws/kinesis.rb @@ -41,6 +41,7 @@ module Fog @port = options[:port] || 443 @scheme = options[:scheme] || 'https' @connection = Fog::XML::Connection.new("#{@scheme}://#{@host}:#{@port}#{@path}", @persistent, @connection_options) + @version = "20131202" setup_credentials(options) end diff --git a/lib/fog/aws/requests/kinesis/create_stream.rb b/lib/fog/aws/requests/kinesis/create_stream.rb index d7eaf9220..bfb83c83b 100644 --- a/lib/fog/aws/requests/kinesis/create_stream.rb +++ b/lib/fog/aws/requests/kinesis/create_stream.rb @@ -20,7 +20,7 @@ module Fog }.reject{ |_,v| v.nil? } response = request({ - 'X-Amz-Target' => 'Kinesis_20131202.CreateStream', + 'X-Amz-Target' => 'Kinesis_#{@version}.CreateStream', :body => body, }.merge(options)) # response.body = Fog::JSON.decode(response.body) unless response.body.nil? diff --git a/lib/fog/aws/requests/kinesis/delete_stream.rb b/lib/fog/aws/requests/kinesis/delete_stream.rb index 66977b74e..5f6850eb1 100644 --- a/lib/fog/aws/requests/kinesis/delete_stream.rb +++ b/lib/fog/aws/requests/kinesis/delete_stream.rb @@ -18,7 +18,7 @@ module Fog }.reject{ |_,v| v.nil? } response = request({ - 'X-Amz-Target' => 'Kinesis_20131202.DeleteStream', + 'X-Amz-Target' => 'Kinesis_#{@version}.DeleteStream', :body => body, }.merge(options)) # response.body = Fog::JSON.decode(response.body) unless response.body.nil? diff --git a/lib/fog/aws/requests/kinesis/describe_stream.rb b/lib/fog/aws/requests/kinesis/describe_stream.rb index 26fd17a81..34312fc04 100644 --- a/lib/fog/aws/requests/kinesis/describe_stream.rb +++ b/lib/fog/aws/requests/kinesis/describe_stream.rb @@ -22,7 +22,8 @@ module Fog }.reject{ |_,v| v.nil? } response = request({ - 'X-Amz-Target' => 'Kinesis_20131202.DescribeStream', + :idempotent => true, + 'X-Amz-Target' => 'Kinesis_#{@version}.DescribeStream', :body => body, }.merge(options)) response.body = Fog::JSON.decode(response.body) unless response.body.nil? diff --git a/lib/fog/aws/requests/kinesis/get_records.rb b/lib/fog/aws/requests/kinesis/get_records.rb index 5aef6bbc4..623dbad30 100644 --- a/lib/fog/aws/requests/kinesis/get_records.rb +++ b/lib/fog/aws/requests/kinesis/get_records.rb @@ -20,7 +20,8 @@ module Fog }.reject{ |_,v| v.nil? } response = request({ - 'X-Amz-Target' => 'Kinesis_20131202.GetRecords', + :idempotent => true, + 'X-Amz-Target' => 'Kinesis_#{@version}.GetRecords', :body => body, }.merge(options)) response.body = Fog::JSON.decode(response.body) unless response.body.nil? diff --git a/lib/fog/aws/requests/kinesis/get_shard_iterator.rb b/lib/fog/aws/requests/kinesis/get_shard_iterator.rb index 9bf7a332d..9659215ba 100644 --- a/lib/fog/aws/requests/kinesis/get_shard_iterator.rb +++ b/lib/fog/aws/requests/kinesis/get_shard_iterator.rb @@ -24,7 +24,8 @@ module Fog }.reject{ |_,v| v.nil? } response = request({ - 'X-Amz-Target' => 'Kinesis_20131202.GetShardIterator', + :idempotent => true, + 'X-Amz-Target' => 'Kinesis_#{@version}.GetShardIterator', :body => body, }.merge(options)) response.body = Fog::JSON.decode(response.body) unless response.body.nil? diff --git a/lib/fog/aws/requests/kinesis/list_streams.rb b/lib/fog/aws/requests/kinesis/list_streams.rb index a837284f0..66086a420 100644 --- a/lib/fog/aws/requests/kinesis/list_streams.rb +++ b/lib/fog/aws/requests/kinesis/list_streams.rb @@ -15,7 +15,8 @@ module Fog # def list_streams(options={}) response = request({ - 'X-Amz-Target' => 'Kinesis_20131202.ListStreams', + :idempotent => true, + 'X-Amz-Target' => 'Kinesis_#{@version}.ListStreams', :body => {}, }.merge(options)) response.body = Fog::JSON.decode(response.body) unless response.body.nil? diff --git a/lib/fog/aws/requests/kinesis/put_records.rb b/lib/fog/aws/requests/kinesis/put_records.rb index 206ecbd1a..2a605a4dc 100644 --- a/lib/fog/aws/requests/kinesis/put_records.rb +++ b/lib/fog/aws/requests/kinesis/put_records.rb @@ -24,7 +24,7 @@ module Fog }.reject{ |_,v| v.nil? } response = request({ - 'X-Amz-Target' => 'Kinesis_20131202.PutRecords', + 'X-Amz-Target' => 'Kinesis_#{@version}.PutRecords', :body => body, }.merge(options)) response.body = Fog::JSON.decode(response.body) unless response.body.nil?