kumogata-template 0.0.34 → 0.0.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4614c777d40479422e7f81c0c24dfbe53a47c2e0
-  data.tar.gz: cdb0a588add13fb92a75e3e1c2ca78ef5e9a7706
+  metadata.gz: ff8b5ee89f699fd747bf383b8dacb8c77f9719a7
+  data.tar.gz: 6f49fa10979f3561aa30ecd31557bee15e6de2fb
 SHA512:
-  metadata.gz: 43838f52cc049725b0f73250853f17ddce36ff41658db661622935dde7dc2f6cb119448c84926d97507fface0c4d60367f19ef50c55569993646e8720b36269c
-  data.tar.gz: 923adaaa2fe9d84de9d225ce129f440423f1bb22443bbc7b57391d01fc8f06b8db1274ee85b16bb41594af3f20d94a6b6375e0f54ac4aa784e9217d3f710a6ee
+  metadata.gz: db7151f224695cd9aee542fffed40f72bf28de7bcbc6a473af16f31a9ca3120d95fa7e5fa7210f8af82d494d9e541b3748a5880a8a67a67b79e2c819b8205758
+  data.tar.gz: ba826e18ad1d8b61d1258ae0447aa04255dee4f8ca6be65e9039d6ac5fa3d51ae7830696e4b773c2f235e600b0578152d6895af070c01689e45021c95ebd403e

data/lib/kumogata/template/emr.rb

@@ -113,7 +113,7 @@ def _emr_ebs(args)
   ebs_block_devices = ebs.collect{|v| _emr_ebs_block_device(v) }
 
   _{
-    EbsBlockDeviceConfig ebs_block_devices
+    EbsBlockDeviceConfigs ebs_block_devices unless ebs_block_devices.empty?
     #EbsOptimized
   }
 end
@@ -177,6 +177,7 @@ end
 def _emr_instance_group(args)
   bid = args[:bid] || ""
   configurations = _emr_configurations(args)
+  ebs_configuration = _emr_ebs(args)
   instance_count = args[:instance_count] || 1
   instance_type = _ref_string("instance_type", args, "instance type")
   instance_type = EMR_DEFAULT_INSTANCE_TYPE  if instance_type.empty?
@@ -186,6 +187,7 @@ def _emr_instance_group(args)
   _{
     BidPrice bid unless bid.empty?
     Configurations configurations unless configurations.empty?
+    EbsConfiguration ebs_configuration unless ebs_configuration.empty?
     InstanceCount instance_count
     InstanceType instance_type
     Market market.upcase

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.34'
+KUMOGATA_TEMPLATE_VERSION = '0.0.35'

data/test/emr_test.rb

@@ -134,7 +134,7 @@ Test _emr_ebs(ebs: [ { size: "test" } ])
     exp_template = <<-EOS
 {
   "Test": {
-    "EbsBlockDeviceConfig": [
+    "EbsBlockDeviceConfigs": [
       {
         "VolumeSpecification": {
           "SizeInGB": "test",
@@ -184,7 +184,7 @@ Test _emr_ebs_volume({ size: "test" })
 
   def test_emr_job_flow
     template = <<-EOS
-Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test" } })
+Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test", ebs: [ { size: 42, type: "gp2" } ] } })
     EOS
     act_template = run_client_as_json(template)
     exp_template = <<-EOS
@@ -197,6 +197,16 @@ Test _emr_job_flow(job: { core: { name: "test" }, master: { name: "test" } })
       "Name": "test"
     },
     "MasterInstanceGroup": {
+      "EbsConfiguration": {
+        "EbsBlockDeviceConfigs": [
+          {
+            "VolumeSpecification": {
+              "SizeInGB": "42",
+              "VolumeType": "gp2"
+            }
+          }
+        ]
+      },
       "InstanceCount": "1",
       "InstanceType": "c4.large",
       "Market": "ON_DEMAND",

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.34
+  version: 0.0.35
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-26 00:00:00.000000000 Z
+date: 2018-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -448,7 +448,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Template for Kumogata.