kumogata-template 0.0.34 → 0.0.35
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/kumogata/template/emr.rb +3 -1
- data/lib/kumogata/template/version.rb +1 -1
- data/test/emr_test.rb +12 -2
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: ff8b5ee89f699fd747bf383b8dacb8c77f9719a7
|
4
|
+
data.tar.gz: 6f49fa10979f3561aa30ecd31557bee15e6de2fb
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: db7151f224695cd9aee542fffed40f72bf28de7bcbc6a473af16f31a9ca3120d95fa7e5fa7210f8af82d494d9e541b3748a5880a8a67a67b79e2c819b8205758
|
7
|
+
data.tar.gz: ba826e18ad1d8b61d1258ae0447aa04255dee4f8ca6be65e9039d6ac5fa3d51ae7830696e4b773c2f235e600b0578152d6895af070c01689e45021c95ebd403e
|
@@ -113,7 +113,7 @@ def _emr_ebs(args)
|
|
113
113
|
ebs_block_devices = ebs.collect{|v| _emr_ebs_block_device(v) }
|
114
114
|
|
115
115
|
_{
|
116
|
-
|
116
|
+
EbsBlockDeviceConfigs ebs_block_devices unless ebs_block_devices.empty?
|
117
117
|
#EbsOptimized
|
118
118
|
}
|
119
119
|
end
|
@@ -177,6 +177,7 @@ end
|
|
177
177
|
def _emr_instance_group(args)
|
178
178
|
bid = args[:bid] || ""
|
179
179
|
configurations = _emr_configurations(args)
|
180
|
+
ebs_configuration = _emr_ebs(args)
|
180
181
|
instance_count = args[:instance_count] || 1
|
181
182
|
instance_type = _ref_string("instance_type", args, "instance type")
|
182
183
|
instance_type = EMR_DEFAULT_INSTANCE_TYPE if instance_type.empty?
|
@@ -186,6 +187,7 @@ def _emr_instance_group(args)
|
|
186
187
|
_{
|
187
188
|
BidPrice bid unless bid.empty?
|
188
189
|
Configurations configurations unless configurations.empty?
|
190
|
+
EbsConfiguration ebs_configuration unless ebs_configuration.empty?
|
189
191
|
InstanceCount instance_count
|
190
192
|
InstanceType instance_type
|
191
193
|
Market market.upcase
|
@@ -1 +1 @@
|
|
1
|
-
KUMOGATA_TEMPLATE_VERSION = '0.0.
|
1
|
+
KUMOGATA_TEMPLATE_VERSION = '0.0.35'
|
data/test/emr_test.rb
CHANGED
@@ -134,7 +134,7 @@ Test _emr_ebs(ebs: [ { size: "test" } ])
|
|
134
134
|
exp_template = <<-EOS
|
135
135
|
{
|
136
136
|
"Test": {
|
137
|
-
"
|
137
|
+
"EbsBlockDeviceConfigs": [
|
138
138
|
{
|
139
139
|
"VolumeSpecification": {
|
140
140
|
"SizeInGB": "test",
|
@@ -184,7 +184,7 @@ Test _emr_ebs_volume({ size: "test" })
|
|
184
184
|
|
185
185
|
def test_emr_job_flow
|
186
186
|
template = <<-EOS
|
187
|
-
Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test" } })
|
187
|
+
Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test", ebs: [ { size: 42, type: "gp2" } ] } })
|
188
188
|
EOS
|
189
189
|
act_template = run_client_as_json(template)
|
190
190
|
exp_template = <<-EOS
|
@@ -197,6 +197,16 @@ Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test" } })
|
|
197
197
|
"Name": "test"
|
198
198
|
},
|
199
199
|
"MasterInstanceGroup": {
|
200
|
+
"EbsConfiguration": {
|
201
|
+
"EbsBlockDeviceConfigs": [
|
202
|
+
{
|
203
|
+
"VolumeSpecification": {
|
204
|
+
"SizeInGB": "42",
|
205
|
+
"VolumeType": "gp2"
|
206
|
+
}
|
207
|
+
}
|
208
|
+
]
|
209
|
+
},
|
200
210
|
"InstanceCount": "1",
|
201
211
|
"InstanceType": "c4.large",
|
202
212
|
"Market": "ON_DEMAND",
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: kumogata-template
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.35
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Naoya Nakazawa
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2018-05-11 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: aws-sdk
|
@@ -448,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
448
448
|
version: '0'
|
449
449
|
requirements: []
|
450
450
|
rubyforge_project:
|
451
|
-
rubygems_version: 2.
|
451
|
+
rubygems_version: 2.5.2
|
452
452
|
signing_key:
|
453
453
|
specification_version: 4
|
454
454
|
summary: Template for Kumogata.
|