kumogata-template 0.0.19 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a072c9287be025226a5046066132716048ede1a2
-  data.tar.gz: ccfe43986bc296bec97d755cce6f3f1bc96cf291
+  metadata.gz: ae44c5d6a8ef25cb9a1bddef8be090585ee044a0
+  data.tar.gz: fb27547765a960f1553286e050d80edf18f490e2
 SHA512:
-  metadata.gz: 6f6e0278162a801dcb24ff85836fe6879b14f374926b42c91484405c46f468ba09a8adf58f5c52e1049453af70e65a89c408e1f20e2078202996cffce85a868d
-  data.tar.gz: d78e60f26dd322470bada79d3884f134a4f1deb5c5e3826d5949ae64ff0e144a2a809be8d8147e0b51d4defdb2b37c908a3c1c7d11fe2c0284b6ecde970ea606
+  metadata.gz: 83d1c2e8e3d312bfccd564eda1502f74280027839640d43a4f575ef0f6c9f11529da3076ddd6c1f14b65738e8a2c77f34d57945baf3f6fb6d469dcc66252e0be
+  data.tar.gz: f942a22f5c2eeeb521c7f2c5382b07e7d17ebaa30bc9a57172432d2627f5ed35447ddaf5deec09c2986a8cd6faf78b9ca73d5ea5d1e5fc98741621d3f9096320

data/Gemfile.lock

@@ -1,33 +1,33 @@
 PATH
   remote: .
   specs:
-    kumogata-template (0.0.18)
+    kumogata-template (0.0.19)
       aws-sdk (~> 2.3)
       kumogata (= 0.5.12)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.7.10)
-      aws-sdk-resources (= 2.7.10)
-    aws-sdk-core (2.7.10)
+    aws-sdk (2.9.7)
+      aws-sdk-resources (= 2.9.7)
+    aws-sdk-core (2.9.7)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.7.10)
-      aws-sdk-core (= 2.7.10)
-    aws-sdk-v1 (1.66.0)
+    aws-sdk-resources (2.9.7)
+      aws-sdk-core (= 2.9.7)
+    aws-sdk-v1 (1.67.0)
       json (~> 1.4)
-      nokogiri (>= 1.4.4)
+      nokogiri (~> 1)
     aws-sigv4 (1.0.0)
     coderay (1.1.1)
     coffee-script (2.4.1)
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    diffy (3.1.0)
+    diffy (3.2.0)
     dslh (0.2.7)
     execjs (2.7.0)
-    hashie (3.5.3)
+    hashie (3.5.5)
     highline (1.7.8)
     jmespath (1.3.1)
     json (1.8.3)
@@ -48,16 +48,16 @@ GEM
       term-ansicolor
       therubyracer (= 0.12.2)
       uuidtools
-    libv8 (3.16.14.17)
+    libv8 (3.16.14.19)
     mini_portile2 (2.0.0)
     minitest (5.10.1)
-    net-ssh (4.0.1)
+    net-ssh (4.1.0)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     rake (11.3.0)
     ref (2.0.0)
     retryable (2.0.4)
-    term-ansicolor (1.4.0)
+    term-ansicolor (1.5.0)
       tins (~> 1.0)
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)

data/LICENSE.txt

@@ -0,0 +1,22 @@
+Copyright (c) 2016 Naoya Nakazawa
+
+MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/kumogata/template.rb

@@ -11,6 +11,7 @@ require 'kumogata/template/datapipeline'
 require 'kumogata/template/dynamodb'
 require 'kumogata/template/ec2'
 require 'kumogata/template/ecs'
+require 'kumogata/template/elasticache'
 require 'kumogata/template/elasticbeanstalk'
 require 'kumogata/template/elb'
 require 'kumogata/template/emr'

data/lib/kumogata/template/elasticache.rb

@@ -0,0 +1,30 @@
+#
+# Helper - ElastiCache
+#
+require 'kumogata/template/helper'
+
+def _elasticache_to_engine(args)
+  _valid_values(args[:engine], %w( memcached redis ), ELASTICACHE_DEFAULT_ENGINE)
+end
+
+def _elasticache_to_node(args)
+  node = _ref_string("node", args, "cache node types")
+  if node.is_a? String
+    node = "cache.#{node}" if node !~ /cache./
+    node = _valid_values(node, ELASTICACHE_NODE_TYPES, ELASTICACHE_DEFAULT_NODE_TYPE) 
+  end
+  node
+end
+
+def _elasticache_to_parameter(args)
+  engine = _elasticache_to_engine(args)
+  parameter = _ref_string("parameter", args, "cache parameter group")
+  if parameter.empty?
+    if engine == "memcached"
+      parameter = "default.memcached1.4"
+    else
+      parameter = "default.redis2.8"
+    end
+  end
+  parameter
+end

data/lib/kumogata/template/version.rb

@@ -1 +1 @@
-KUMOGATA_TEMPLATE_VERSION = '0.0.19'
+KUMOGATA_TEMPLATE_VERSION = '0.0.20'

data/template/elasticache-cache-cluster.rb

@@ -3,21 +3,14 @@
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/elasticache'
 
 name = _resource_name(args[:name], "cache cluster")
-engine = _valid_values(args[:engine], %w( memcached redis ), ELASTICACHE_DEFAULT_ENGINE)
+engine = _elasticache_to_engine(args)
 auto = _bool("auto", args, true)
 azmode = args[:azmode] || ""
-node = _ref_string("node", args, "cache node types")
-node = _valid_values(node, ELASTICACHE_NODE_TYPES, ELASTICACHE_DEFAULT_NODE_TYPE) unless node.is_a? Hash
-parameter = _ref_string("parameter", args, "cache parameter group")
-if parameter.empty?
-  if engine == "memcached"
-    parameter = "default.memcached1.4"
-  else
-    parameter = "default.redis2.8"
-  end
-end
+node = _elasticache_to_node(args)
+parameter = _elasticache_to_parameter(args)
 subnet = _ref_string("subnet", args, "cache subnet group")
 cluster = _ref_name("cluster", args, "cache cluster")
 engine_version = _ref_string("engine_version", args, "cache engine version")

data/template/elasticache-replication-group.rb

@@ -3,21 +3,14 @@
 # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html
 #
 require 'kumogata/template/helper'
+require 'kumogata/template/elasticache'
 
 name = _resource_name(args[:name], "cache replication group")
-engine = _valid_values(args[:engine], %w( memcached redis ), ELASTICACHE_DEFAULT_ENGINE)
+engine = _elasticache_to_engine(args)
 automatic = _bool("automatic", args, true)
 auto = _bool("auto", args, true)
-node = _ref_string("node", args, "cache node types")
-node = _valid_values(node, ELASTICACHE_NODE_TYPES, ELASTICACHE_DEFAULT_NODE_TYPE) unless node.is_a? Hash
-parameter = _ref_string("parameter", args, "cache parameter group")
-if parameter.empty?
-  if engine == "memcached"
-    parameter = "default.memcached1.4"
-  else
-    parameter = "default.redis2.8"
-  end
-end
+node = _elasticache_to_node(args)
+parameter = _elasticache_to_parameter(args)
 subnet = _ref_string("subnet", args, "cache subnet group")
 engine_version = _ref_string("engine_version", args, "cache engine version")
 engine_version = ELASTICACHE_DEFAULT_ENGINE_VERSION[engine.to_sym] if engine_version.empty?

data/template/parameter-elasticache.rb

@@ -3,7 +3,10 @@
 #
 require 'kumogata/template/helper'
 
+default = args[:cache_node] || ELASTICACHE_DEFAULT_NODE_TYPE
+default = "cache.#{default}" if default !~ /cache./
+
 _parameter "#{args[:name]} cache node types",
-           default: args[:cache_node] || ELASTICACHE_DEFAULT_NODE_TYPE,
+           default: default,
            description: "#{args[:name]} cache node types",
            allowed_values: ELASTICACHE_NODE_TYPES

data/test/elasticache_test.rb

@@ -0,0 +1,55 @@
+require 'abstract_unit'
+require 'kumogata/template/elasticache'
+
+class ElastiCacheTest < Minitest::Test
+  def test_elasticache_to_engine
+    template = <<-EOS
+Test _elasticache_to_engine({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "redis"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_elasticache_to_node
+    template = <<-EOS
+Test _elasticache_to_node({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "cache.t2.medium"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+
+    template = <<-EOS
+Test _elasticache_to_node(node: "r3.8xlarge")
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "cache.r3.8xlarge"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+
+  def test_elasticache_to_parameter
+    template = <<-EOS
+Test _elasticache_to_parameter({})
+    EOS
+    act_template = run_client_as_json(template)
+    exp_template = <<-EOS
+{
+  "Test": "default.redis2.8"
+}
+    EOS
+    assert_equal exp_template.chomp, act_template
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata-template
 version: !ruby/object:Gem::Version
-  version: 0.0.19
+  version: 0.0.20
 platform: ruby
 authors:
 - Naoya Nakazawa
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-24 00:00:00.000000000 Z
+date: 2017-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -93,6 +93,7 @@ files:
 - ".travis.yml"
 - Gemfile
 - Gemfile.lock
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/kumogata-template
@@ -111,6 +112,7 @@ files:
 - lib/kumogata/template/dynamodb.rb
 - lib/kumogata/template/ec2.rb
 - lib/kumogata/template/ecs.rb
+- lib/kumogata/template/elasticache.rb
 - lib/kumogata/template/elasticbeanstalk.rb
 - lib/kumogata/template/elb.rb
 - lib/kumogata/template/emr.rb
@@ -258,6 +260,7 @@ files:
 - test/dynamodb_test.rb
 - test/ec2_test.rb
 - test/ecs_test.rb
+- test/elasticache_test.rb
 - test/elasticbeanstalk_test.rb
 - test/elb_test.rb
 - test/emr_test.rb
@@ -425,6 +428,7 @@ test_files:
 - test/dynamodb_test.rb
 - test/ec2_test.rb
 - test/ecs_test.rb
+- test/elasticache_test.rb
 - test/elasticbeanstalk_test.rb
 - test/elb_test.rb
 - test/emr_test.rb