fog 1.1.1 → 1.2.0

data/tests/aws/requests/beanstalk/application_tests.rb

@@ -0,0 +1,140 @@
+Shindo.tests('AWS::ElasticBeanstalk | application_tests', ['aws', 'beanstalk']) do
+
+  def unique_name(prefix)
+    #get time (with 1/100th of sec accuracy)
+    #want unique domain name and if provider is fast, this can be called more than once per second
+    time = Time.now.to_i.to_s
+    prefix + time
+  end
+
+  unless Fog.mocking?
+    @beanstalk = Fog::AWS[:beanstalk]
+  end
+
+  @test_description = "A unique description."
+
+  @test_app_name = unique_name("fog-test-app-")
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    @describe_applications_format = {
+        'DescribeApplicationsResult' => {
+            'Applications' => [
+                'ApplicationName' => String,
+                'ConfigurationTemplates' => [String],
+                'Description' => Fog::Nullable::String,
+                'DateCreated' => Time,
+                'DateUpdated' => Time,
+                'Versions' => [String]
+            ]},
+        'ResponseMetadata' => {'RequestId'=> String},
+    }
+
+    tests("#describe_applications format").formats(@describe_applications_format) do
+      result = @beanstalk.describe_applications.body
+    end
+
+    test("#create_application") {
+      response = @beanstalk.create_application({
+                                                   'ApplicationName' => @test_app_name,
+                                                   'Description' => @test_description
+                                               })
+
+      result = false
+      if response.status == 200
+
+        app_info = response.body['CreateApplicationResult']['Application']
+        if app_info
+          if app_info['ApplicationName'] == @test_app_name &&
+              app_info['Description'] == @test_description &&
+              app_info['ConfigurationTemplates'].empty? &&
+              app_info['Versions'].empty?
+            result = true
+          end
+        end
+      end
+
+      result
+    }
+
+    test("#describe_applications all") {
+      response = @beanstalk.describe_applications
+
+      result = false
+      if response.status == 200
+        apps = response.body['DescribeApplicationsResult']['Applications']
+        apps.each { |app_info|
+          if app_info
+            if app_info['ApplicationName'] == @test_app_name &&
+                app_info['Description'] == @test_description &&
+                app_info['ConfigurationTemplates'].empty? &&
+                app_info['Versions'].empty?
+              result = true
+            end
+          end
+        }
+      end
+
+      result
+    }
+
+    test("#create_application filter") {
+      # Test for a specific app
+      response = @beanstalk.describe_applications([@test_app_name])
+
+      result = false
+      if response.status == 200
+        apps = response.body['DescribeApplicationsResult']['Applications']
+        if apps && apps.length == 1
+          app_info = apps.first
+          if app_info['ApplicationName'] == @test_app_name &&
+              app_info['Description'] == @test_description &&
+              app_info['ConfigurationTemplates'].empty? &&
+              app_info['Versions'].empty?
+            result = true
+          end
+        end
+      end
+
+      result
+    }
+
+    test("#update_application description") {
+
+      @test_description = "A completely new description."
+
+      response = @beanstalk.update_application({
+                                                   'ApplicationName' => @test_app_name,
+                                                   'Description' => @test_description
+                                               })
+
+      result = false
+      if response.status == 200
+        app_info = response.body['UpdateApplicationResult']['Application']
+        if app_info
+          if app_info['ApplicationName'] == @test_app_name &&
+              app_info['Description'] == @test_description &&
+              app_info['ConfigurationTemplates'].empty? &&
+              app_info['Versions'].empty?
+            result = true
+          end
+        end
+      end
+
+      result
+    }
+
+    test("#delete_application") {
+      response = @beanstalk.delete_application(@test_app_name)
+
+      result = false
+      if response.status == 200
+          result = true
+      end
+
+      result
+    }
+
+  end
+end

data/tests/aws/requests/beanstalk/solution_stack_tests.rb

@@ -0,0 +1,22 @@
+Shindo.tests('AWS::ElasticBeanstalk | solution_stack_tests', ['aws', 'beanstalk']) do
+
+  tests('success') do
+    pending if Fog.mocking?
+
+    @solution_stack_result_format = {
+        'ListAvailableSolutionStacksResult' => {
+            'SolutionStackDetails' => [
+               'SolutionStackName' => String,
+              'PermittedFileTypes' => [String]
+            ],
+            'SolutionStacks' => [String]
+        },
+        'ResponseMetadata' => {'RequestId'=> String},
+    }
+    tests("#list_available_solution_stacks").formats(@solution_stack_result_format) do
+      Fog::AWS[:beanstalk].list_available_solution_stacks.body
+
+    end
+
+  end
+end

data/tests/aws/requests/compute/address_tests.rb

@@ -2,12 +2,14 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
 
   @addresses_format = {
     'addressesSet' => [{
-      'instanceId'  => NilClass,
-      'publicIp'    => String
+      'allocationId'  => Fog::Nullable::String,
+      'associationId' => Fog::Nullable::String,
+      'domain'        => String,
+      'instanceId'    => Fog::Nullable::String,
+      'publicIp'      => String
     }],
     'requestId' => String
   }
-
   @server = Fog::Compute[:aws].servers.create
   @server.wait_for { ready? }
   @ip_address = @server.public_ip_address
@@ -16,7 +18,7 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
 
     @public_ip = nil
 
-    tests('#allocate_address').formats({'publicIp' => String, 'requestId' => String}) do
+    tests('#allocate_address').formats({'domain' => String, 'publicIp' => String, 'requestId' => String}) do
       data = Fog::Compute[:aws].allocate_address.body
       @public_ip = data['publicIp']
       data
@@ -33,7 +35,7 @@ Shindo.tests('Fog::Compute[:aws] | address requests', ['aws']) do
     tests("#associate_addresses('#{@server.identity}', '#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].associate_address(@server.identity, @public_ip).body
     end
-
+    
     tests("#dissassociate_address('#{@public_ip}')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].disassociate_address(@public_ip).body
     end

data/tests/aws/requests/compute/instance_tests.rb

@@ -122,6 +122,39 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
     'requestId'     => String
   }
 
+  @describe_instance_status_format = {
+    'requestId' => String,
+    'instanceStatusSet' => [{
+                              'instanceId' => String,
+                              'availabilityZone' => String,
+                              'instanceState' => {
+                                'code' => Integer,
+                                'name' => String
+                              },
+                              'systemStatus' => {
+                                'status' => String,
+                                'details' => [{
+                                  'name' => String,
+                                  'status' => String
+                                }]
+                              },
+                              'instanceStatus' => {
+                                'status' => String,
+                                'details' => [{
+                                  'name' => String,
+                                  'status' => String
+                                }]
+                              },
+                              'event' => {
+                                                'code' => String,
+                                                'description' => String,
+                                                'notBefore' => Time,
+                                                'notAfter' => Time
+                                              }
+                            }]
+
+  }
+
   tests('success') do
 
     @instance_id = nil
@@ -214,6 +247,10 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       @reserved_instances
     end
 
+    tests('#describe_instance_status').formats(@describe_instance_status_format) do
+      Fog::Compute[:aws].describe_instance_status.body
+    end
+
     if Fog.mocking?
       @reserved_instance_offering_id = @reserved_instances["reservedInstancesOfferingsSet"].first["reservedInstancesOfferingId"]
       tests("#purchase_reserved_instances_offering('#{@reserved_instance_offering_id}')").formats(@purchase_reserved_instances_offering_format) do

data/tests/aws/requests/compute/security_group_tests.rb

@@ -4,16 +4,18 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     'requestId'           => String,
     'securityGroupInfo' => [{
       'groupDescription'  => String,
+      'groupId'           => Fog::Nullable::String,
       'groupName'         => String,
       'ipPermissions'     => [{
-        'fromPort'    => Integer,
-        'groups'      => [{ 'groupName' => String, 'userId' => String }],
+        'fromPort'    => Fog::Nullable::Integer,
+        'groups'      => [{ 'groupName' => Fog::Nullable::String, 'userId' => String }],
         'ipProtocol'  => String,
         'ipRanges'    => [],
-        'toPort'      => Integer,
+        'toPort'      => Fog::Nullable::Integer,
       }],
       'ipPermissionsEgress' => [],
-      'ownerId'           => String
+      'ownerId'           => String,
+      'vpcId'             => Fog::Nullable::String
     }]
   }
 
@@ -29,6 +31,7 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].create_security_group('fog_security_group_two', 'tests group').body
     end
 
+    group_id = Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['groupId']
     to_be_revoked = []
     expected_permissions = []
 
@@ -61,6 +64,10 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
     end
 
+    tests("#describe_security_groups('group-id' => '#{group_id}')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-id' => group_id).body['securityGroupInfo'].first['ipPermissions'])
+    end
+
     permission = { 'SourceSecurityGroupName' => 'fog_security_group_two', 'SourceSecurityGroupOwnerId' => @owner_id }
     tests("#authorize_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permission).body
@@ -254,6 +261,56 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].delete_security_group('fog_security_group_two').body
     end
 
+    vpc_id = Fog::Compute[:aws].create_vpc('10.255.254.64/28').body['vpcSet'].first['vpcId']
+
+    # Create security group in VPC
+    tests("#create_security_group('vpc_security_group', 'tests group')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].create_security_group('vpc_security_group', 'tests group', vpc_id).body
+    end
+
+    group_id = Fog::Compute[:aws].describe_security_groups('group-name' => 'vpc_security_group').body['securityGroupInfo'].first['groupId']
+    
+    # Access group with name in options array
+    permission = { 'IpProtocol' => '42', 'FromPort' => '22', 'ToPort' => '22', 'CidrIp' => '10.0.0.0/8' }
+    expected_permissions = [
+      {"groups"=>[],
+        "ipRanges"=>[{"cidrIp"=>"10.0.0.0/8"}],
+        "ipProtocol"=>"42",
+        "fromPort"=>22,
+        "toPort"=>22}
+    ]
+
+    options = permission.clone
+    options['GroupName'] = 'vpc_security_group'
+    tests("#authorize_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress(options).body
+    end
+
+    tests("#describe_security_groups('group-name' => 'vpc_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'vpc_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    tests("#revoke_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].revoke_security_group_ingress(options).body
+    end
+
+    # Access group with id in options array
+    options = permission.clone
+    options['GroupId'] = group_id
+    tests("#authorize_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress(options).body
+    end
+
+    tests("#describe_security_groups('group-name' => 'vpc_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'vpc_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    tests("#revoke_security_group_ingress(#{options.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].revoke_security_group_ingress(options).body
+    end
+
+    Fog::Compute[:aws].delete_vpc(vpc_id)
+
   end
   tests('failure') do
 
@@ -356,6 +413,23 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     tests("#delete_security_group('default')").raises(Fog::Compute::AWS::Error) do
       Fog::Compute[:aws].delete_security_group('default')
     end
+
+    broken_params = [
+                     [ 'fog_security_group', { 'GroupName' => 'fog_security_group'}],
+                     [ 'fog_security_group', { 'GroupId' => 'sg-11223344'}],
+                     [ { 'GroupName' => 'fog_security_group', 'GroupId' => 'sg-11223344'}, nil]
+                    ]
+
+    broken_params.each do |list_elem|
+      tests("#authorize_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+        Fog::Compute[:aws].authorize_security_group_ingress(list_elem[0], list_elem[1])
+      end
+
+      tests("#revoke_security_group_ingress(#{list_elem[0].inspect}, #{list_elem[1].inspect})").raises(Fog::Compute::AWS::Error) do
+        Fog::Compute[:aws].revoke_security_group_ingress(list_elem[0], list_elem[1])
+      end
+    end
+
   end
 
 end

data/tests/aws/requests/compute/subnet_tests.rb

@@ -0,0 +1,36 @@
+Shindo.tests('Fog::Compute[:aws] | subnet requests', ['aws']) do
+
+  @subnets_format = {
+    'subnetSet' => [{
+      'subnetId'                 => String,
+      'state'                    => String,
+      'vpcId'                    => String,
+      'cidrBlock'                => String,
+      'availableIpAddressCount'  => String,
+      'availabilityZone'         => String,
+      'tagSet'                   => Hash,
+    }],
+    'requestId' => String
+  }
+
+  tests('success') do
+    @vpc=Fog::Compute[:aws].vpcs.create('cidr_block' => '10.0.10.0/24')
+    @vpc_id = @vpc.id
+    @subnet_id = nil
+
+    tests('#create_subnet').formats(@subnets_format) do
+      data = Fog::Compute[:aws].create_subnet(@vpc_id, '10.0.10.16/28').body
+      @subnet_id = data['subnetSet'].first['subnetId']
+      data
+    end
+
+    tests('#describe_subnets').formats(@subnets_format) do
+      Fog::Compute[:aws].describe_subnets.body
+    end
+
+    tests("#delete_subnet('#{@subnet_id}')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_subnet(@subnet_id).body
+    end
+    @vpc.destroy
+  end
+end

data/tests/aws/requests/compute/volume_tests.rb

@@ -109,6 +109,10 @@ Shindo.tests('Fog::Compute[:aws] | volume requests', ['aws']) do
       Fog::Compute[:aws].detach_volume('vol-00000000')
     end
 
+    tests("#detach_volume('#{@volume.identity}')").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].detach_volume(@volume.identity)
+    end
+
     tests("#delete_volume('vol-00000000')").raises(Fog::Compute::AWS::NotFound) do
       Fog::Compute[:aws].delete_volume('vol-00000000')
     end

data/tests/aws/requests/compute/vpc_tests.rb

@@ -0,0 +1,34 @@
+Shindo.tests('Fog::Compute[:aws] | vpc requests', ['aws']) do
+
+  @vpcs_format = {
+    'vpcSet' => [{
+      'vpcId'           => String,
+      'state'           => String,
+      'cidrBlock'       => String,
+      'dhcpOptionsId'   => String,
+      'tagSet'          => Hash,
+      'instanceTenancy' => Fog::Nullable::String,
+    }],
+    'requestId' => String
+  }
+
+  tests('success') do
+
+    @vpc_id = nil
+
+    tests('#create_vpc').formats(@vpcs_format) do
+      data = Fog::Compute[:aws].create_vpc('10.255.254.0/28').body
+      @vpc_id = data['vpcSet'].first['vpcId']
+      data
+    end
+
+    tests('#describe_vpcs').formats(@vpcs_format) do
+      Fog::Compute[:aws].describe_vpcs.body
+    end
+
+    tests("#delete_vpc('#{@vpc_id}')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_vpc(@vpc_id).body
+    end
+
+  end
+end