fog 1.0.0 → 1.1.0

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

@@ -13,14 +13,56 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
   @volume.wait_for { ready? }
 
   tests('success') do
+    if Fog.mocking?
+      @other_account = Fog::Compute::AWS.new(:aws_access_key_id => 'other', :aws_secret_access_key => 'account')
+      @image_id = Fog::Compute[:aws].register_image('image', 'image', '/dev/sda1').body['imageId']
+    end
+
     tests("#create_tags('#{@volume.identity}', 'foo' => 'bar')").formats(AWS::Compute::Formats::BASIC) do
       Fog::Compute[:aws].create_tags(@volume.identity, 'foo' => 'bar').body
     end
 
+    if Fog.mocking?
+      tests("#create_tags('#{@image_id}', 'foo' => 'baz')").formats(AWS::Compute::Formats::BASIC) do
+        Fog::Compute[:aws].create_tags(@image_id, 'foo' => 'baz').body
+      end
+    end
+
     tests('#describe_tags').formats(@tags_format) do
       Fog::Compute[:aws].describe_tags.body
     end
 
+    expected_identities = Fog.mocking? ? [@volume.identity, @image_id] : [@volume.identity]
+    tests('#describe_tags').succeeds do
+      (expected_identities - Fog::Compute[:aws].describe_tags.body['tagSet'].map {|t| t['resourceId'] }).empty?
+    end
+
+    tests("#describe_tags('key' => 'foo', 'value' => 'bar')").returns([@volume.identity]) do
+      Fog::Compute[:aws].describe_tags('key' => 'foo', 'value' => 'bar').body['tagSet'].map {|t| t['resourceId'] }
+    end
+
+    if Fog.mocking?
+      tests("#describe_tags('key' => 'foo', 'value' => 'baz')").returns([@image_id]) do
+        Fog::Compute[:aws].describe_tags('key' => 'foo', 'value' => 'baz').body['tagSet'].map {|t| t['resourceId'] }
+      end
+
+      Fog::Compute[:aws].modify_image_attribute(@image_id, 'Add.UserId' => [@other_account.data[:owner_id]])
+
+      tests("other_account#describe_tags('key' => 'foo', 'value' => 'baz')").returns([]) do
+        @other_account.describe_tags('key' => 'foo', 'value' => 'baz').body['tagSet'].map {|t| t['resourceId'] }
+      end
+
+      tests("other_account#create_tags('#{@image_id}', 'foo' => 'quux')").formats(AWS::Compute::Formats::BASIC) do
+        @other_account.create_tags(@image_id, 'foo' => 'quux').body
+      end
+
+      tests("other_account#describe_tags('key' => 'foo', 'value' => 'quux')").returns([@image_id]) do
+        @other_account.describe_tags('key' => 'foo', 'value' => 'quux').body['tagSet'].map {|t| t['resourceId'] }
+      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
@@ -32,6 +74,4 @@ Shindo.tests('Fog::Compute[:aws] | tag requests', ['aws']) do
     end
 
   end
-
-  @volume.destroy
 end

data/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/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

data/tests/aws/requests/emr/job_flow_tests.rb

@@ -0,0 +1,88 @@
+Shindo.tests('AWS::EMR | job flows', ['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'
+    }
+  }
+
+  @step_name = "fog_job_flow_step_#{Time.now.to_f.to_s.gsub('.','')}"
+
+  @job_flow_steps = {
+    'Steps' => [{
+      'Name' => @step_name,
+      'ActionOnFailure' => 'CONTINUE',
+      'HadoopJarStep' => {
+        'Jar' => 'FakeJar',
+        'MainClass' => 'FakeMainClass',
+        'Args' => ['arg1', 'arg2']
+      }
+    }]
+  }
+
+  @job_flow_id = nil
+
+  tests('success') do
+
+    tests("#run_job_flow").formats(AWS::EMR::Formats::RUN_JOB_FLOW) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].run_job_flow(@job_flow_name, @job_flow_options).body
+      @job_flow_id = result['JobFlowId']
+
+      result
+    end
+
+    tests("#add_job_flow_steps").formats(AWS::EMR::Formats::BASIC) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].add_job_flow_steps(@job_flow_id, @job_flow_steps).body
+
+      result
+    end
+
+    tests("#set_termination_protection").formats(AWS::EMR::Formats::BASIC) do
+
+      result = AWS[:emr].set_termination_protection(true, 'JobFlowIds' => [@job_flow_id]).body
+
+      test("protected?") do
+        res = AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body
+        jf = res['JobFlows'].first
+
+        jf['Instances']['TerminationProtected'] == 'true'
+      end
+
+      result
+    end
+
+    tests("#terminate_job_flow").formats(AWS::EMR::Formats::BASIC) do
+      pending if Fog.mocking?
+      AWS[:emr].set_termination_protection(false, 'JobFlowIds' => [@job_flow_id])
+
+      result = AWS[:emr].terminate_job_flows('JobFlowIds' => [@job_flow_id]).body
+
+      result
+    end
+
+    tests("#describe_job_flows").formats(AWS::EMR::Formats::SIMPLE_DESCRIBE_JOB_FLOW) do
+      pending if Fog.mocking?
+
+      result = AWS[:emr].describe_job_flows('JobFlowIds' => [@job_flow_id]).body
+
+      result
+    end
+
+  end
+end

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

@@ -1,17 +1,25 @@
 Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
   @key_name = 'fog-test'
+  @key_name_chained = 'fog-test-chained'
 
   @certificate_format = {
-  'Arn' => String,
-  'Path' => String,
-  'ServerCertificateId' => String,
-  'ServerCertificateName' => String,
-  'UploadDate' => Time
+    'Arn' => String,
+    'Path' => String,
+    'ServerCertificateId' => String,
+    'ServerCertificateName' => String,
+    'UploadDate' => Time
   }
   @upload_format = {
     'Certificate' => @certificate_format,
     'RequestId' => String
   }
+  @get_server_certificate_format = {
+    'Certificate' => @certificate_format,
+    'RequestId' => String
+  }
+  @list_format = {
+    'Certificates' => [@certificate_format]
+  }
 
   tests('#upload_server_certificate') do
     public_key  = AWS::IAM::SERVER_CERT_PUBLIC_KEY
@@ -42,19 +50,22 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
       Fog::AWS::IAM.new.upload_server_certificate(public_key, private_key, @key_name).body
     end
 
+    tests('format with chain').formats(@upload_format) do
+      Fog::AWS::IAM.new.upload_server_certificate(public_key, private_key, @key_name_chained, { 'CertificateChain' => public_key }).body
+    end
+
     tests('duplicate name').raises(Fog::AWS::IAM::EntityAlreadyExists) do
       Fog::AWS::IAM.new.upload_server_certificate(public_key, private_key, @key_name)
     end
   end
 
-  tests('#get_server_certificate').formats(@upload_format) do
+  tests('#get_server_certificate').formats(@get_server_certificate_format) do
     tests('raises NotFound').raises(Fog::AWS::IAM::NotFound) do
       Fog::AWS::IAM.new.get_server_certificate("#{@key_name}fake")
     end
     Fog::AWS::IAM.new.get_server_certificate(@key_name).body
   end
 
-  @list_format = { 'Certificates' => [@certificate_format] }
   tests('#list_server_certificates').formats(@list_format) do
     result = Fog::AWS::IAM.new.list_server_certificates.body
     tests('includes key name') do
@@ -74,4 +85,6 @@ Shindo.tests('AWS::IAM | server certificate requests', ['aws']) do
   tests('#delete_server_certificate').formats(AWS::IAM::Formats::BASIC) do
     Fog::AWS::IAM.new.delete_server_certificate(@key_name).body
   end
+
+  Fog::AWS::IAM.new.delete_server_certificate(@key_name_chained)
 end