elasticity 4.0.3 → 4.0.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +8 -8
- data/HISTORY.md +4 -0
- data/lib/elasticity/job_flow.rb +3 -1
- data/lib/elasticity/version.rb +1 -1
- data/spec/lib/elasticity/job_flow_spec.rb +27 -1
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,15 +1,15 @@
|
|
1
1
|
---
|
2
2
|
!binary "U0hBMQ==":
|
3
3
|
metadata.gz: !binary |-
|
4
|
-
|
4
|
+
NjMwYWE1NmQ1YzBlYTliNzJmMWMzNTZlOTA2NTIxZDc1YjBlMDQxMw==
|
5
5
|
data.tar.gz: !binary |-
|
6
|
-
|
6
|
+
ODE2ZDdmNWZkZWI5MDM0NjRiZGMxM2RmYWMyMTA0Mjk5NjkzYWVhMQ==
|
7
7
|
SHA512:
|
8
8
|
metadata.gz: !binary |-
|
9
|
-
|
10
|
-
|
11
|
-
|
9
|
+
YWU5ZTI0Mjg3ZWVlYjMzYTYwMDYyNjkyOGRlNmUyNDMxOGEyYWI3NDQwODNj
|
10
|
+
MTkzOTlkZGJhZmJhNzJhNzM5NzM0YmJmN2YzZTE0YjZmYWIzNTYzNzE1YWYx
|
11
|
+
ZTExMDQ1NTk3YzkwM2RiMzMwNTY5NmJjZjA0MGY4MDkyYjI3ZDM=
|
12
12
|
data.tar.gz: !binary |-
|
13
|
-
|
14
|
-
|
15
|
-
|
13
|
+
YTM2Nzk3NGFkMjA2YzU5M2Y3NTU1NWM4ZmQ1ZmY3ZWY2NWVkN2IzMjE1YzVj
|
14
|
+
MTU0NTlkMWMzYjlhMjJmYTk5ZThmM2ZiM2U3YjM4MjdhY2EwNzUzM2I2ODAx
|
15
|
+
ZGZiNzEzN2JkODRjOGEzNGM3MjVkMTJlNzBhZmEyZTdiNzVlYTU=
|
data/HISTORY.md
CHANGED
@@ -1,3 +1,7 @@
|
|
1
|
+
## 4.0.4 - November 20, 2014
|
2
|
+
|
3
|
+
- Thanks to @jshafton, pull request [#79](https://github.com/rslifka/elasticity/pull/79) adds support for job flow roles.
|
4
|
+
|
1
5
|
## 4.0.3 - November 12, 2014
|
2
6
|
|
3
7
|
- Thanks to @ilyakava, pull request [#78](https://github.com/rslifka/elasticity/pull/78) fixes a bug in the "wait for completion" feature.
|
data/lib/elasticity/job_flow.rb
CHANGED
@@ -22,6 +22,7 @@ module Elasticity
|
|
22
22
|
attr_accessor :region
|
23
23
|
attr_accessor :visible_to_all_users
|
24
24
|
attr_accessor :enable_debugging
|
25
|
+
attr_accessor :job_flow_role
|
25
26
|
|
26
27
|
attr_reader :access_key
|
27
28
|
attr_reader :secret_key
|
@@ -185,6 +186,7 @@ module Elasticity
|
|
185
186
|
steps.insert(0, Elasticity::SetupHadoopDebuggingStep.new.to_aws_step(self)) if @enable_debugging
|
186
187
|
config[:steps] = steps
|
187
188
|
config[:log_uri] = @log_uri if @log_uri
|
189
|
+
config[:job_flow_role] = @job_flow_role if @job_flow_role
|
188
190
|
config[:bootstrap_actions] = @bootstrap_actions.map{|a| a.to_aws_bootstrap_action} unless @bootstrap_actions.empty?
|
189
191
|
config
|
190
192
|
end
|
@@ -229,4 +231,4 @@ module Elasticity
|
|
229
231
|
|
230
232
|
end
|
231
233
|
|
232
|
-
end
|
234
|
+
end
|
data/lib/elasticity/version.rb
CHANGED
@@ -344,6 +344,32 @@ describe Elasticity::JobFlow do
|
|
344
344
|
|
345
345
|
end
|
346
346
|
|
347
|
+
describe 'job flow role' do
|
348
|
+
|
349
|
+
context 'when a job flow role is specified' do
|
350
|
+
let(:jobflow_with_job_flow_role) do
|
351
|
+
Elasticity::JobFlow.new('_', '_').tap do |jf|
|
352
|
+
jf.job_flow_role = 'JOB_FLOW_ROLE'
|
353
|
+
end
|
354
|
+
end
|
355
|
+
it 'should incorporate it into the jobflow config' do
|
356
|
+
jobflow_with_job_flow_role.send(:jobflow_config).should be_a_hash_including({:job_flow_role => 'JOB_FLOW_ROLE'})
|
357
|
+
end
|
358
|
+
end
|
359
|
+
|
360
|
+
context 'when a log URI is not specified' do
|
361
|
+
let(:jobflow_with_no_job_flow_role) do
|
362
|
+
Elasticity::JobFlow.new('_', '_').tap do |jf|
|
363
|
+
jf.job_flow_role = nil
|
364
|
+
end
|
365
|
+
end
|
366
|
+
it 'should not make space for it in the jobflow config' do
|
367
|
+
jobflow_with_no_job_flow_role.send(:jobflow_config).should_not have_key(:job_flow_role)
|
368
|
+
end
|
369
|
+
end
|
370
|
+
|
371
|
+
end
|
372
|
+
|
347
373
|
describe 'bootstrap actions' do
|
348
374
|
|
349
375
|
context 'when bootstrap actions are specified' do
|
@@ -686,4 +712,4 @@ describe Elasticity::JobFlow do
|
|
686
712
|
|
687
713
|
end
|
688
714
|
|
689
|
-
end
|
715
|
+
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: elasticity
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 4.0.
|
4
|
+
version: 4.0.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Robert Slifka
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2014-11-
|
11
|
+
date: 2014-11-20 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rest-client
|