From 98a72c018b5b08c2bd6592f2644c17507c0af973 Mon Sep 17 00:00:00 2001 From: gregburek Date: Wed, 4 Sep 2013 18:04:39 -0700 Subject: [PATCH 1/3] Strip new lines from PackedPolicySize response from GetFederationToken --- lib/fog/aws/parsers/sts/get_session_token.rb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/fog/aws/parsers/sts/get_session_token.rb b/lib/fog/aws/parsers/sts/get_session_token.rb index 33a145503..9eed371e1 100644 --- a/lib/fog/aws/parsers/sts/get_session_token.rb +++ b/lib/fog/aws/parsers/sts/get_session_token.rb @@ -14,10 +14,8 @@ module Fog case name when 'SessionToken', 'SecretAccessKey', 'Expiration', 'AccessKeyId' @response[name] = @value.strip - when 'Arn', 'FederatedUserId' + when 'Arn', 'FederatedUserId', 'PackedPolicySize' @response[name] = @value.strip - when 'PackedPolicySize' - @response[name] = @value when 'RequestId' @response[name] = @value end From b6f5165a5bce6d4463b8565302ea92360ef78135 Mon Sep 17 00:00:00 2001 From: gregburek Date: Wed, 4 Sep 2013 18:05:39 -0700 Subject: [PATCH 2/3] Add minimal documentation in GetFederationToken request --- .../aws/requests/sts/get_federation_token.rb | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/fog/aws/requests/sts/get_federation_token.rb b/lib/fog/aws/requests/sts/get_federation_token.rb index a161630f6..05d1a6748 100644 --- a/lib/fog/aws/requests/sts/get_federation_token.rb +++ b/lib/fog/aws/requests/sts/get_federation_token.rb @@ -5,6 +5,31 @@ module Fog require 'fog/aws/parsers/sts/get_session_token' + # Get federation token + # + # ==== Parameters + # * name<~String>: The name of the federated user. + # Minimum length of 2. Maximum length of 32. + # * policy<~String>: Optional policy that specifies the permissions + # that are granted to the federated user + # Minimum length of 1. Maximum length of 2048. + # * duration<~Integer>: Optional duration, in seconds, that the session + # should last. + # ==== Returns + # * response<~Excon::Response>: + # * body<~Hash>: + # * 'SessionToken'<~String> - + # * 'SecretAccessKey'<~String> - + # * 'Expiration'<~String> - + # * 'AccessKeyId'<~String> - + # * 'Arn'<~String> - + # * 'FederatedUserId'<~String> - + # * 'PackedPolicySize'<~String> - + # * 'RequestId'<~String> - Id of the request + # + # ==== See Also + # http://docs.aws.amazon.com/STS/latest/APIReference/API_GetFederationToken.html + def get_federation_token(name, policy, duration=43200) request({ 'Action' => 'GetFederationToken', From 05dcff185f67efa73fb86a35e89ea7b5a8a60f76 Mon Sep 17 00:00:00 2001 From: gregburek Date: Wed, 4 Sep 2013 18:05:54 -0700 Subject: [PATCH 3/3] Add mocks for GetFederationToken and enable use --- .../aws/requests/sts/get_federation_token.rb | 17 +++++++++++++++++ .../requests/sts/get_federation_token_tests.rb | 1 - 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/fog/aws/requests/sts/get_federation_token.rb b/lib/fog/aws/requests/sts/get_federation_token.rb index 05d1a6748..2a8ce0e3f 100644 --- a/lib/fog/aws/requests/sts/get_federation_token.rb +++ b/lib/fog/aws/requests/sts/get_federation_token.rb @@ -41,6 +41,23 @@ module Fog }) end end + class Mock + def get_federation_token(name, policy, duration=43200) + Excon::Response.new.tap do |response| + response.status = 200 + response.body = { + 'SessionToken' => Fog::Mock.random_base64(580), + 'SecretAccessKey' => Fog::Mock.random_base64(40), + 'Expiration' => (DateTime.now + duration).strftime('%FT%TZ'), + 'AccessKeyId' => Fog::AWS::Mock.key_id(20), + 'Arn' => "arn:aws:sts::#{Fog::AWS::Mock.owner_id}:federated-user/#{name}", + 'FederatedUserId' => "#{Fog::AWS::Mock.owner_id}:#{name}", + 'PackedPolicySize' => Fog::Mock.random_numbers(2), + 'RequestId' => Fog::AWS::Mock.request_id + } + end + end + end end end end diff --git a/tests/aws/requests/sts/get_federation_token_tests.rb b/tests/aws/requests/sts/get_federation_token_tests.rb index 758f2ab9e..469569aa3 100644 --- a/tests/aws/requests/sts/get_federation_token_tests.rb +++ b/tests/aws/requests/sts/get_federation_token_tests.rb @@ -14,7 +14,6 @@ Shindo.tests('AWS::STS | session tokens', ['aws']) do } tests("#get_federation_token('test@fog.io', #{@policy.inspect})").formats(@federation_format) do - pending if Fog.mocking? Fog::AWS[:sts].get_federation_token("test@fog.io", @policy).body end