fog 0.9.0 → 0.10.0

data/tests/aws/requests/elb/policy_tests.rb

@@ -0,0 +1,41 @@
+Shindo.tests('AWS::ELB | policy_tests', ['aws', 'elb']) do
+  @load_balancer_id = 'fog-test-policies'
+
+  tests('success') do
+    listeners = [{'LoadBalancerPort' => 80, 'InstancePort' => 80, 'Protocol' => 'HTTP'}]
+    AWS[:elb].create_load_balancer(['us-east-1a'], @load_balancer_id, listeners)
+
+    tests("#create_app_cookie_stickiness_policy").formats(AWS::ELB::Formats::BASIC) do
+      cookie, policy = 'fog-app-cookie', 'fog-app-policy'
+      AWS[:elb].create_app_cookie_stickiness_policy(@load_balancer_id, policy, cookie).body
+    end
+
+    tests("#create_lb_cookie_stickiness_policy with expiry").formats(AWS::ELB::Formats::BASIC) do
+      policy = 'fog-lb-expiry'
+      expiry = 300
+      AWS[:elb].create_lb_cookie_stickiness_policy(@load_balancer_id, policy, expiry).body
+    end
+
+    tests("#create_lb_cookie_stickiness_policy without expiry").formats(AWS::ELB::Formats::BASIC) do
+      policy = 'fog-lb-no-expiry'
+      AWS[:elb].create_lb_cookie_stickiness_policy(@load_balancer_id, policy).body
+    end
+
+    tests("#delete_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do
+      policy = 'fog-lb-no-expiry'
+      AWS[:elb].delete_load_balancer_policy(@load_balancer_id, policy).body
+    end
+
+    tests("#set_load_balancer_policies_of_listener adds policy").formats(AWS::ELB::Formats::BASIC) do
+      port, policies = 80, ['fog-lb-expiry']
+      AWS[:elb].set_load_balancer_policies_of_listener(@load_balancer_id, port, policies).body
+    end
+
+    tests("#set_load_balancer_policies_of_listener removes policy").formats(AWS::ELB::Formats::BASIC) do
+      port = 80
+      AWS[:elb].set_load_balancer_policies_of_listener(@load_balancer_id, port, []).body
+    end
+
+    AWS[:elb].delete_load_balancer(@load_balancer_id)
+  end
+end

data/tests/aws/requests/iam/helper.rb

@@ -41,6 +41,35 @@ c0AQtoYBTJePxiYyd8i32ypkkK83ar+sFoxKO9jYwD1IkZax2xZ0aoTdMindQPR7
 Yjs+QiLmOHcbPqX+GHcCQERsSn0RjzKmKirDntseMB59BB/cEN32+gMDVsZuCfb+
 fOy2ZavFl13afnhbh2/AjKeDhnb19x/uXjF7JCUtwpA=
 -----END RSA PRIVATE KEY-----
+}
+
+    SERVER_CERT_PRIVATE_KEY_MISMATCHED = %{-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEAyITMqYJMzkPMcaC+x0W2hnZVW99RXzLR8RYyD3xo2AotdJKx
+1DXR4ryegAjsnAhJVwVtxqzPcBMq/XS0hNtWFfKzf+vMZl7uAqotGjURUV8SRQPA
+8tT07MemD929xRSV2vTnVATiPn87vcu5igsZ01+Ewd6rGythmvcZD13vtZ4rx0c8
+kQJV3ok/CkFaIgDR6Or1NZBCtcIVK9nvqAmYMp6S5mWUMIsl/1qYPerpefrSJjlk
+J2+jyLp0LHarbzjkzzAdOkBRX1hPkk6cisBeQIpx35shLzfCe8U25XNqquP+ftcu
+JZ0Wjw+C4pTIzfgdGXmGGtBFY13BwiJvd4/i2wIDAQABAoIBABk8XWWX+IKdFcXX
+LSt3IpmZmvSNDniktLday8IXLjrCTSY2sBq9C0U159zFQsIAaPqCvGYcqZ65StfL
+MEzoLdVlTiHzUy4vFFVRhYue0icjh/EXn9jv5ENIfSXSCmgbRyDfYZ25X5/t817X
+nOo6q21mwBaGJ5KrywTtxEGi2OBKZrIbBrpJLhCXJc5xfuKT6DRa9X/OBSBiGKJP
+V9wHcZJkPG1HnC8izvQ37kNN/NyYE+8AGdYXQVNbTHq/emNLbEbdcR3tpGZamM9Q
+TwG5WsDPAnXnRsEEYvlVTOBI6DqdvkyBxM35iqd5aAc6i/Iu04Unfhhc5pAXmmIB
+a22GHcECgYEA7OheVHDDP8quO2qZjqaTlMbMnXnrFXJ41llFMoivTW9EmlTl9dOC
+fnkHEBcFCTPV0m6S2AQjt9QOgPqCFAq1r3J/xvEGBtl/UKnPRmjqXFgl0ENtGn5t
+w9wj/CsOPD05KkXXtXP+MyLPRD6gAxiQCTnXjvsLuVfP+E9BO2EQXScCgYEA2K2x
+QtcAAalrk3c0KzNVESzyFlf3ddEXThShVblSa7r6Ka9q9sxN/Xe2B+1oemPJm26G
+PfqKgxdKX0R0jl4f5pRBWKoarzWtUge/su8rx/xzbY/1hFKVuimtc6oTeU5xsOTS
+PVuCz4bxDTVhrbmKqbmMgqy17jfPA4BrF1FMRS0CgYBdMA4i4vQ6fIxKfOUIMsfs
+hsJn01RAbHXRwu2wMgnayMDQgEKwjtFO1GaN0rA9bXFXQ/1pET/HiJdn7qIKJihP
+aheO9rHrMdSdsx4AUTaWummtYUhiWobsuwRApeMEmQSKd0yhaI3+KVwkOQoSDbBi
+oKkE6gUzk7IPt4UuSUD5kwKBgQCjo/IGr8dieegz08gDhF4PfalLdJ4ATaxTHMOH
+sVFs6SY7Sy72Ou//qGRCcmsAW9KL35nkvw3S2Ukiz9lTGATxqC/93WIPxvMhy5Zc
+dcLT43XtXdanW5OWqBlGDEFu0O6OERIyoqUVRC1Ss2kUwdbWPbq/id5Qjbd7RoYa
+cxyt9QKBgF4bFLw1Iw2RBngQxIzoDbElEqme20FUyGGzyFQtxVwmwNr4OY5UzJzX
+7G6diyzGrvRX81Yw616ppKJUJVr/zRc13K+eRXXKtNpGkf35B+1NDDjjWZpIHqgx
+Xb9WSr07saxZQbxBPQyTlb0Q9Tu2djAq2/o/nYD1/50/fXUTuWMB
+-----END RSA PRIVATE KEY-----
 }
 
     module Formats

data/tests/aws/requests/iam/login_profile_tests.rb

@@ -52,8 +52,8 @@ Shindo.tests('AWS::IAM | user requests', ['aws']) do
   tests('failure') do
     tests('get login profile for non existing user') do
       pending if Fog.mocking?
-      raises(Excon::Errors::NotFound) { AWS[:iam].get_login_profile('idontexist')}
-      raises(Excon::Errors::NotFound) { AWS[:iam].delete_login_profile('fog_user')}
+      raises(Fog::AWS::IAM::NotFound) { AWS[:iam].get_login_profile('idontexist')}
+      raises(Fog::AWS::IAM::NotFound) { AWS[:iam].delete_login_profile('fog_user')}
     end
   end
 

data/tests/aws/requests/iam/server_certificate_tests.rb

@@ -1,7 +1,4 @@
 Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
-
-  pending if Fog.mocking?
-
   @key_name = 'fog-test'
 
   @certificate_format = {
@@ -10,15 +7,51 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
   'ServerCertificateId' => String,
   'ServerCertificateName' => String,
   'UploadDate' => Time
-}
+  }
   @upload_format = {
     'Certificate' => @certificate_format,
     'RequestId' => String
   }
-  tests('#upload_server_certificate').formats(@upload_format) do
+
+  tests('#upload_server_certificate') do
     public_key  = AWS::IAM::SERVER_CERT_PUBLIC_KEY
     private_key = AWS::IAM::SERVER_CERT_PRIVATE_KEY
-    AWS[:iam].upload_server_certificate(public_key, private_key, @key_name).body
+    private_key_mismatch = AWS::IAM::SERVER_CERT_PRIVATE_KEY_MISMATCHED
+
+    tests('empty public key').raises(Fog::AWS::IAM::ValidationError) do
+      AWS[:iam].upload_server_certificate('', private_key, @key_name)
+    end
+
+    tests('empty private key').raises(Fog::AWS::IAM::ValidationError) do
+      AWS[:iam].upload_server_certificate(public_key, '', @key_name)
+    end
+
+    tests('invalid public key').raises(Fog::AWS::IAM::MalformedCertificate) do
+      AWS[:iam].upload_server_certificate('abcde', private_key, @key_name)
+    end
+
+    tests('invalid private key').raises(Fog::AWS::IAM::MalformedCertificate) do
+      AWS[:iam].upload_server_certificate(public_key, 'abcde', @key_name)
+    end
+
+    tests('mismatched private key').raises(Fog::AWS::IAM::KeyPairMismatch) do
+      AWS[:iam].upload_server_certificate(public_key, private_key_mismatch, @key_name)
+    end
+
+    tests('format').formats(@upload_format) do
+      AWS[:iam].upload_server_certificate(public_key, private_key, @key_name).body
+    end
+
+    tests('duplicate name').raises(Fog::AWS::IAM::EntityAlreadyExists) do
+      AWS[:iam].upload_server_certificate(public_key, private_key, @key_name)
+    end
+  end
+
+  tests('#get_server_certificate').formats(@upload_format) do
+    tests('raises NotFound').raises(Fog::AWS::IAM::NotFound) do
+      AWS[:iam].get_server_certificate("#{@key_name}fake")
+    end
+    AWS[:iam].get_server_certificate(@key_name).body
   end
 
   @list_format = { 'Certificates' => [@certificate_format] }

data/tests/aws/requests/rds/helper.rb

@@ -90,6 +90,7 @@ class AWS
         'EngineVersion' => String,
         'InstanceCreateTime' => Fog::Nullable::Time,
         'LatestRestorableTime' => Fog::Nullable::Time,
+        'LicenseModel' => String,
         'MasterUsername' => String,
         'MultiAZ' => Fog::Boolean,
         'PendingModifiedValues' => {

data/tests/aws/requests/simpledb/attributes_tests.rb

@@ -10,22 +10,17 @@ Shindo.tests('AWS::SimpleDB | attributes requests', ['aws']) do
       AWS[:sdb].batch_put_attributes(@domain_name, { 'a' => { 'b' => 'c', 'd' => 'e' }, 'x' => { 'y' => 'z' } }).body
     end
 
-    tests("#get_attributes('#{@domain_name}', 'a').body['Attributes']").returns({'b' => ['c'], 'd' => ['e']}) do
-      attributes = {}
-      Fog.wait_for {
-        attributes = AWS[:sdb].get_attributes(@domain_name, 'a').body['Attributes']
-        attributes != {}
-      }
-      attributes
+    tests("#get_attributes('#{@domain_name}', 'a', {'ConsistentRead' => true}).body['Attributes']").returns({'b' => ['c'], 'd' => ['e']}) do
+      AWS[:sdb].get_attributes(@domain_name, 'a', {'ConsistentRead' => true}).body['Attributes']
     end
 
-    tests("#get_attributes('#{@domain_name}', 'notanattribute')").succeeds do
-      AWS[:sdb].get_attributes(@domain_name, 'notanattribute')
+    tests("#get_attributes('#{@domain_name}', 'AttributeName' => 'notanattribute')").succeeds do
+      AWS[:sdb].get_attributes(@domain_name, 'AttributeName' => 'notanattribute')
     end
 
-    tests("#select('select * from #{@domain_name}').body['Items']").returns({'a' => { 'b' => ['c'], 'd' => ['e']}, 'x' => { 'y' => ['z'] } }) do
+    tests("#select('select * from #{@domain_name}', {'ConsistentRead' => true}).body['Items']").returns({'a' => { 'b' => ['c'], 'd' => ['e']}, 'x' => { 'y' => ['z'] } }) do
       pending if Fog.mocking?
-      AWS[:sdb].select("select * from #{@domain_name}").body['Items']
+      AWS[:sdb].select("select * from #{@domain_name}", {'ConsistentRead' => true}).body['Items']
     end
 
     tests("#put_attributes('#{@domain_name}', 'conditional', { 'version' => '1' }).body").formats(AWS::SimpleDB::Formats::BASIC) do
@@ -42,8 +37,8 @@ Shindo.tests('AWS::SimpleDB | attributes requests', ['aws']) do
     end
 
     # Verify that individually deleted attributes are actually removed.
-    tests("#get_attributes('#{@domain_name}', 'a', ['d']).body['Attributes']").returns({'d' => nil}) do
-      AWS[:sdb].get_attributes(@domain_name, 'a', ['d']).body['Attributes']
+    tests("#get_attributes('#{@domain_name}', 'a', {'AttributeName' => ['d'], 'ConsistentRead' => true}).body['Attributes']").returns({}) do
+      AWS[:sdb].get_attributes(@domain_name, 'a', {'AttributeName' => ['d'], 'ConsistentRead' => true}).body['Attributes']
     end
 
     tests("#delete_attributes('#{@domain_name}', 'a').body").formats(AWS::SimpleDB::Formats::BASIC) do
@@ -56,8 +51,8 @@ Shindo.tests('AWS::SimpleDB | attributes requests', ['aws']) do
     end
 
     # Verify that deleting a domain, item combination removes all related attributes.
-    tests("#get_attributes('#{@domain_name}', 'a').body['Attributes']").returns({}) do
-      AWS[:sdb].get_attributes(@domain_name, 'a').body['Attributes']
+    tests("#get_attributes('#{@domain_name}', 'a', {'ConsistentRead' => true}).body['Attributes']").returns({}) do
+      AWS[:sdb].get_attributes(@domain_name, 'a', {'ConsistentRead' => true}).body['Attributes']
     end
 
   end

data/tests/aws/requests/sns/helper.rb

@@ -0,0 +1,9 @@
+class AWS
+  module SNS
+    module Formats
+      BASIC = {
+        'RequestId' => String
+      }
+    end
+  end
+end

data/tests/aws/requests/sns/subscription_tests.rb

@@ -0,0 +1,86 @@
+Shindo.tests('AWS::SES | topic lifecycle tests', ['aws', 'sns']) do
+
+  unless Fog.mocking?
+    @topic_arn = AWS[:sns].create_topic('fog_subscription_tests').body['TopicArn']
+    @queue_url = AWS[:sqs].create_queue('fog_subscription_tests').body['QueueUrl']
+    @queue_arn = AWS[:sqs].get_queue_attributes(@queue_url, 'QueueArn').body['Attributes']['QueueArn']
+    AWS[:sqs].set_queue_attributes(
+      @queue_url,
+      'Policy',
+      MultiJson.encode({
+        'Id' => @topic_arn,
+        'Statement' => {
+          'Action'    => 'sqs:SendMessage',
+          'Condition' => {
+            'StringEquals' => { 'aws:SourceArn' => @topic_arn }
+          },
+          'Effect'    => 'Allow',
+          'Principal' => { 'AWS' => '*' },
+          'Resource'  => @queue_arn,
+          'Sid'       => "#{@topic_arn}+sqs:SendMessage"
+        },
+        'Version' => '2008-10-17'
+      })
+    )
+  end
+
+  tests('success') do
+
+    tests("#subscribe('#{@topic_arn}', '#{@queue_arn}', 'sqs')").formats(AWS::SNS::Formats::BASIC.merge('SubscriptionArn' => String)) do
+      pending if Fog.mocking?
+      body = AWS[:sns].subscribe(@topic_arn, @queue_arn, 'sqs').body
+      @subscription_arn = body['SubscriptionArn']
+      body
+    end
+
+    list_subscriptions_format = AWS::SNS::Formats::BASIC.merge({
+      'Subscriptions' => [{
+        'Endpoint'        => String,
+        'Owner'           => String,
+        'Protocol'        => String,
+        'SubscriptionArn' => String,
+        'TopicArn'        => String
+      }]
+    })
+
+    tests("#list_subscriptions").formats(list_subscriptions_format) do
+      pending if Fog.mocking?
+      AWS[:sns].list_subscriptions.body
+    end
+
+    tests("#list_subscriptions_by_topic('#{@topic_arn}')").formats(list_subscriptions_format) do
+      pending if Fog.mocking?
+      body = AWS[:sns].list_subscriptions_by_topic(@topic_arn).body
+    end
+
+    tests("#publish('#{@topic_arn}', 'message')").formats(AWS::SNS::Formats::BASIC.merge('MessageId' => String)) do
+      pending if Fog.mocking?
+      body = AWS[:sns].publish(@topic_arn, 'message').body
+    end
+
+    tests("#receive_message('#{@queue_url}')...").returns('message') do
+      pending if Fog.mocking?
+      message = nil
+      Fog.wait_for do
+        message = AWS[:sqs].receive_message(@queue_url).body['Message'].first
+      end
+      MultiJson.decode(message['Body'])['Message']
+    end
+
+    tests("#unsubscribe('#{@subscription_arn}')").formats(AWS::SNS::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:sns].unsubscribe(@subscription_arn).body
+    end
+
+  end
+
+  tests('failure') do
+
+  end
+
+  unless Fog.mocking?
+    AWS[:sns].delete_topic(@topic_arn)
+    AWS[:sqs].delete_queue(@queue_url)
+  end
+
+end

data/tests/aws/requests/sns/topic_tests.rb

@@ -0,0 +1,50 @@
+Shindo.tests('AWS::SES | topic lifecycle tests', ['aws', 'sns']) do
+
+  tests('success') do
+
+    tests("#create_topic('fog_topic_tests')").formats(AWS::SNS::Formats::BASIC.merge('TopicArn' => String)) do
+      pending if Fog.mocking?
+      body = AWS[:sns].create_topic('fog_topic_tests').body
+      @topic_arn = body["TopicArn"]
+      body
+    end
+
+    tests("#list_topics").formats(AWS::SNS::Formats::BASIC.merge('Topics' => [String])) do
+      pending if Fog.mocking?
+      AWS[:sns].list_topics.body
+    end
+
+    tests("#set_topic_attributes('#{@topic_arn}', 'DisplayName', 'other-fog_topic_tests')").formats(AWS::SNS::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:sns].set_topic_attributes(@topic_arn, 'DisplayName', 'other-fog_topic_tests').body
+    end
+
+    get_topic_attributes_format = AWS::SNS::Formats::BASIC.merge({
+      'Attributes' => {
+        'DisplayName'             => String,
+        'Owner'                   => String,
+        'Policy'                  => String,
+        'SubscriptionsConfirmed'  => Integer,
+        'SubscriptionsDeleted'    => Integer,
+        'SubscriptionsPending'    => Integer,
+        'TopicArn'                => String
+      }
+    })
+
+    tests("#get_topic_attributes('#{@topic_arn})").formats(get_topic_attributes_format) do
+      pending if Fog.mocking?
+      AWS[:sns].get_topic_attributes(@topic_arn).body
+    end
+
+    tests("#delete_topic('#{@topic_arn}')").formats(AWS::SNS::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:sns].delete_topic(@topic_arn).body
+    end
+
+  end
+
+  tests('failure') do
+
+  end
+
+end

data/tests/aws/requests/sqs/helper.rb

@@ -0,0 +1,15 @@
+class AWS
+
+  module SQS
+
+    module Formats
+
+      BASIC = {
+        'ResponseMetadata' => {'RequestId' => String}
+      }
+
+    end
+
+  end
+
+end

data/tests/aws/requests/sqs/message_tests.rb

@@ -0,0 +1,57 @@
+Shindo.tests('AWS::SQS | message requests', ['aws']) do
+
+  tests('success') do
+
+    unless Fog.mocking?
+      @queue_url = AWS[:sqs].create_queue('fog_message_tests').body['QueueUrl']
+    end
+
+    send_message_format = AWS::SQS::Formats::BASIC.merge({
+      'MessageId'         => String,
+      'MD5OfMessageBody'  => String
+    })
+
+    tests("#send_message('#{@queue_url}', 'message')").formats(send_message_format) do
+      pending if Fog.mocking?
+      AWS[:sqs].send_message(@queue_url, 'message').body
+    end
+
+    receive_message_format = AWS::SQS::Formats::BASIC.merge({
+      'Message' => [{
+        'Attributes'    => {
+          'ApproximateFirstReceiveTimestamp'  => Time,
+          'ApproximateReceiveCount'           => Integer,
+          'SenderId'                          => String,
+          'SentTimestamp'                     => Time
+        },
+        'Body'          => String,
+        'MD5OfBody'     => String,
+        'MessageId'     => String,
+        'ReceiptHandle' => String
+      }]
+    })
+
+    tests("#receive_message").formats(receive_message_format) do
+      pending if Fog.mocking?
+      data = AWS[:sqs].receive_message(@queue_url).body
+      @receipt_handle = data['Message'].first['ReceiptHandle']
+      data
+    end
+
+    tests("#change_message_visibility('#{@queue_url}, '#{@receipt_handle}', 60)").formats(AWS::SQS::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:sqs].change_message_visibility(@queue_url, @receipt_handle, 60).body
+    end
+
+    tests("#delete_message('#{@queue_url}', '#{@receipt_handle}')").formats(AWS::SQS::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:sqs].delete_message(@queue_url, @receipt_handle).body
+    end
+
+    unless Fog.mocking?
+      AWS[:sqs].delete_queue(@queue_url)
+    end
+
+  end
+
+end

data/tests/aws/requests/sqs/queue_tests.rb

@@ -0,0 +1,55 @@
+Shindo.tests('AWS::SQS | queue requests', ['aws']) do
+
+  tests('success') do
+
+    create_queue_format = AWS::SQS::Formats::BASIC.merge({
+      'QueueUrl' => String
+    })
+
+    tests("#create_queue('fog_queue_tests')").formats(create_queue_format) do
+      pending if Fog.mocking?
+      data = AWS[:sqs].create_queue('fog_queue_tests').body
+      @queue_url = data['QueueUrl']
+      data
+    end
+
+    list_queues_format = AWS::SQS::Formats::BASIC.merge({
+      'QueueUrls' => [String]
+    })
+
+    tests("#list_queues").formats(list_queues_format) do
+      pending if Fog.mocking?
+      AWS[:sqs].list_queues.body
+    end
+
+    tests("#set_queue_attributes('#{@queue_url}', 'VisibilityTimeout', 60)").formats(AWS::SQS::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:sqs].set_queue_attributes(@queue_url, 'VisibilityTimeout', 60).body
+    end
+
+    get_queue_attributes_format = AWS::SQS::Formats::BASIC.merge({
+      'Attributes' => {
+        'ApproximateNumberOfMessages'           => Integer,
+        'ApproximateNumberOfMessagesNotVisible' => Integer,
+        'CreatedTimestamp'                      => Time,
+        'MaximumMessageSize'                    => Integer,
+        'LastModifiedTimestamp'                 => Time,
+        'MessageRetentionPeriod'                => Integer,
+        'QueueArn'                              => String,
+        'VisibilityTimeout'                     => Integer
+      }
+    })
+
+    tests("#get_queue_attributes('#{@queue_url}', 'All')").formats(get_queue_attributes_format) do
+      pending if Fog.mocking?
+      AWS[:sqs].get_queue_attributes(@queue_url, 'All').body
+    end
+
+    tests("#delete_queue('#{@queue_url}')").formats(AWS::SQS::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:sqs].delete_queue(@queue_url).body
+    end
+
+  end
+
+end