elasticity 5.0.1 → 5.0.2

data/spec/lib/elasticity/aws_session_spec.rb

@@ -0,0 +1,191 @@
+describe Elasticity::AwsSession do
+
+  before do
+    Timecop.freeze(Time.at(1302461096))
+  end
+
+  after do
+    Timecop.return
+  end
+
+  subject do
+    Elasticity::AwsSession.new('access', 'secret')
+  end
+
+  describe '#initialize' do
+
+    context 'when access and/or secret keys are provided' do
+      it 'should set them to the provided values' do
+        subject.access_key.should == 'access'
+        subject.secret_key.should == 'secret'
+        subject.region.should == 'us-east-1'
+      end
+    end
+
+    context 'when :region is nil' do
+      it 'should be an error' do
+        expect {
+          Elasticity::AwsSession.new('_', '_', :region => nil)
+        }.to raise_error Elasticity::MissingRegionError, 'A valid :region is required to connect to EMR'
+      end
+    end
+
+    context 'when :region is specified' do
+      Elasticity::AwsSession.new('_', '_', :region => 'TEST_REGION').region.should == 'TEST_REGION'
+    end
+
+    context 'when either access or secret key is not provided or nil' do
+
+      context 'when the proper environment variables are set' do
+
+        context 'when access and secret key are not provided' do
+          let(:default_values) { Elasticity::AwsSession.new }
+          before do
+            ENV.stub(:[]).with('AWS_ACCESS_KEY_ID').and_return('ENV_ACCESS')
+            ENV.stub(:[]).with('AWS_SECRET_ACCESS_KEY').and_return('ENV_SECRET')
+          end
+          it 'should set access and secret keys' do
+            default_values.access_key.should == 'ENV_ACCESS'
+            default_values.secret_key.should == 'ENV_SECRET'
+          end
+        end
+
+        context 'when access and secret key are nil' do
+          let(:nil_values) { Elasticity::AwsSession.new(nil, nil) }
+          before do
+            ENV.stub(:[]).with('AWS_ACCESS_KEY_ID').and_return('ENV_ACCESS')
+            ENV.stub(:[]).with('AWS_SECRET_ACCESS_KEY').and_return('ENV_SECRET')
+          end
+          it 'should set access and secret keys' do
+            nil_values.access_key.should == 'ENV_ACCESS'
+            nil_values.secret_key.should == 'ENV_SECRET'
+          end
+        end
+
+      end
+
+      context 'when the environment variables are not set' do
+        let(:missing_something) { Elasticity::AwsSession.new }
+        context 'when the access key is not set' do
+          before do
+            ENV.stub(:[]).with('AWS_ACCESS_KEY_ID').and_return(nil)
+            ENV.stub(:[]).with('AWS_SECRET_ACCESS_KEY').and_return('_')
+          end
+          it 'should raise an error' do
+            expect {
+              missing_something.access_key
+            }.to raise_error(Elasticity::MissingKeyError, 'Please provide an access key or set AWS_ACCESS_KEY_ID.')
+          end
+        end
+        context 'when the secret key is not set' do
+          before do
+            ENV.stub(:[]).with('AWS_ACCESS_KEY_ID').and_return('_')
+            ENV.stub(:[]).with('AWS_SECRET_ACCESS_KEY').and_return(nil)
+          end
+          it 'should raise an error' do
+            expect {
+              missing_something.access_key
+            }.to raise_error(Elasticity::MissingKeyError, 'Please provide a secret key or set AWS_SECRET_ACCESS_KEY.')
+          end
+        end
+      end
+
+    end
+
+  end
+
+  describe '#host' do
+
+    context 'when the region is not specified' do
+      its(:host) { should == 'elasticmapreduce.us-east-1.amazonaws.com' }
+    end
+
+    context 'when the region is specified' do
+      let(:request_with_region) do
+        Elasticity::AwsSession.new('_', '_', {:region => 'us-west-1'})
+      end
+      it 'should incorporate the region into the hostname' do
+        request_with_region.host.should == 'elasticmapreduce.us-west-1.amazonaws.com'
+      end
+    end
+
+  end
+
+  describe '#submit' do
+
+    context 'when there is not an error with the request' do
+      before do
+        @request = Elasticity::AwsRequestV4.new(subject, {})
+        @request.should_receive(:url).and_return('TEST_URL')
+        @request.should_receive(:payload).and_return('TEST_PAYLOAD')
+        @request.should_receive(:headers).and_return('TEST_HEADERS')
+
+        Elasticity::AwsRequestV4.should_receive(:new).with(subject, {}).and_return(@request)
+        RestClient.should_receive(:post).with('TEST_URL', 'TEST_PAYLOAD', 'TEST_HEADERS')
+      end
+
+      it 'should POST a properly assembled request' do
+        subject.submit({})
+      end
+    end
+
+    context 'when there is an EMR error with the request' do
+      let(:error_message) { 'ERROR_MESSAGE' }
+      let(:error_xml) do
+        <<-XML
+          <ErrorResponse xmlns="http://elasticmapreduce.amazonaws.com/doc/2009-03-31">
+            <Error>
+              <Message>#{error_message}</Message>
+            </Error>
+          </ErrorResponse>
+        XML
+      end
+      let(:error) do
+        RestClient::BadRequest.new.tap do |error|
+          error.stub(:http_body => error_xml)
+        end
+      end
+
+      it 'should raise an Argument error with the body of the error' do
+        RestClient.should_receive(:post).and_raise(error)
+        expect {
+          subject.submit({})
+        }.to raise_error(ArgumentError, error_message)
+      end
+    end
+
+  end
+
+  describe '#==' do
+
+    describe 'basic equality checks with subject' do
+      let(:same_object) { subject }
+      let(:same_values) { Elasticity::AwsSession.new('access', 'secret', {}) }
+      let(:diff_type) { Object.new }
+
+      it { should == same_object }
+      it { should == same_values }
+      it { should_not == diff_type }
+    end
+
+    describe 'deep comparisons' do
+
+      it 'should fail on access key check' do
+        Elasticity::AwsSession.new('access', '_').should_not == Elasticity::AwsSession.new('_', '_')
+      end
+
+      it 'should fail on secret key check' do
+        Elasticity::AwsSession.new('_', 'secret').should_not == Elasticity::AwsSession.new('_', '_')
+      end
+
+      it 'should fail on host check' do
+        aws1 = Elasticity::AwsSession.new('_', '_', :region => 'us-east-1')
+        aws2 = Elasticity::AwsSession.new('_', '_', :region => 'us-west-1')
+        aws1.should_not == aws2
+      end
+
+    end
+
+  end
+
+end

data/spec/lib/elasticity/aws_utils_spec.rb

@@ -0,0 +1,105 @@
+describe Elasticity::AwsUtils do
+
+  describe '.convert_ruby_to_aws_v4' do
+    it 'should convert the params' do
+      add_jobflow_steps_params = {
+        :job_flow_id => 'j-1',
+        :string_values => [
+          'value1', 'value2'
+        ],
+        :steps => [
+          {
+            :action_on_failure => 'CONTINUE',
+            :name => 'First New Job Step',
+            :hadoop_jar_step => {
+              :args => %w(arg1 arg2 arg3),
+              :jar => 'first_step.jar',
+              :main_class => 'first_class.jar'
+            }
+          },
+          {
+            :action_on_failure => 'CANCEL_AND_WAIT',
+            :name => 'Second New Job Step',
+            :hadoop_jar_step => {
+              :args => %w(arg4 arg5 arg6),
+              :jar => 'second_step.jar',
+              :main_class => 'second_class.jar'
+            }
+          }
+        ]
+      }
+      expected_result = {
+        'JobFlowId' => 'j-1',
+        'StringValues' => ['value1', 'value2'],
+        'Steps' => [
+          {
+            'ActionOnFailure' => 'CONTINUE',
+            'Name' => 'First New Job Step',
+            'HadoopJarStep' => {
+              'Args' => %w(arg1 arg2 arg3),
+              'Jar' => 'first_step.jar',
+              'MainClass' => 'first_class.jar'
+            }
+          },
+          {
+            'ActionOnFailure' => 'CANCEL_AND_WAIT',
+            'Name' => 'Second New Job Step',
+            'HadoopJarStep' => {
+              'Args' => %w(arg4 arg5 arg6),
+              'Jar' => 'second_step.jar',
+              'MainClass' => 'second_class.jar'
+            }
+          }
+        ]
+      }
+      Elasticity::AwsUtils.send(:convert_ruby_to_aws_v4, add_jobflow_steps_params).should == expected_result
+    end
+  end
+
+  describe '.convert_ruby_to_aws' do
+    it 'should convert the params' do
+      add_jobflow_steps_params = {
+        :job_flow_id => 'j-1',
+        :steps => [
+          {
+            :action_on_failure => 'CONTINUE',
+            :name => 'First New Job Step',
+            :hadoop_jar_step => {
+              :args => %w(arg1 arg2 arg3),
+              :jar => 'first_step.jar',
+              :main_class => 'first_class.jar'
+            }
+          },
+          {
+            :action_on_failure => 'CANCEL_AND_WAIT',
+            :name => 'Second New Job Step',
+            :hadoop_jar_step => {
+              :args => %w(arg4 arg5 arg6),
+              :jar => 'second_step.jar',
+              :main_class => 'second_class.jar'
+            }
+          }
+        ]
+      }
+      expected_result = {
+        'JobFlowId' => 'j-1',
+        'Steps.member.1.Name' => 'First New Job Step',
+        'Steps.member.1.ActionOnFailure' => 'CONTINUE',
+        'Steps.member.1.HadoopJarStep.Jar' => 'first_step.jar',
+        'Steps.member.1.HadoopJarStep.MainClass' => 'first_class.jar',
+        'Steps.member.1.HadoopJarStep.Args.member.1' => 'arg1',
+        'Steps.member.1.HadoopJarStep.Args.member.2' => 'arg2',
+        'Steps.member.1.HadoopJarStep.Args.member.3' => 'arg3',
+        'Steps.member.2.Name' => 'Second New Job Step',
+        'Steps.member.2.ActionOnFailure' => 'CANCEL_AND_WAIT',
+        'Steps.member.2.HadoopJarStep.Jar' => 'second_step.jar',
+        'Steps.member.2.HadoopJarStep.MainClass' => 'second_class.jar',
+        'Steps.member.2.HadoopJarStep.Args.member.1' => 'arg4',
+        'Steps.member.2.HadoopJarStep.Args.member.2' => 'arg5',
+        'Steps.member.2.HadoopJarStep.Args.member.3' => 'arg6'
+      }
+      Elasticity::AwsUtils.send(:convert_ruby_to_aws, add_jobflow_steps_params).should == expected_result
+    end
+  end
+
+end

data/spec/lib/elasticity/emr_spec.rb

@@ -7,7 +7,7 @@ describe Elasticity::EMR do
   describe '.new' do
 
     context 'when arguments are provided' do
-      its(:aws_request) { should == Elasticity::AwsRequest.new('ACCESS', 'SECRET', {}) }
+      its(:aws_request) { should == Elasticity::AwsSession.new('ACCESS', 'SECRET', {}) }
     end
 
     context 'when arguments are not provided' do
@@ -17,7 +17,7 @@ describe Elasticity::EMR do
       end
       it 'should use environment variables' do
         emr = Elasticity::EMR.new
-        emr.aws_request.should == Elasticity::AwsRequest.new('ENV_ACCESS', 'ENV_SECRET', {})
+        emr.aws_request.should == Elasticity::AwsSession.new('ENV_ACCESS', 'ENV_SECRET', {})
       end
     end
 
@@ -26,7 +26,7 @@ describe Elasticity::EMR do
   describe '#add_instance_groups' do
 
     it 'should send the correct params to AWS' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with({
         :operation => 'AddInstanceGroups',
         :job_flow_id => 'JOBFLOW_ID',
         :instance_groups => ['INSTANCE_GROUP_CONFIGS']
@@ -51,7 +51,7 @@ describe Elasticity::EMR do
       end
 
       it 'should return an array of the new instance groups IDs' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(aws_response)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(aws_response)
         subject.add_instance_groups('', []).should == ['ig-1', 'ig-2', 'ig-3']
       end
     end
@@ -59,7 +59,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { 'RESULT' }
       it 'should yield the submission results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.add_instance_groups('', []) do |xml|
           xml.should == 'RESULT'
         end
@@ -71,7 +71,7 @@ describe Elasticity::EMR do
   describe '#add_jobflow_steps' do
 
     it 'should add the specified steps to the job flow' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with({
         :operation => 'AddJobFlowSteps',
         :job_flow_id => 'JOBFLOW_ID',
         :steps => ['_']
@@ -82,7 +82,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { 'RESULT' }
       it 'should yield the submission results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.add_jobflow_steps('', {}) do |xml|
           xml.should == 'RESULT'
         end
@@ -121,14 +121,14 @@ describe Elasticity::EMR do
     end
 
     it 'should return an array of properly populated JobFlowStatusES' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(describe_jobflows_xml)
+      Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(describe_jobflows_xml)
       jobflow_statuses = subject.describe_jobflows
       jobflow_statuses.map(&:name).should == ['Pig Job', 'Hive Job']
       jobflow_statuses.map(&:class).should == [Elasticity::JobFlowStatus, Elasticity::JobFlowStatus]
     end
 
     it 'should describe all jobflows' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with({
         :operation => 'DescribeJobFlows'
       })
       subject.describe_jobflows
@@ -136,7 +136,7 @@ describe Elasticity::EMR do
 
     context 'when additional parameters are provided' do
       it 'should pass them through' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+        Elasticity::AwsSession.any_instance.should_receive(:submit).with({
           :CreatedBefore => '2011-10-04',
           :operation => 'DescribeJobFlows'
         })
@@ -147,7 +147,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { 'RESULT' }
       it 'should yield the submission results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.describe_jobflows do |xml|
           xml.should == 'RESULT'
         end
@@ -178,7 +178,7 @@ describe Elasticity::EMR do
     }
 
     it 'should describe the specified jobflow' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with({
         :operation => 'DescribeJobFlows',
         :job_flow_ids => ['j-3UN6WX5RRO2AG']
       })
@@ -186,7 +186,7 @@ describe Elasticity::EMR do
     end
 
     it 'should return a properly populated JobFlowStatus' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(describe_jobflows_xml)
+      Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(describe_jobflows_xml)
       jobflow_status = subject.describe_jobflow('_')
       jobflow_status.should be_a Elasticity::JobFlowStatus
       jobflow_status.jobflow_id.should == 'j-3UN6WX5RRO2AG'
@@ -195,7 +195,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { 'RESULT' }
       it 'should yield the submission results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.describe_jobflow('') do |xml|
           xml.should == 'RESULT'
         end
@@ -218,7 +218,7 @@ describe Elasticity::EMR do
   describe '#modify_instance_groups' do
 
     it 'should modify the specified instance groups' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with({
         :operation => 'ModifyInstanceGroups',
         :instance_groups => [{
           :instance_group_id => 'ig-2T1HNUO61BG3O',
@@ -231,7 +231,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { '_' }
       it 'should yield the submission results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.modify_instance_groups({}) do |xml|
           xml.should == '_'
         end
@@ -243,7 +243,7 @@ describe Elasticity::EMR do
   describe '#run_jobflow' do
 
     it 'should start the specified job flow' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with({
         :operation => 'RunJobFlow',
         :jobflow_params => '_'
       })
@@ -265,7 +265,7 @@ describe Elasticity::EMR do
       end
 
       it 'should return the ID of the running job flow' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(jobflow_xml_response)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(jobflow_xml_response)
         subject.run_job_flow({}).should == 'j-G6N5HA528AD4'
       end
     end
@@ -273,7 +273,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { '_' }
       it 'should yield the submission results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.run_job_flow({}) do |xml|
           xml.should == '_'
         end
@@ -285,7 +285,7 @@ describe Elasticity::EMR do
   describe '#terminate_jobflows' do
 
     it 'should terminate the specific jobflow' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with({
         :operation => 'TerminateJobFlows',
         :job_flow_ids => ['j-1']
       })
@@ -295,7 +295,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { '_' }
       it 'should yield the termination results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.terminate_jobflows('j-1') do |xml|
           xml.should == '_'
         end
@@ -308,7 +308,7 @@ describe Elasticity::EMR do
 
     context 'when protection is enabled' do
       it 'should enable protection on the specified jobflows' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+        Elasticity::AwsSession.any_instance.should_receive(:submit).with({
           :operation => 'SetTerminationProtection',
           :termination_protected => true,
           :job_flow_ids => ['jobflow1', 'jobflow2']
@@ -319,7 +319,7 @@ describe Elasticity::EMR do
 
     context 'when protection is disabled' do
       it 'should disable protection on the specified jobflows' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+        Elasticity::AwsSession.any_instance.should_receive(:submit).with({
           :operation => 'SetTerminationProtection',
           :termination_protected => false,
           :job_flow_ids => ['jobflow1', 'jobflow2']
@@ -330,7 +330,7 @@ describe Elasticity::EMR do
 
     context 'when protection is not specified' do
       it 'should enable protection on the specified jobflows' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).with({
+        Elasticity::AwsSession.any_instance.should_receive(:submit).with({
           :operation => 'SetTerminationProtection',
           :termination_protected => true,
           :job_flow_ids => ['jobflow1', 'jobflow2']
@@ -342,7 +342,7 @@ describe Elasticity::EMR do
     context 'when a block is given' do
       let(:result) { '_' }
       it 'should yield the termination results' do
-        Elasticity::AwsRequest.any_instance.should_receive(:submit).and_return(result)
+        Elasticity::AwsSession.any_instance.should_receive(:submit).and_return(result)
         subject.set_termination_protection([]) do |xml|
           xml.should == '_'
         end
@@ -355,7 +355,7 @@ describe Elasticity::EMR do
     let(:params) { {:foo => 'bar'} }
 
     it 'should pass through directly to the request and return the results of the request' do
-      Elasticity::AwsRequest.any_instance.should_receive(:submit).with(params).and_return('RESULT')
+      Elasticity::AwsSession.any_instance.should_receive(:submit).with(params).and_return('RESULT')
       subject.direct(params).should == 'RESULT'
     end
   end