fog 1.1.1 → 1.2.0

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

@@ -3,42 +3,19 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
   @org_zone_count = 0
   @zone_id = ''
   @change_id = ''
-  @new_records =[]
- 
-  # NOTE: can't use generate_unique_domain() as we do in other DNS provider
-  #       test suites as AWS charges $1/mth for each domain, even if it exists 
-  #       on AWS for only the time that this test suite runs!!
-  #       http://aws.amazon.com/route53/pricing/
-  @test_domain = 'test-343246324434.com'
-  
-  tests( 'success') do
-
-    test('see if test domain already exists') do
-      pending if Fog.mocking?
-      
-      @zone_id = nil
-      
-      response = Fog::DNS[:aws].list_hosted_zones()
-      if response.status == 200
-        @hosted_zones = response.body['HostedZones']
-      end
+  @new_records = []
+  @domain_name = generate_unique_domain
+
+  @elb_connection = Fog::AWS::ELB.new
+  @r53_connection = Fog::DNS[:aws]
+
+  tests('success') do
 
-      #go through zones for this account
-      @hosted_zones.each { |zone|
-        domain = zone['Name']
-        if domain.chomp == @test_domain
-          @zone_id = zone['Id']
-        end
-      }
-      
-      @zone_id.nil?
-    end
-      
     test('get current zone count') do
       pending if Fog.mocking?
 
       @org_zone_count= 0
-      response = Fog::DNS[:aws].list_hosted_zones()
+      response = @r53_connection.list_hosted_zones
       if response.status == 200
         @hosted_zones = response.body['HostedZones']
         @org_zone_count = @hosted_zones.count
@@ -51,13 +28,13 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
       pending if Fog.mocking?
 
       result = false
-      
-      response = Fog::DNS[:aws].create_hosted_zone( @test_domain)
+
+      response = @r53_connection.create_hosted_zone(@domain_name)
       if response.status == 201
 
-        zone= response.body['HostedZone']
+        zone        = response.body['HostedZone']
         change_info = response.body['ChangeInfo']
-        ns_servers = response.body['NameServers']
+        ns_servers  = response.body['NameServers']
 
         if (zone and change_info and ns_servers)
 
@@ -66,7 +43,7 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
           @change_id = change_info['Id']
           status = change_info['Status']
           ns_srv_count = ns_servers.count
-          
+
           if (@zone_id.length > 0) and (caller_ref.length > 0) and (@change_id.length > 0) and
              (status.length > 0) and (ns_srv_count > 0)
             result = true
@@ -76,28 +53,28 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
 
       result
     }
-    
+
     test("get status of change #{@change_id}") {
       pending if Fog.mocking?
 
       result = false
-      response = Fog::DNS[:aws].get_change(@change_id)
+      response = @r53_connection.get_change(@change_id)
       if response.status == 200
         status = response.body['Status']
         if (status == 'PENDING') or (status == 'INSYNC')
-          result= true
+          result = true
         end
       end
-      
+
       result
     }
-   
+
     test("get info on hosted zone #{@zone_id}") {
       pending if Fog.mocking?
 
       result = false
-      
-      response = Fog::DNS[:aws].get_hosted_zone( @zone_id)
+
+      response = @r53_connection.get_hosted_zone(@zone_id)
       if response.status == 200
         zone = response.body['HostedZone']
         zone_id = zone['Id']
@@ -106,139 +83,166 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
         ns_servers = response.body['NameServers']
 
         # AWS returns domain with a dot at end - so when compare, remove dot
-        
-        if (zone_id == @zone_id) and (name.chop == @test_domain) and (caller_ref.length > 0) and
+
+        if (zone_id == @zone_id) and (name.chop == @domain_name) and (caller_ref.length > 0) and
            (ns_servers.count > 0)
            result = true
         end
       end
-      
+
       result
     }
-    
+
     test('list zones') do
       pending if Fog.mocking?
 
       result = false
-      
-      response = Fog::DNS[:aws].list_hosted_zones()
+
+      response = @r53_connection.list_hosted_zones
       if response.status == 200
-        
+
         zones= response.body['HostedZones']
         if (zones.count > 0)
-          zone= zones[0]
+          zone = zones[0]
           zone_id = zone['Id']
           zone_name= zone['Name']
           caller_ref = zone['CallerReference']
         end
         max_items = response.body['MaxItems']
-                  
-        if (zone_id.length > 0) and (zone_name.length > 0) and (caller_ref.length > 0) and 
+
+        if (zone_id.length > 0) and (zone_name.length > 0) and (caller_ref.length > 0) and
            (max_items > 0)
           result = true
-        end      
+        end
       end
 
       result
     end
-    
+
     test("add a A resource record") {
       pending if Fog.mocking?
 
-      result = false
-      
       # create an A resource record
-      host = 'www.' + @test_domain
+      host = 'www.' + @domain_name
       ip_addrs = ['1.2.3.4']
       resource_record = { :name => host, :type => 'A', :ttl => 3600, :resource_records => ip_addrs }
-      resource_record_set = resource_record.merge( :action => 'CREATE')
-  
+      resource_record_set = resource_record.merge(:action => 'CREATE')
+
       change_batch = []
       change_batch << resource_record_set
-      options = { :comment => 'add A record to domain'}             
-      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
+      options = { :comment => 'add A record to domain'}
+      response = @r53_connection.change_resource_record_sets(@zone_id, change_batch, options)
       if response.status == 200
         change_id = response.body['Id']
         status = response.body['Status']
         @new_records << resource_record
       end
-      
+
       response.status == 200
     }
 
     test("add a CNAME resource record") {
       pending if Fog.mocking?
 
-      result = false
-      
       # create a CNAME resource record
-      host = 'mail.' + @test_domain
-      value = ['www.' + @test_domain]
+      host = 'mail.' + @domain_name
+      value = ['www.' + @domain_name]
       resource_record = { :name => host, :type => 'CNAME', :ttl => 3600, :resource_records => value }
-      resource_record_set = resource_record.merge( :action => 'CREATE')
-  
+      resource_record_set = resource_record.merge(:action => 'CREATE')
+
       change_batch = []
       change_batch << resource_record_set
-      options = { :comment => 'add CNAME record to domain'}             
-      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
+      options = { :comment => 'add CNAME record to domain'}
+      response = @r53_connection.change_resource_record_sets( @zone_id, change_batch, options)
       if response.status == 200
         change_id = response.body['Id']
         status = response.body['Status']
         @new_records << resource_record
       end
-      
+
       response.status == 200
     }
-    
+
     test("add a MX resource record") {
       pending if Fog.mocking?
 
-      result = false
-      
       # create a MX resource record
-      host = @test_domain
-      value = ['7 mail.' + @test_domain]
+      host = @domain_name
+      value = ['7 mail.' + @domain_name]
       resource_record = { :name => host, :type => 'MX', :ttl => 3600, :resource_records => value }
       resource_record_set = resource_record.merge( :action => 'CREATE')
-  
+
       change_batch = []
       change_batch << resource_record_set
-      options = { :comment => 'add MX record to domain'}             
-      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
+      options = { :comment => 'add MX record to domain'}
+      response = @r53_connection.change_resource_record_sets( @zone_id, change_batch, options)
       if response.status == 200
         change_id = response.body['Id']
         status = response.body['Status']
         @new_records << resource_record
       end
-      
+
       response.status == 200
     }
 
-    test("list resource records")  {
+    test("add an ALIAS resource record") {
       pending if Fog.mocking?
 
-      # get resource records for zone
-      response = Fog::DNS[:aws].list_resource_record_sets( @zone_id)
+      # create a load balancer
+      @elb_connection.create_load_balancer(["us-east-1a"], "fog", [{"Protocol" => "HTTP", "LoadBalancerPort" => "80", "InstancePort" => "80"}])
+
+      elb_response   = @elb_connection.describe_load_balancers("fog")
+      elb            = elb_response.body["DescribeLoadBalancersResult"]["LoadBalancerDescriptions"].first
+      hosted_zone_id = elb["CanonicalHostedZoneNameID"]
+      dns_name       = elb["DNSName"]
+
+      # create an ALIAS record
+      host = @domain_name
+      alias_target = {
+        :hosted_zone_id => hosted_zone_id,
+        :dns_name       => dns_name
+      }
+      resource_record = { :name => host, :type => 'A', :alias_target => alias_target }
+      resource_record_set = resource_record.merge(:action => 'CREATE')
+
+      change_batch = []
+      change_batch << resource_record_set
+      options = { :comment => 'add ALIAS record to domain'}
+
+      puts "Hosted Zone ID (ELB): #{hosted_zone_id}"
+      puts "DNS Name (ELB): #{dns_name}"
+      puts "Zone ID for Route 53: #{@zone_id}"
+
+      sleep 120
+      response = @r53_connection.change_resource_record_sets(@zone_id, change_batch, options)
       if response.status == 200
-        record_sets= response.body['ResourceRecordSets']
-        num_records= record_sets.count
+        change_id = response.body['Id']
+        status = response.body['Status']
+        @new_records << resource_record
       end
 
       response.status == 200
     }
 
+    tests("list resource records").formats(AWS::DNS::Formats::LIST_RESOURCE_RECORD_SETS)  {
+      pending if Fog.mocking?
+
+      # get resource records for zone
+      @r53_connection.list_resource_record_sets(@zone_id).body
+    }
+
     test("delete #{@new_records.count} resource records") {
       pending if Fog.mocking?
 
       result = true
-      
+
       change_batch = []
-      @new_records.each { |record|      
+      @new_records.each { |record|
         resource_record_set = record.merge( :action => 'DELETE')
         change_batch << resource_record_set
       }
-      options = { :comment => 'remove records from domain'}             
-      response = Fog::DNS[:aws].change_resource_record_sets( @zone_id, change_batch, options)
+      options = { :comment => 'remove records from domain'}
+      response = @r53_connection.change_resource_record_sets(@zone_id, change_batch, options)
       if response.status != 200
         result = false
         break
@@ -246,31 +250,34 @@ Shindo.tests('Fog::DNS[:aws] | DNS requests', ['aws', 'dns']) do
 
       result
     }
-    
+
     test("delete hosted zone #{@zone_id}") {
       pending if Fog.mocking?
 
-      response = Fog::DNS[:aws].delete_hosted_zone( @zone_id)
+      # cleanup the ELB as well
+      @elb_connection.delete_load_balancer("fog")
+
+      response = @r53_connection.delete_hosted_zone(@zone_id)
 
       response.status == 200
     }
-  
+
   end
 
 
-  tests( 'failure') do
+  tests('failure') do
     tests('create hosted zone using invalid domain name').raises(Excon::Errors::BadRequest) do
       pending if Fog.mocking?
-      response = Fog::DNS[:aws].create_hosted_zone('invalid-domain')
+      response = @r53_connection.create_hosted_zone('invalid-domain')
     end
-    
+
     tests('get hosted zone using invalid ID').raises(Excon::Errors::Forbidden) do
       pending if Fog.mocking?
       zone_id = 'dummy-id'
-      response = Fog::DNS[:aws].get_hosted_zone(zone_id)
+      response = @r53_connection.get_hosted_zone(zone_id)
     end
-  
+
   end
 
-  
+
 end

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,