fog 1.1.2 → 1.2.0

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

@@ -0,0 +1,21 @@
+class AWS
+  module DNS
+    module Formats
+      RESOURCE_RECORD_SET = {
+        "ResourceRecords" => Array,
+        "Name" => String,
+        "Type" => String,
+        "AliasTarget"=> Fog::Nullable::Hash,
+        "TTL" => Fog::Nullable::String
+      }
+
+      LIST_RESOURCE_RECORD_SETS = {
+        "ResourceRecordSets" => [RESOURCE_RECORD_SET],
+        "IsTruncated" => Fog::Boolean,
+        "MaxItems" => Integer,
+        "NextRecordName" => Fog::Nullable::String,
+        "NextRecordType" => Fog::Nullable::String
+      }
+    end
+  end
+end

data/tests/aws/requests/dynamodb/item_tests.rb

@@ -0,0 +1,117 @@
+Shindo.tests('Fog::AWS[:dynamodb] | item requests', ['aws']) do
+
+  @table_name = "fog_table_#{Time.now.to_f.to_s.gsub('.','')}"
+
+  unless Fog.mocking?
+    Fog::AWS[:dynamodb].create_table(
+      @table_name, 
+      {'HashKeyElement' => {'AttributeName' => 'key', 'AttributeType' => 'S'}}, 
+      {'ReadCapacityUnits' => 5, 'WriteCapacityUnits' => 5}
+    )
+    Fog.wait_for { Fog::AWS[:dynamodb].describe_table(@table_name).body['Table']['TableStatus'] == 'ACTIVE' }
+  end
+
+  tests('success') do
+
+    tests("#put_item('#{@table_name}', {'key' => {'S' => 'key'}}, {'value' => {'S' => 'value'}})").formats('ConsumedCapacityUnits' => Float) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].put_item(@table_name, {'key' => {'S' => 'key'}}, {'value' => {'S' => 'value'}}).body
+    end
+
+    tests("#update_item('#{@table_name}', {'HashKeyElement' => {'S' => 'key'}}, {'value' => {'Value' => {'S' => 'value'}}})").formats('ConsumedCapacityUnits' => Float) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].update_item(@table_name, {'HashKeyElement' => {'S' => 'key'}}, {'value' => {'Value' => {'S' => 'value'}}}).body
+    end
+
+    @batch_get_item_format = {
+      'Responses' => {
+        @table_name => {
+          'ConsumedCapacityUnits' => Float,
+          'Items' => [{
+            'key'   => { 'S' => String },
+            'value' => { 'S' => String }
+          }]
+        }
+      },
+      'UnprocessedKeys' => {}
+    }
+
+    tests("#batch_get_item({'#{@table_name}' => {'Keys' => [{'HashKeyElement' => {'S' => 'key'}}]}})").formats(@batch_get_item_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].batch_get_item(
+        {@table_name => {'Keys' => [{'HashKeyElement' => {'S' => 'key'}}]}}
+      ).body
+    end
+
+    @get_item_format = {
+      'ConsumedCapacityUnits' => Float,
+      'Item' => {
+        'key'   => { 'S' => String },
+        'value' => { 'S' => String }
+      }
+    }
+
+    tests("#get_item('#{@table_name}', {'HashKeyElement' => {'S' => 'key'}})").formats(@get_item_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].get_item(@table_name, {'HashKeyElement' => {'S' => 'key'}}).body
+    end
+
+    tests("#get_item('#{@table_name}', {'HashKeyElement' => {'S' => 'notakey'}})").formats('ConsumedCapacityUnits' => Float) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].get_item(@table_name, {'HashKeyElement' => {'S' => 'notakey'}}).body
+    end
+
+    @query_format = {
+      'ConsumedCapacityUnits' => Float,
+      'Count'                 => Integer,
+      'Items'                 => [{
+        'key'   => { 'S' => String },
+        'value' => { 'S' => String }
+      }],
+      'LastEvaluatedKey'      => NilClass
+    }
+
+    tests("#query('#{@table_name}', {'S' => 'key'}").formats(@query_format) do
+      pending if Fog.mocking?
+      pending # requires a table with range key
+      Fog::AWS[:dynamodb].query(@table_name, {'S' => 'key'}).body
+    end
+
+    @scan_format = @query_format.merge('ScannedCount' => Integer)
+
+    tests("scan('#{@table_name}')").formats(@scan_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].scan(@table_name).body
+    end
+
+    tests("#delete_item('#{@table_name}', {'HashKeyElement' => {'S' => 'key'}})").formats('ConsumedCapacityUnits' => Float) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].delete_item(@table_name, {'HashKeyElement' => {'S' => 'key'}}).body
+    end
+
+    tests("#delete_item('#{@table_name}, {'HashKeyElement' => {'S' => 'key'}})").formats('ConsumedCapacityUnits' => Float) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].delete_item(@table_name, {'HashKeyElement' => {'S' => 'key'}}).body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#put_item('notatable', {'key' => {'S' => 'key'}}, {'value' => {'S' => 'value'}})").raises(Excon::Errors::BadRequest) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].put_item('notatable', {'key' => {'S' => 'key'}}, {'value' => {'S' => 'value'}})
+    end
+
+    tests("#update_item('notatable', {'HashKeyElement' => {'S' => 'key'}}, {'value' => {'Value' => {'S' => 'value'}}})").raises(Excon::Errors::BadRequest) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].update_item('notatable', {'HashKeyElement' => {'S' => 'key'}}, {'value' => {'Value' => {'S' => 'value'}}})
+    end
+
+  end
+
+  unless Fog.mocking?
+    Fog::AWS[:dynamodb].delete_table(@table_name)
+  end
+
+end

data/tests/aws/requests/dynamodb/table_tests.rb

@@ -0,0 +1,99 @@
+Shindo.tests('Fog::AWS[:dynamodb] | table requests', ['aws']) do
+
+  @table_format = {
+    'CreationDateTime'  => Float,
+    'KeySchema'             => {
+      'HashKeyElement' => {
+        'AttributeName' => String,
+        'AttributeType' => String
+      }
+    },
+    'ProvisionedThroughput' => {
+      'ReadCapacityUnits'   => Integer,
+      'WriteCapacityUnits'  => Integer
+    },
+    'TableName'             => String,
+    'TableStatus'           => String
+  }
+
+  @table_name = "fog_table_#{Time.now.to_f.to_s.gsub('.','')}"
+
+  tests('success') do
+
+    tests("#create_table(#{@table_name}, {'HashKeyElement' => {'AttributeName' => 'id', 'AttributeType' => 'S'}, {'ReadCapacityUnits' => 5, 'WriteCapacityUnits' => 5})").formats('TableDescription' => @table_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].create_table(@table_name, {'HashKeyElement' => {'AttributeName' => 'id', 'AttributeType' => 'S'}}, {'ReadCapacityUnits' => 5, 'WriteCapacityUnits' => 5}).body
+    end
+
+    tests("#describe_table(#{@table_name})").formats('Table' => @table_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].describe_table(@table_name).body
+    end
+
+    tests("#list_tables").formats({'LastEvaluatedTableName' => Fog::Nullable::String, 'TableNames' => [String]}) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].list_tables.body
+    end
+
+    unless Fog.mocking?
+      Fog.wait_for { Fog::AWS[:dynamodb].describe_table(@table_name).body['Table']['TableStatus'] == 'ACTIVE' }
+    end
+
+    @update_table_format = {
+      'TableDescription' => @table_format.merge({
+        'ItemCount'             => Integer,
+        'ProvisionedThroughput' => {
+          'LastIncreaseDateTime'  => Float,
+          'ReadCapacityUnits'     => Integer,
+          'WriteCapacityUnits'    => Integer
+        },
+        'TableSizeBytes'        => Integer
+      })
+    }
+
+    tests("#update_table(#{@table_name}, {'ReadCapacityUnits' => 10, 'WriteCapacityUnits' => 10})").formats(@update_table_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].update_table(@table_name, {'ReadCapacityUnits' => 10, 'WriteCapacityUnits' => 10}).body
+    end
+
+    unless Fog.mocking?
+      Fog.wait_for { Fog::AWS[:dynamodb].describe_table(@table_name).body['Table']['TableStatus'] == 'ACTIVE' }
+    end
+
+    @delete_table_format = {
+      'TableDescription' => {
+        'ProvisionedThroughput' => {
+          'ReadCapacityUnits'   => Integer,
+          'WriteCapacityUnits'  => Integer
+        },
+        'TableName'      => String,
+        'TableStatus'    => String
+      }
+    }
+
+    tests("#delete_table(#{@table_name}").formats(@delete_table_format) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].delete_table(@table_name).body
+    end
+
+  end
+
+  tests('failure') do
+
+    tests("#delete_table('notatable')").raises(Excon::Errors::BadRequest) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].delete_table('notatable')
+    end
+
+    tests("#describe_table('notatable')").raises(Excon::Errors::BadRequest) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].describe_table('notatable')
+    end
+
+    tests("#update_table('notatable', {'ReadCapacityUnits' => 10, 'WriteCapacityUnits' => 10})").raises(Excon::Errors::BadRequest) do
+      pending if Fog.mocking?
+      Fog::AWS[:dynamodb].update_table('notatable', {'ReadCapacityUnits' => 10, 'WriteCapacityUnits' => 10}).body
+    end
+
+  end
+end

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

@@ -28,6 +28,39 @@ class AWS
         'DescribeLoadBalancersResult' => {'LoadBalancerDescriptions' => [LOAD_BALANCER]}
       })
 
+      POLICY_ATTRIBUTE_DESCRIPTION = {
+        "AttributeName" => String,
+        "AttributeValue" => String
+      }
+
+      POLICY = {
+        "PolicyAttributeDescriptions" => [POLICY_ATTRIBUTE_DESCRIPTION],
+        "PolicyName" => String,
+        "PolicyTypeName" => String
+      }
+
+      DESCRIBE_LOAD_BALANCER_POLICIES = BASIC.merge({
+        'DescribeLoadBalancerPoliciesResult' => { 'PolicyDescriptions' => [POLICY] }
+      })
+
+      POLICY_ATTRIBUTE_TYPE_DESCRIPTION = {
+        "AttributeName" => String,
+        "AttributeType" => String,
+        "Cardinality" => String,
+        "DefaultValue" => String,
+        "Description" => String
+      }
+
+      POLICY_TYPE = {
+        "Description" => String,
+        "PolicyAttributeTypeDescriptions" => [POLICY_ATTRIBUTE_TYPE_DESCRIPTION],
+        "PolicyTypeName" => String
+      }
+
+      DESCRIBE_LOAD_BALANCER_POLICY_TYPES = BASIC.merge({
+        'DescribeLoadBalancerPolicyTypesResult' => { 'PolicyTypeDescriptions' => [POLICY_TYPE] }
+      })
+
       CONFIGURE_HEALTH_CHECK = BASIC.merge({
         'ConfigureHealthCheckResult' => {'HealthCheck' => {
         'Target' => String,

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

@@ -8,7 +8,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
 
     tests("#create_load_balancer_listeners").formats(AWS::ELB::Formats::BASIC) do
       listeners = [
-        {'Protocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
+        {'Protocol' => 'TCP','InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
         {'Protocol' => 'HTTP', 'LoadBalancerPort' => 80, 'InstancePort' => 80}
       ]
       response = Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
@@ -22,7 +22,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
 
     tests("#create_load_balancer_listeners with non-existant SSL certificate") do
       listeners = [
-        {'Protocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => 'non-existant'},
+        {'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => 'non-existant'},
       ]
       raises(Fog::AWS::IAM::NotFound) { Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners) }
     end
@@ -30,7 +30,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
     tests("#create_load_balancer_listeners with invalid SSL certificate").raises(Fog::AWS::IAM::NotFound) do
       sleep 8 unless Fog.mocking?
       listeners = [
-        {'Protocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => "#{@certificate['Arn']}fake"},
+        {'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => "#{@certificate['Arn']}fake"},
       ]
       Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
     end
@@ -39,7 +39,7 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
     tests("#create_load_balancer_listeners with SSL certificate").formats(AWS::ELB::Formats::BASIC) do
       sleep 8 unless Fog.mocking?
       listeners = [
-        {'Protocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
+        {'Protocol' => 'HTTPS', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 443, 'InstancePort' => 443, 'SSLCertificateId' => @certificate['Arn']},
       ]
       Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
     end
@@ -48,6 +48,20 @@ Shindo.tests('AWS::ELB | listener_tests', ['aws', 'elb']) do
       Fog::AWS[:elb].set_load_balancer_listener_ssl_certificate(@load_balancer_id, 443, @certificate['Arn']).body
     end
 
+    tests("#create_load_balancer_listeners with invalid Protocol and InstanceProtocol configuration").raises(Fog::AWS::ELB::ValidationError) do
+      listeners = [
+        {'Protocol' => 'HTTP', 'InstanceProtocol' => 'TCP', 'LoadBalancerPort' => 80, 'InstancePort' => 80},
+      ]
+      Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
+    end
+
+    tests("#create_load_balancer_listeners with valid Protocol and InstanceProtocol configuration").formats(AWS::ELB::Formats::BASIC) do
+      listeners = [
+        {'Protocol' => 'HTTP', 'InstanceProtocol' => 'HTTPS', 'LoadBalancerPort' => 80, 'InstancePort' => 80},
+      ]
+      Fog::AWS[:elb].create_load_balancer_listeners(@load_balancer_id, listeners).body
+    end
+
     Fog::AWS[:iam].delete_server_certificate(@key_name)
     Fog::AWS[:elb].delete_load_balancer(@load_balancer_id)
   end

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

@@ -21,6 +21,19 @@ Shindo.tests('AWS::ELB | policy_tests', ['aws', 'elb']) do
       Fog::AWS[:elb].create_lb_cookie_stickiness_policy(@load_balancer_id, policy).body
     end
 
+    tests("#describe_load_balancer_policy_types").formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICY_TYPES) do
+      @policy_types = Fog::AWS[:elb].describe_load_balancer_policy_types.body
+    end
+
+    tests("#create_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do
+      policy = 'fog-policy'
+      Fog::AWS[:elb].create_load_balancer_policy(@load_balancer_id, policy, 'PublicKeyPolicyType', {'PublicKey' => AWS::IAM::SERVER_CERT_PUBLIC_KEY}).body
+    end
+
+    tests("#describe_load_balancer_policies").formats(AWS::ELB::Formats::DESCRIBE_LOAD_BALANCER_POLICIES) do
+      Fog::AWS[:elb].describe_load_balancer_policies(@load_balancer_id).body
+    end
+
     tests("#delete_load_balancer_policy").formats(AWS::ELB::Formats::BASIC) do
       policy = 'fog-lb-no-expiry'
       Fog::AWS[:elb].delete_load_balancer_policy(@load_balancer_id, policy).body

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

@@ -1,8 +1,6 @@
 Shindo.tests('AWS::IAM | access key requests', ['aws']) do
 
-  unless Fog.mocking?
-    Fog::AWS[:iam].create_user('fog_access_key_tests')
-  end
+  Fog::AWS[:iam].create_user('fog_access_key_tests')
 
   tests('success') do
 
@@ -17,7 +15,6 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
     }
 
     tests("#create_access_key('UserName' => 'fog_access_key_tests')").formats(@access_key_format) do
-      pending if Fog.mocking?
       data = Fog::AWS[:iam].create_access_key('UserName' => 'fog_access_key_tests').body
       @access_key_id = data['AccessKey']['AccessKeyId']
       data
@@ -33,7 +30,6 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
     }
 
     tests("#list_access_keys('Username' => 'fog_access_key_tests')").formats(@access_keys_format) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].list_access_keys('UserName' => 'fog_access_key_tests').body
     end
 
@@ -43,7 +39,6 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
     end
 
     tests("#delete_access_key('#{@access_key_id}', 'UserName' => 'fog_access_key_tests)").formats(AWS::IAM::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].delete_access_key(@access_key_id, 'UserName' => 'fog_access_key_tests').body
     end
 
@@ -57,4 +52,4 @@ Shindo.tests('AWS::IAM | access key requests', ['aws']) do
     Fog::AWS[:iam].delete_user('fog_access_key_tests')
   end
 
-end
+end

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

@@ -13,7 +13,6 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
     }
 
     tests("#create_group('fog_group')").formats(@group_format) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].create_group('fog_group').body
     end
 
@@ -29,12 +28,10 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
     }
 
     tests("#list_groups").formats(@groups_format) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].list_groups.body
     end
 
     tests("#delete_group('fog_group')").formats(AWS::IAM::Formats::BASIC) do
-      pending if Fog.mocking?
       Fog::AWS[:iam].delete_group('fog_group').body
     end
 
@@ -44,4 +41,4 @@ Shindo.tests('AWS::IAM | group requests', ['aws']) do
     test('failing conditions')
   end
 
-end
+end

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

@@ -41,6 +41,25 @@ c0AQtoYBTJePxiYyd8i32ypkkK83ar+sFoxKO9jYwD1IkZax2xZ0aoTdMindQPR7
 Yjs+QiLmOHcbPqX+GHcCQERsSn0RjzKmKirDntseMB59BB/cEN32+gMDVsZuCfb+
 fOy2ZavFl13afnhbh2/AjKeDhnb19x/uXjF7JCUtwpA=
 -----END RSA PRIVATE KEY-----
+}
+
+    # openssl pkcs8 -nocrypt -topk8 -in SERVER_CERT_PRIVATE_KEY.key -outform pem
+    SERVER_CERT_PRIVATE_KEY_PKCS8 = %{-----BEGIN PRIVATE KEY-----
+MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALQJHvqyi+N2alZG
+YRp/xdob6cZ7tzOGl0sqRq7ZvXpW1KOQ9y3E8vlTi9ozFBRugs+v72gv719Jg3fV
+XMMPiHJp4ah4jl+GcZ6qTvWSrm4c40E5BQxtlsFDw9V31J2T7L0knoTl8L4aEsvk
+j7LYMruzIHPLKarVaLqs+nVdcXsBAgMBAAECgYA2ONEFvCR5ez6HgWbZbkYObH25
+86S3df+2+aKUIqv4XpJoOM7ZEAoFoW3rZ5rSlH39QwWdoWI8lo1r1+y6KsFzAh35
+GLOu4Sn7sUbOIz2YLmRwTtYpmteAYacu2qDjHm3BUsCuCnSOLtMDXyr/vi5Osjhr
+PwfmJNjifb05GUuaaQJBAOwYy4sSAYeA3ljVz1rHUNP+tRcrGeqwiuKNGSBuJOdw
+cACsUnzxzfLKRaoa9idIXAxLwNJaI/I9oAic02Vv988CQQDDNngJ+8n46UT76tM8
+f2N6YLz12fELsQUa5YmbB1p2d6/wRiC6+95x0Z0a20PtCxkqlzPmYOeA5SCFtWby
+8EQvAkAwd86hWCr0NGJw/kO5MR3Ix4tJnFGPunpok+rKm5H76Ts1CCtO9xz+cMPo
+beyGl/Y9l/eXt2WVv0zxN7C2LExFAkEAh1dzQBC2hgFMl4/GJjJ3yLfbKmSQrzdq
+v6wWjEo72NjAPUiRlrHbFnRqhN0yKd1A9HtiOz5CIuY4dxs+pf4YdwJARGxKfRGP
+MqYqKsOe2x4wHn0EH9wQ3fb6AwNWxm4J9v587LZlq8WXXdp+eFuHb8CMp4OGdvX3
+H+5eMXskJS3CkA==
+-----END PRIVATE KEY-----
 }
 
     SERVER_CERT_PRIVATE_KEY_MISMATCHED = %{-----BEGIN RSA PRIVATE KEY-----