brightbox-cli 0.16.0 → 0.17.0

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/compute/instance_tests.rb

@@ -126,7 +126,7 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
 
     @instance_id = nil
     # Use a MS Windows AMI to test #get_password_data
-    @windows_ami = 'ami-1cbd4475' # Microsoft Windows Server 2008 R2 Base 64-bit
+    @windows_ami = 'ami-62bd440b' # Amazon Public Images - Basic Microsoft Windows Server 2008 64-bit
 
     # Create a keypair for decrypting the password
     key_name = 'fog-test-key'
@@ -138,6 +138,21 @@ Shindo.tests('Fog::Compute[:aws] | instance requests', ['aws']) do
       data
     end
 
+    if Fog.mocking?
+      # Ensure the new instance doesn't show up in mock describe_instances right away
+      tests("#describe_instances").formats(@describe_instances_format) do
+        body = Fog::Compute[:aws].describe_instances.body
+        instance_ids = body['reservationSet'].map {|reservation| reservation['instancesSet'].map {|instance| instance['instanceId'] } }.flatten
+        test("doesn't include the new instance") { !instance_ids.include?(@instance_id) }
+        body
+      end
+
+      # But querying for the new instance directly should raise an error
+      tests("#describe_instances('instance-id' => '#{@instance_id}')").raises(Fog::Compute::AWS::NotFound) do
+        Fog::Compute[:aws].describe_instances('instance-id' => @instance_id)
+      end
+    end
+
     server = Fog::Compute[:aws].servers.get(@instance_id)
     while server.nil? do
       # It may take a moment to get the server after launching it

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/compute/security_group_tests.rb

@@ -25,25 +25,207 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].create_security_group('fog_security_group', 'tests group').body
     end
 
-    tests("#authorize_security_group_ingress('fog_security_group', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress(
-        'fog_security_group',
+    tests("#create_security_group('fog_security_group_two', 'tests group')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].create_security_group('fog_security_group_two', 'tests group').body
+    end
+
+    to_be_revoked = []
+    expected_permissions = []
+
+    permission = { 'SourceSecurityGroupName' => 'default' }
+    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
+    end
+
+    to_be_revoked.push([permission, expected_permissions.dup])
+
+    expected_permissions = [
+      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id}],
+        "fromPort"=>1,
+        "ipRanges"=>[],
+        "ipProtocol"=>"tcp",
+        "toPort"=>65535},
+      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id}],
+        "fromPort"=>1,
+        "ipRanges"=>[],
+        "ipProtocol"=>"udp",
+        "toPort"=>65535},
+      {"groups"=>[{"groupName"=>"default", "userId"=>@owner_id}],
+        "fromPort"=>-1,
+        "ipRanges"=>[],
+        "ipProtocol"=>"icmp",
+        "toPort"=>-1}
+    ]
+
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').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
+    end
+
+    to_be_revoked.push([permission, expected_permissions.dup])
+
+    expected_permissions = [
+      {"groups"=>
+        [{"userId"=>@owner_id, "groupName"=>"default"},
+          {"userId"=>@owner_id, "groupName"=>"fog_security_group_two"}],
+        "ipRanges"=>[],
+        "ipProtocol"=>"tcp",
+        "fromPort"=>1,
+        "toPort"=>65535},
+      {"groups"=>
+        [{"userId"=>@owner_id, "groupName"=>"default"},
+          {"userId"=>@owner_id, "groupName"=>"fog_security_group_two"}],
+        "ipRanges"=>[],
+        "ipProtocol"=>"udp",
+        "fromPort"=>1,
+        "toPort"=>65535},
+      {"groups"=>
+        [{"userId"=>@owner_id, "groupName"=>"default"},
+          {"userId"=>@owner_id, "groupName"=>"fog_security_group_two"}],
+        "ipRanges"=>[],
+        "ipProtocol"=>"icmp",
+        "fromPort"=>-1,
+        "toPort"=>-1}
+    ]
+
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    permission = { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22' }
+    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
+    end
+
+    to_be_revoked.push([permission, expected_permissions.dup])
+
+    # previous did nothing
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    permission = { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22', 'CidrIp' => '10.0.0.0/8' }
+    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
+    end
+
+    to_be_revoked.push([permission, expected_permissions.dup])
+
+    expected_permissions += [
+      {"groups"=>[],
+        "ipRanges"=>[{"cidrIp"=>"10.0.0.0/8"}],
+        "ipProtocol"=>"tcp",
+        "fromPort"=>22,
+        "toPort"=>22}
+    ]
+
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    # authorize with nested IpProtocol without IpRanges or Groups does nothing
+    permissions = {
+      'IpPermissions' => [
+        { 'IpProtocol' => 'tcp', 'FromPort' => '22', 'ToPort' => '22' }
+      ]
+    }
+    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
+    end
+
+    to_be_revoked.push([permissions, expected_permissions.dup])
+
+    # previous did nothing
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    # authorize with nested IpProtocol with IpRanges
+    permissions = {
+      'IpPermissions' => [
         {
-          'FromPort' => 80,
-          'IpProtocol' => 'tcp',
-          'ToPort' => 80,
+          'IpProtocol' => 'tcp', 'FromPort' => '80', 'ToPort' => '80',
+          'IpRanges' => [{ 'CidrIp' => '192.168.0.0/24' }]
         }
-      ).body
+      ]
+    }
+    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
     end
 
-    tests("#authorize_security_group_ingress('fog_security_group', {'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].authorize_security_group_ingress(
-        'fog_security_group',
+    to_be_revoked.push([permissions, expected_permissions.dup])
+
+    expected_permissions += [
+      {"groups"=>[],
+        "ipRanges"=>[{"cidrIp"=>"192.168.0.0/24"}],
+        "ipProtocol"=>"tcp",
+        "fromPort"=>80,
+        "toPort"=>80}
+    ]
+
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    # authorize with nested IpProtocol with Groups
+    permissions = {
+      'IpPermissions' => [
         {
-          'SourceSecurityGroupName'     => 'fog_security_group',
-          'SourceSecurityGroupOwnerId'  => @owner_id
+          'IpProtocol' => 'tcp', 'FromPort' => '8000', 'ToPort' => '8000',
+          'Groups' => [{ 'GroupName' => 'fog_security_group_two' }]
+        }
+      ]
+    }
+    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
+    end
+
+    to_be_revoked.push([permissions, expected_permissions.dup])
+
+    expected_permissions += [
+      {"groups"=>[{"userId"=>@owner_id, "groupName"=>"fog_security_group_two"}],
+        "ipRanges"=>[],
+        "ipProtocol"=>"tcp",
+        "fromPort"=>8000,
+        "toPort"=>8000}
+    ]
+
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+      array_differences(expected_permissions, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
+    end
+
+    # authorize with nested IpProtocol with IpRanges and Groups
+    # try integers on this one instead of strings
+    permissions = {
+      'IpPermissions' => [
+        {
+          'IpProtocol' => 'tcp', 'FromPort' => 9000, 'ToPort' => 9000,
+          'IpRanges' => [{ 'CidrIp' => '172.16.0.0/24' }],
+          'Groups' => [{ 'GroupName' => 'fog_security_group_two' }]
         }
-      ).body
+      ]
+    }
+    tests("#authorize_security_group_ingress('fog_security_group', #{permissions.inspect})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', permissions).body
+    end
+
+    to_be_revoked.push([permissions, expected_permissions.dup])
+
+    expected_permissions += [
+      {"groups"=>
+        [{"userId"=>@owner_id, "groupName"=>"fog_security_group_two"}],
+        "ipRanges"=>[{"cidrIp"=>"172.16.0.0/24"}],
+        "ipProtocol"=>"tcp",
+        "fromPort"=>9000,
+        "toPort"=>9000}
+    ]
+
+    tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) 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").formats(@security_groups_format) do
@@ -54,36 +236,29 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body
     end
 
-    tests("#revoke_security_group_ingress('fog_security_group', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].revoke_security_group_ingress(
-        'fog_security_group',
-        {
-          'FromPort' => 80,
-          'IpProtocol' => 'tcp',
-          'ToPort' => 80,
-        }
-      ).body
-    end
+    to_be_revoked.reverse.each do |permission, expected_permissions_after|
+      tests("#revoke_security_group_ingress('fog_security_group', #{permission.inspect})").formats(AWS::Compute::Formats::BASIC) do
+        Fog::Compute[:aws].revoke_security_group_ingress('fog_security_group', permission).body
+      end
 
-    tests("#revoke_security_group_ingress('fog_security_group', {'SourceSecurityGroupName' => 'fog_security_group', 'SourceSecurityGroupOwnerId' => '#{@owner_id}'})").formats(AWS::Compute::Formats::BASIC) do
-      Fog::Compute[:aws].revoke_security_group_ingress(
-      'fog_security_group',
-        {
-          'GroupName'                   => 'fog_security_group',
-          'SourceSecurityGroupName'     => 'fog_security_group',
-          'SourceSecurityGroupOwnerId'  => @owner_id
-        }
-      ).body
+      tests("#describe_security_groups('group-name' => 'fog_security_group')").returns([]) do
+        array_differences(expected_permissions_after, Fog::Compute[:aws].describe_security_groups('group-name' => 'fog_security_group').body['securityGroupInfo'].first['ipPermissions'])
+      end
     end
 
     tests("#delete_security_group('fog_security_group')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_security_group('fog_security_group').body
     end
 
+    tests("#delete_security_group('fog_security_group_two')").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].delete_security_group('fog_security_group_two').body
+    end
+
   end
   tests('failure') do
 
     @security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_security_group')
+    @other_security_group = Fog::Compute[:aws].security_groups.create(:description => 'tests group', :name => 'fog_other_security_group')
 
     tests("duplicate #create_security_group(#{@security_group.name}, #{@security_group.description})").raises(Fog::Compute::AWS::Error) do
       Fog::Compute[:aws].create_security_group(@security_group.name, @security_group.description)
@@ -110,6 +285,46 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
       )
     end
 
+    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]}).body
+    end
+
+    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'IpProtocol' => 'tcp', 'FromPort' => 80, 'ToPort' => 80, 'IpRanges' => [{'CidrIp' => '10.0.0.0/8'}]}]})
+    end
+
+    tests("#authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => '#{@other_security_group.name}'}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]})").formats(AWS::Compute::Formats::BASIC) do
+      Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', {'IpPermissions' => [{'Groups' => [{'GroupName' => @other_security_group.name}], 'FromPort' => 80, 'ToPort' => 80, 'IpProtocol' => 'tcp'}]}).body
+    end
+
+    tests("#delete_security_group('#{@other_security_group.name}')").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].delete_security_group(@other_security_group.name)
+    end
+
+    broken_params = [
+      {},
+      { "IpProtocol" => "what" },
+      { "IpProtocol" => "tcp" },
+      { "IpProtocol" => "what", "FromPort" => 1, "ToPort" => 1 },
+    ]
+    broken_params += broken_params.map do |broken_params_item|
+      { "IpPermissions" => [broken_params_item] }
+    end
+    broken_params += [
+      { "IpPermissions" => [] },
+      { "IpPermissions" => nil }
+    ]
+
+    broken_params.each do |broken_params_item|
+      tests("#authorize_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+        Fog::Compute[:aws].authorize_security_group_ingress('fog_security_group', broken_params_item)
+      end
+
+      tests("#revoke_security_group_ingress('fog_security_group', #{broken_params_item.inspect})").raises(Fog::Compute::AWS::Error) do
+        Fog::Compute[:aws].revoke_security_group_ingress('fog_security_group', broken_params_item)
+      end
+    end
+
     tests("#revoke_security_group_ingress('not_a_group_name', {'FromPort' => 80, 'IpProtocol' => 'tcp', 'toPort' => 80})").raises(Fog::Compute::AWS::NotFound) do
       Fog::Compute[:aws].revoke_security_group_ingress(
         'not_a_group_name',
@@ -136,7 +351,11 @@ Shindo.tests('Fog::Compute[:aws] | security group requests', ['aws']) do
     end
 
     @security_group.destroy
+    @other_security_group.destroy
 
+    tests("#delete_security_group('default')").raises(Fog::Compute::AWS::Error) do
+      Fog::Compute[:aws].delete_security_group('default')
+    end
   end
 
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/compute/tag_tests.rb

@@ -61,6 +61,8 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
       end
     end
 
+    @volume.destroy
+
     tests("#delete_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].delete_tags(@volume.identity, 'foo' => 'bar').body
     end
@@ -72,6 +74,4 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
     end
 
   end
-
-  @volume.destroy
 end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/emr/helper.rb

@@ -0,0 +1,172 @@
+class AWS
+
+  module EMR
+
+    module Formats
+      BASIC = {
+        'RequestId' => String
+      }
+
+      RUN_JOB_FLOW = BASIC.merge({
+        'JobFlowId' => String
+      })
+      
+      ADD_INSTANCE_GROUPS = {
+        'JobFlowId' => String,
+        'InstanceGroupIds' => Array
+      }
+      
+      SIMPLE_DESCRIBE_JOB_FLOW = {
+        'JobFlows' => [{
+          'Name' => String,
+          'BootstrapActions' => {
+            'ScriptBootstrapActionConfig' => {
+              'Args' => Array
+            }
+          },
+          'ExecutionStatusDetail' => {
+            'CreationDateTime' => String,
+            'State' => String,
+            'LastStateChangeReason' => String
+          },
+          'Steps' => [{
+            'ActionOnFailure' => String,
+            'Name' => String,
+            'StepConfig' => {
+              'HadoopJarStepConfig' => {
+                'MainClass' => String,
+                'Jar' => String,
+                'Args' => Array,
+                'Properties' => Array
+              }
+            },
+            'ExecutionStatusDetail' => {
+              'CreationDateTime' => String,
+              'State' => String
+            }
+          }],
+          'JobFlowId' => String,
+          'Instances' => {
+            'InstanceCount' => String,
+            'NormalizedInstanceHours' => String,
+            'KeepJobFlowAliveWhenNoSteps' => String,
+            'Placement' => {
+              'AvailabilityZone' => String
+            },
+            'MasterInstanceType' => String,
+            'SlaveInstanceType' => String,
+            'InstanceGroups' => Array,
+            'TerminationProtected' => String,
+            'HadoopVersion' => String
+          }
+        }]
+      }
+      
+      JOB_FLOW_WITHOUT_CHANGE = {
+        'JobFlows' => [{
+          'Name' => String,
+          'BootstrapActions' => {
+            'ScriptBootstrapActionConfig' => {
+              'Args' => Array
+            }
+          },
+          'ExecutionStatusDetail' => {
+            'CreationDateTime' => String,
+            'State' => String,
+            'LastStateChangeReason' => NilClass
+          },
+          'Steps' => [{
+            'ActionOnFailure' => String,
+            'Name' => String,
+            'StepConfig' => {
+              'HadoopJarStepConfig' => {
+                'MainClass' => String,
+                'Jar' => String,
+                'Args' => Array,
+                'Properties' => Array
+              }
+            },
+            'ExecutionStatusDetail' => {
+              'CreationDateTime' => String,
+              'State' => String
+            }
+          }],
+          'JobFlowId' => String,
+          'Instances' => {
+            'InstanceCount' => String,
+            'NormalizedInstanceHours' => String,
+            'KeepJobFlowAliveWhenNoSteps' => String,
+            'Placement' => {
+              'AvailabilityZone' => String
+            },
+            'MasterInstanceType' => String,
+            'SlaveInstanceType' => String,
+            'InstanceGroups' => Array,
+            'TerminationProtected' => String,
+            'HadoopVersion' => String
+          }
+        }]
+      }
+      
+      DESCRIBE_JOB_FLOW_WITH_INSTANCE_GROUPS = {
+        'JobFlows' => [{
+          'Name' => String,
+          'BootstrapActions' => {
+            'ScriptBootstrapActionConfig' => {
+              'Args' => Array
+            }
+          },
+          'ExecutionStatusDetail' => {
+            'CreationDateTime' => String,
+            'State' => String,
+            'LastStateChangeReason' => NilClass
+          },
+          'Steps' => [{
+            'ActionOnFailure' => String,
+            'Name' => String,
+            'StepConfig' => {
+              'HadoopJarStepConfig' => {
+                'MainClass' => String,
+                'Jar' => String,
+                'Args' => Array,
+                'Properties' => Array
+              }
+            },
+            'ExecutionStatusDetail' => {
+              'CreationDateTime' => String,
+              'State' => String
+            }
+          }],
+          'JobFlowId' => String,
+          'Instances' => {
+            'InstanceCount' => String,
+            'NormalizedInstanceHours' => String,
+            'KeepJobFlowAliveWhenNoSteps' => String,
+            'Placement' => {
+              'AvailabilityZone' => String
+            },
+            'InstanceGroups' => [{
+              'Name' => String,
+              'InstanceRole' => String,
+              'CreationDateTime' => String,
+              'LastStateChangeReason' => nil,
+              'InstanceGroupId' => String,
+              'Market' => String,
+              'InstanceType' => String,
+              'State' => String,
+              'InstanceRunningCount' => String,
+              'InstanceRequestCount' => String
+            }],
+            'MasterInstanceType' => String,
+            'SlaveInstanceType' => String,
+            'InstanceGroups' => Array,
+            'TerminationProtected' => String,
+            'HadoopVersion' => String
+          }
+        }]
+      }
+
+    end
+  end
+
+end

data/lib/brightbox-cli/vendor/fog/tests/aws/requests/emr/instance_group_tests.rb

@@ -0,0 +1,106 @@
+Shindo.tests('AWS::EMR | instance groups', ['aws', 'emr']) do
+
+  pending if Fog.mocking?
+
+  @job_flow_name = "fog_job_flow_#{Time.now.to_f.to_s.gsub('.','')}"
+
+  @job_flow_options = {
+    'Instances' => {
+      'MasterInstanceType' => 'm1.small',
+      'SlaveInstanceType' => 'm1.small',
+      'InstanceCount' => 2,
+      'Placement' => {
+        'AvailabilityZone' => 'us-east-1a'
+      },
+      'KeepJobFlowAliveWhenNoSteps' => false,
+      'TerminationProtected' => false,
+      'HadoopVersion' => '0.20'
+    }
+  }
+
+  @job_flow_steps = {
+    'Steps' => [{
+      'Name' => 'Dummy streaming job',
+      'ActionOnFailure' => 'CONTINUE',
+      'HadoopJarStep' => {
+        'Jar' => '/home/hadoop/contrib/streaming/hadoop-streaming.jar',
+        'MainClass' => nil,
+        'Args' => %w(-input s3n://elasticmapreduce/samples/wordcount/input -output hdfs:///examples/output/2011-11-03T090856 -mapper s3n://elasticmapreduce/samples/wordcount/wordSplitter.py -reducer aggregate)
+      }
+    }]
+  }
+
+  @instance_group_name = "fog_instance_group_#{Time.now.to_f.to_s.gsub('.','')}"
+  @instance_groups = {
+    'InstanceGroups' => [{
+      'Name' => @instance_group_name,
+      'InstanceRole' => 'TASK',
+      'InstanceType' => 'm1.small',
+      'InstanceCount' => 2
+    }]
+  }
+
+  result = AWS[:emr].run_job_flow(@job_flow_name, @job_flow_options).body
+  @job_flow_id = result['JobFlowId']
+
+  tests('success') do
+
+    tests("#add_instance_groups").formats(AWS::EMR::Formats::ADD_INSTANCE_GROUPS) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].add_instance_groups(@job_flow_id, @instance_groups).body
+
+      @instance_group_id = result['InstanceGroupIds'].first
+
+      result
+    end
+
+    tests("#describe_job_flows_with_instance_groups").formats(AWS::EMR::Formats::DESCRIBE_JOB_FLOW_WITH_INSTANCE_GROUPS) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body
+
+      result
+    end
+
+    tests("#modify_instance_groups").formats(AWS::EMR::Formats::BASIC) do
+      pending if Fog.mocking?
+
+      # Add a step so the state doesn't go directly from STARTING to SHUTTING_DOWN
+      AWS[:emr].add_job_flow_steps(@job_flow_id, @job_flow_steps)
+
+      # Wait until job has started before modifying the instance group
+      begin
+        sleep 10
+
+        result = AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body
+        job_flow = result['JobFlows'].first
+        state = job_flow['ExecutionStatusDetail']['State']
+        print "."
+      end while(state == 'STARTING')
+
+      # Check results
+      result = AWS[:emr].modify_instance_groups('InstanceGroups' => [{'InstanceGroupId' => @instance_group_id, 'InstanceCount' => 4}]).body
+
+      # Check the it actually modified the instance count
+      tests("modify worked?") do
+        ig_res = AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body
+
+        matched = false
+        jf = ig_res['JobFlows'].first
+        jf['Instances']['InstanceGroups'].each do | ig |
+          if ig['InstanceGroupId'] == @instance_group_id
+            matched = true if ig['InstanceRequestCount'].to_i == 4
+          end
+        end
+
+        matched
+      end
+
+      result
+    end
+
+  end
+
+  AWS[:emr].terminate_job_flows('JobFlowIds' => [@job_flow_id])
+end